Ros-diffs February 2010

ros-diffs@reactos.org

22 participants
365 discussions

[dreimer] 45631: XML Compliance Patch for the RBUILD Files. By Samuel Serapion
by dreimer＠svn.reactos.org 20 Feb '10

20 Feb '10

Author: dreimer Date: Sat Feb 20 13:41:24 2010 New Revision: 45631 URL: http://svn.reactos.org/svn/reactos?rev=45631&view=rev Log: XML Compliance Patch for the RBUILD Files. By Samuel Serapion Modified: trunk/reactos/base/applications/cmdutils/hostname/hostname.rbuild trunk/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild trunk/reactos/base/applications/magnify/magnify.rbuild trunk/reactos/base/applications/mstsc/mstsc.rbuild trunk/reactos/base/services/rpcss/rpcss.rbuild trunk/reactos/boot/armllb/armllb.rbuild trunk/reactos/dll/directx/quartz/quartz.rbuild trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild trunk/reactos/dll/shellext/shellext.rbuild trunk/reactos/dll/win32/iccvid/iccvid.rbuild trunk/reactos/dll/win32/jscript/jscript.rbuild trunk/reactos/dll/win32/msacm32/msacm32.rbuild trunk/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild trunk/reactos/dll/win32/msxml3/msxml3.rbuild trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild trunk/reactos/dll/win32/shdocvw/shdocvw.rbuild trunk/reactos/dll/win32/sndblst/sndblst.rbuild trunk/reactos/dll/win32/stdole32.tlb/stdole32.rbuild trunk/reactos/dll/win32/sti/sti.rbuild trunk/reactos/dll/win32/t2embed/t2embed.rbuild trunk/reactos/drivers/base/kddll/kddll.rbuild trunk/reactos/drivers/directx/directory.rbuild trunk/reactos/drivers/directx/dxapi/dxapi.rbuild trunk/reactos/drivers/directx/dxg/dxg.rbuild trunk/reactos/drivers/directx/dxgthk/dxgthk.rbuild trunk/reactos/drivers/video/font/bmfd/bmfd.rbuild trunk/reactos/drivers/video/font/directory.rbuild trunk/reactos/drivers/video/font/ftfd/ftfd.rbuild trunk/reactos/drivers/wdm/audio/filters/splitter/splitter.rbuild trunk/reactos/hal/halarm/directory.rbuild trunk/reactos/hal/halarm/hal_generic.rbuild trunk/reactos/hal/halx86/directory.rbuild trunk/reactos/hal/halx86/hal_generic.rbuild trunk/reactos/hal/halx86/hal_generic_mp.rbuild trunk/reactos/hal/halx86/hal_generic_up.rbuild trunk/reactos/include/psdk/psdk.rbuild trunk/reactos/include/reactos/mc/mc.rbuild trunk/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild trunk/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild trunk/reactos/lib/atl/atl.rbuild trunk/reactos/lib/dnslib/dnslib.rbuild trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/tdilib/tdilib.rbuild trunk/reactos/media/vgafonts/vgafonts.rbuild trunk/reactos/tools/geninc/geninc.rbuild Modified: trunk/reactos/base/applications/cmdutils/hostname/hostname.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/hostname/hostname.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/hostname/hostname.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="hostname" type="win32cui" installbase="system32" installname="hostname.exe"> <file>hostname.c</file> <file>hostname.rc</file> Modified: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="xcopy" type="win32cui" installbase="system32" installname="xcopy.exe" unicode="true"> <include base="xcopy">.</include> <library>wine</library> Modified: trunk/reactos/base/applications/magnify/magnify.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/magnify.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/magnify.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> +<!DOCTYPE project SYSTEM "../../../tools/rbuild/project.dtd"> <module name="magnify" type="win32gui" installbase="system32" installname="magnify.exe"> <include base="magnify">.</include> <library>user32</library> Modified: trunk/reactos/base/applications/mstsc/mstsc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ms… ============================================================================== --- trunk/reactos/base/applications/mstsc/mstsc.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/mstsc.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="mstsc" type="win32gui" installbase="system32" installname="mstsc.exe" unicode="yes"> <include base="mstsc">.</include> <library>user32</library> Modified: trunk/reactos/base/services/rpcss/rpcss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss.… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/rpcss.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="rpcss" type="win32cui" installbase="system32" installname="rpcss.exe" unicode="yes"> <include base="rpcss">.</include> <include base="rpcss" root="intermediate">.</include> @@ -23,3 +24,4 @@ <module name="rpcss_irot_server" type="rpcserver"> <file>irot.idl</file> </module> +</group> Modified: trunk/reactos/boot/armllb/armllb.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/armllb.rbuild?… ============================================================================== --- trunk/reactos/boot/armllb/armllb.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/armllb.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,65 +1,66 @@ <?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> - <module name="armllb" type="bootloader" installbase=".." installname="armllb.bin"> - <bootstrap installbase="loader" /> - <library>libcntpr</library> - <library>rtl</library> - <include base="armllb">./inc</include> - <if property="SARCH" value="omap3"> - <define name="_OMAP3_" /> - <group linkerset="ld"> - <linkerflag>-Wl,--image-base=0x401FEFF8</linkerflag> - </group> - </if> - <if property="SARCH" value="versatile"> - <define name="_VERSATILE_" /> - <group linkerset="ld"> - <linkerflag>-Wl,--image-base=0xF000</linkerflag> - </group> - </if> - <file first="true">boot.s</file> - <file>main.c</file> - <file>crtsupp.c</file> - <file>envir.c</file> - <file>fw.c</file> - <directory name="hw"> - <file>keyboard.c</file> - <file>serial.c</file> - <file>time.c</file> - <file>video.c</file> - <if property="SARCH" value="omap3"> - <directory name="omap3"> - <file>hwdata.c</file> - <file>hwdss.c</file> - <file>hwuart.c</file> - <file>hwinfo.c</file> - <file<hwinit.c</file> - </directory> - </if> - <if property="SARCH" value="versatile"> - <directory name="versatile"> - <file>hwclcd.c</file> - <file>hwkmi.c</file> - <file>hwuart.c</file> - <file>hwinfo.c</file> - <file>hwinit.c</file> - </directory> - </if> - </directory> - <directory name="os"> - <file>loader.c</file> - </directory> - <group compilerset="gcc"> - <compilerflag>-fms-extensions</compilerflag> - <compilerflag>-ffreestanding</compilerflag> - <compilerflag>-fno-builtin</compilerflag> - <compilerflag>-fno-inline</compilerflag> - <compilerflag>-fno-zero-initialized-in-bss</compilerflag> - <compilerflag>-Os</compilerflag> - </group> - <group linkerset="ld"> - <linkerflag>-lgcc</linkerflag> - </group> - </module> +<module name="armllb" type="bootloader" installbase=".." installname="armllb.bin"> + <bootstrap installbase="loader" /> + <library>libcntpr</library> + <library>rtl</library> + <include base="armllb">./inc</include> + <if property="SARCH" value="omap3"> + <define name="_OMAP3_" /> + <group linkerset="ld"> + <linkerflag>-Wl,--image-base=0x401FEFF8</linkerflag> + </group> + </if> + <if property="SARCH" value="versatile"> + <define name="_VERSATILE_" /> + <group linkerset="ld"> + <linkerflag>-Wl,--image-base=0xF000</linkerflag> + </group> + </if> + <file first="true">boot.s</file> + <file>main.c</file> + <file>crtsupp.c</file> + <file>envir.c</file> + <file>fw.c</file> + <directory name="hw"> + <file>keyboard.c</file> + <file>serial.c</file> + <file>time.c</file> + <file>video.c</file> + <if property="SARCH" value="omap3"> + <directory name="omap3"> + <file>hwdata.c</file> + <file>hwdss.c</file> + <file>hwuart.c</file> + <file>hwinfo.c</file> + <file>hwinit.c</file> + </directory> + </if> + <if property="SARCH" value="versatile"> + <directory name="versatile"> + <file>hwclcd.c</file> + <file>hwkmi.c</file> + <file>hwuart.c</file> + <file>hwinfo.c</file> + <file>hwinit.c</file> + </directory> + </if> + </directory> + <directory name="os"> + <file>loader.c</file> + </directory> + <group compilerset="gcc"> + <compilerflag>-fms-extensions</compilerflag> + <compilerflag>-ffreestanding</compilerflag> + <compilerflag>-fno-builtin</compilerflag> + <compilerflag>-fno-inline</compilerflag> + <compilerflag>-fno-zero-initialized-in-bss</compilerflag> + <compilerflag>-Os</compilerflag> + + </group> + <group linkerset="ld"> + <linkerflag>-lgcc</linkerflag> + </group> +</module> </group> Modified: trunk/reactos/dll/directx/quartz/quartz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/quartz.… ============================================================================== --- trunk/reactos/dll/directx/quartz/quartz.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/quartz/quartz.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -60,4 +60,5 @@ <define name="REGISTER_PROXY_DLL"/> <define name="PROXY_DELEGATION"/> <file>quartz_strmif.idl</file> -</module> +</module> +</group> Modified: trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/normaliz_redist/no… ============================================================================== --- trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="normaliz_redist_data" type="staticlibrary"> <include base="icu4ros">icu/source/common</include> <directory name="data"><file>icudt38.c</file></directory> @@ -16,3 +17,4 @@ <importlibrary definition="normaliz.def" /> <file>normaliz.cpp</file> </module> +</group> Modified: trunk/reactos/dll/shellext/shellext.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellext.rbui… ============================================================================== --- trunk/reactos/dll/shellext/shellext.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/shellext.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> <directory name="deskadp"> <xi:include href="deskadp/deskadp.rbuild" /> Modified: trunk/reactos/dll/win32/iccvid/iccvid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid.rb… ============================================================================== --- trunk/reactos/dll/win32/iccvid/iccvid.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iccvid/iccvid.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,3 +1,5 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="iccvid" type="win32dll" baseaddress="${BASEADDRESS_ICCVID}" installbase="system32" installname="iccvid.dll" allowwarnings="true"> <importlibrary definition="iccvid.spec" /> <include base="iccvid">.</include> @@ -8,3 +10,4 @@ <library>wine</library> <library>user32</library> <library>ntdll</library> +</module> Modified: trunk/reactos/dll/win32/jscript/jscript.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.… ============================================================================== --- trunk/reactos/dll/win32/jscript/jscript.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jscript.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,3 +1,5 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="jscript" type="win32dll" baseaddress="${BASEADDRESS_JSCRIPT}" installbase="system32" installname="jscript.dll" allowwarnings="true" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> @@ -38,3 +40,4 @@ <dependency>stdole2</dependency> <file>jsglobal.idl</file> </module> +</group> Modified: trunk/reactos/dll/win32/msacm32/msacm32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm32.… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm32.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,3 +1,6 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="msacm32" type="win32dll" baseaddress="${BASEADDRESS_MSACM32}" installbase="system32" installname="msacm32.dll" unicode="yes"> <importlibrary definition="msacm32.spec" /> <include base="msacm32">.</include> @@ -18,3 +21,4 @@ <directory name="msacm32.drv"> <xi:include href="msacm32.drv/msacm32.drv.rbuild" /> </directory> +</group> Modified: trunk/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml.tlb/mshtm… ============================================================================== --- trunk/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,3 +1,5 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="mshtml_tlb" type="embeddedtypelib"> <dependency>stdole2</dependency> @@ -10,3 +12,4 @@ <define name="__WINESRC__" /> <file>rsrc.rc</file> </module> +</group> Modified: trunk/reactos/dll/win32/msxml3/msxml3.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml3.rb… ============================================================================== --- trunk/reactos/dll/win32/msxml3/msxml3.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/msxml3.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,3 +1,5 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="msxml3" type="win32dll" baseaddress="${BASEADDRESS_MSXML3}" installbase="system32" installname="msxml3.dll" allowwarnings="true" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> @@ -62,3 +64,4 @@ <dependency>stdole2</dependency> <file>msxml3_v1.idl</file> </module> +</group> Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.rb… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,3 +1,6 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}" installbase="system32" installname="rpcrt4.dll" allowwarnings="true" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="rpcrt4.spec" /> @@ -43,3 +46,4 @@ <module name="rpcrt4_epm_client" type="rpcclient"> <file>epm.idl</file> </module> +</group> Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -45,3 +45,4 @@ <dependency>stdole2</dependency> <file>shdocvw_v1.idl</file> </module> +</group> Modified: trunk/reactos/dll/win32/sndblst/sndblst.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sndblst/sndblst.… ============================================================================== --- trunk/reactos/dll/win32/sndblst/sndblst.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sndblst/sndblst.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,7 @@ - +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> + + <module name="sndblst" type="win32dll" installbase="system32" installname="sndblst.dll" unicode="yes"> <importlibrary definition="sndblst.spec" /> <include base="ReactOS">include/reactos/libs/sound</include> Modified: trunk/reactos/dll/win32/stdole32.tlb/stdole32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole32.tlb/std… ============================================================================== --- trunk/reactos/dll/win32/stdole32.tlb/stdole32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/stdole32.tlb/stdole32.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,3 +1,5 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="std_ole_v1" type="embeddedtypelib"> <include base="std_ole_v1">.</include> @@ -14,3 +16,4 @@ <define name="__WINESRC__" /> <file>rsrc.rc</file> </module> +</group> Modified: trunk/reactos/dll/win32/sti/sti.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/sti.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/sti/sti.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sti/sti.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -15,3 +15,4 @@ <library>ole32</library> <library>ntdll</library> </module> +</group> Modified: trunk/reactos/dll/win32/t2embed/t2embed.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/t2embed.… ============================================================================== --- trunk/reactos/dll/win32/t2embed/t2embed.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/t2embed/t2embed.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,3 +1,5 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <module name="t2embed" type="win32dll" baseaddress="${BASEADDRESS_T2EMBED}" installbase="system32" installname="t2embed.dll" unicode="yes"> <importlibrary definition="t2embed.spec" /> <include base="t2embed">.</include> @@ -9,3 +11,4 @@ <library>wine</library> <file>t2embed.c</file> <file>t2embed.rc</file> +</module> Modified: trunk/reactos/drivers/base/kddll/kddll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kddll.r… ============================================================================== --- trunk/reactos/drivers/base/kddll/kddll.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kddll.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> - +<group> <module name="kdlib" type="staticlibrary"> <include base="kdlib">.</include> <library>ntoskrnl</library> @@ -22,3 +22,4 @@ <library>kdserial</library> <file>kdcom.c</file> </module> +</group> Modified: trunk/reactos/drivers/directx/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/directory.… ============================================================================== --- trunk/reactos/drivers/directx/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/directory.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> <directory name="dxapi"> <xi:include href="dxapi/dxapi.rbuild" /> Modified: trunk/reactos/drivers/directx/dxapi/dxapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxapi/dxap… ============================================================================== --- trunk/reactos/drivers/directx/dxapi/dxapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxapi/dxapi.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="dxapi" type="kernelmodedriver" installbase="system32/drivers" installname="dxapi.sys"> <importlibrary definition="dxapi.spec" /> Modified: trunk/reactos/drivers/directx/dxg/dxg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/dxg.rb… ============================================================================== --- trunk/reactos/drivers/directx/dxg/dxg.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxg/dxg.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="dxg" type="kernelmodedriver" installbase="system32/drivers" installname="dxg.sys"> <importlibrary definition="dxg.spec" /> <include base="dxg">.</include> Modified: trunk/reactos/drivers/directx/dxgthk/dxgthk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxgthk/dxg… ============================================================================== --- trunk/reactos/drivers/directx/dxgthk/dxgthk.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxgthk/dxgthk.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="dxgthk" type="kernelmodedriver" installbase="system32/drivers" installname="dxgthk.sys"> <importlibrary definition="dxgthk.spec" /> Modified: trunk/reactos/drivers/video/font/bmfd/bmfd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/bmfd/bm… ============================================================================== --- trunk/reactos/drivers/video/font/bmfd/bmfd.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/bmfd/bmfd.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="bmfd" type="kernelmodedriver" entrypoint="BmfdEnableDriver@12" installbase="system32" installname="bmfd.dll" crt="static"> <library>win32k</library> <library>libcntpr</library> Modified: trunk/reactos/drivers/video/font/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/directo… ============================================================================== --- trunk/reactos/drivers/video/font/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/directory.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> <directory name="bmfd"> <xi:include href="bmfd/bmfd.rbuild" /> Modified: trunk/reactos/drivers/video/font/ftfd/ftfd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/ft… ============================================================================== --- trunk/reactos/drivers/video/font/ftfd/ftfd.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/ftfd/ftfd.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="ftfd" type="kernelmodedll" entrypoint="FtfdEnableDriver@12" baseaddress="${BASEADDRESS_FREETYPE}" installbase="system32" installname="ftfd.dll" crt="libcntpr"> <importlibrary definition="freetype.def" /> <include base="freetype">include</include> Modified: trunk/reactos/drivers/wdm/audio/filters/splitter/splitter.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/splitter/splitter.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/splitter/splitter.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<!DOCTYPE module SYSTEM "../../../../../tools/rbuild/project.dtd"> <module name="splitter" type="kernelmodedriver" installbase="system32/drivers" installname="splitter.sys"> <library>ntoskrnl</library> <library>ks</library> Modified: trunk/reactos/hal/halarm/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/directory.rbuil… ============================================================================== --- trunk/reactos/hal/halarm/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/directory.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="hal_generic.rbuild" /> Modified: trunk/reactos/hal/halarm/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/hal_generic.rbu… ============================================================================== --- trunk/reactos/hal/halarm/hal_generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/hal_generic.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> <module name="hal_generic" type="objectlibrary"> <include>include</include> Modified: trunk/reactos/hal/halx86/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/directory.rbuil… ============================================================================== --- trunk/reactos/hal/halx86/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/directory.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="hal_generic.rbuild" /> Modified: trunk/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic.rbu… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> <module name="hal_generic" type="objectlibrary"> <include>include</include> Modified: trunk/reactos/hal/halx86/hal_generic_mp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_mp.… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic_mp.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic_mp.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> <module name="hal_generic_mp" type="objectlibrary"> <include>include</include> Modified: trunk/reactos/hal/halx86/hal_generic_up.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_up.… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> <module name="hal_generic_up" type="objectlibrary"> <include>include</include> Modified: trunk/reactos/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/psdk.rbuild?r… ============================================================================== --- trunk/reactos/include/psdk/psdk.rbuild [iso-8859-1] (original) +++ trunk/reactos/include/psdk/psdk.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<group> <module name="psdk" type="idlheader"> <file>activaut.idl</file> <file>activdbg.idl</file> @@ -66,4 +67,5 @@ </module> <module name="stdole2" type="embeddedtypelib"> <file>stdole2.idl</file> -</module> +</module> +</group> Modified: trunk/reactos/include/reactos/mc/mc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/mc.rbui… ============================================================================== --- trunk/reactos/include/reactos/mc/mc.rbuild [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/mc.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="ntstatus" type="messageheader"> <file>ntstatus.mc</file> Modified: trunk/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/icu4ros/icu4r… ============================================================================== --- trunk/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="icu4ros" type="staticlibrary"> <define name="U_STATIC_IMPLEMENTATION" /> <define name="U_HAVE_INTTYPES_H" /> Modified: trunk/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate… ============================================================================== --- trunk/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="libsamplerate" type="staticlibrary" allowwarnings="true"> <define name="HAVE_LRINT" /> <define name="HAVE_LRINTF" /> Modified: trunk/reactos/lib/atl/atl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atl.rbuild?rev=456… ============================================================================== --- trunk/reactos/lib/atl/atl.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atl.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="atlnew" type="staticlibrary"> <include base="atlnew">.</include> <define name="UNICODE" /> Modified: trunk/reactos/lib/dnslib/dnslib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/dnslib/dnslib.rbuild?r… ============================================================================== --- trunk/reactos/lib/dnslib/dnslib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/dnslib/dnslib.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="dnslib" type="staticlibrary" unicode="yes"> <include base="dnslib">inc</include> <file>addr.c</file> Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="chkstk" type="staticlibrary"> <directory name="except"> <if property="ARCH" value="i386"> @@ -490,3 +491,4 @@ <file>undname.c</file> </directory> </module> +</group> Modified: trunk/reactos/lib/tdilib/tdilib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/tdilib/tdilib.rbuild?r… ============================================================================== --- trunk/reactos/lib/tdilib/tdilib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/tdilib/tdilib.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="tdilib" type="staticlibrary"> <include base="iphlpapi">.</include> <include base="tdilib">.</include> Modified: trunk/reactos/media/vgafonts/vgafonts.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/vgafonts/vgafonts.rb… ============================================================================== --- trunk/reactos/media/vgafonts/vgafonts.rbuild [iso-8859-1] (original) +++ trunk/reactos/media/vgafonts/vgafonts.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="vgafonts" type="cabinet"> <bootstrap installbase="$(CDOUTPUT)" /> <file>437-8x8.bin</file> Modified: trunk/reactos/tools/geninc/geninc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/geninc/geninc.rbuild… ============================================================================== --- trunk/reactos/tools/geninc/geninc.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/geninc/geninc.rbuild [iso-8859-1] Sat Feb 20 13:41:24 2010 @@ -1,8 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<group> <module name="geninc" type="buildtool"> <file>geninc.c</file> </module> <module name="geninc_data" type="bootloader" installname="geninc_data.bin"> <file>data.c</file> </module> +</group>

1 0

[fireball] 45630: - Merge 45011: "avoid warning messages on Explorer startup when missing configuration files".
by fireball＠svn.reactos.org 20 Feb '10

20 Feb '10

Author: fireball Date: Sat Feb 20 11:44:36 2010 New Revision: 45630 URL: http://svn.reactos.org/svn/reactos?rev=45630&view=rev Log: - Merge 45011: "avoid warning messages on Explorer startup when missing configuration files". Modified: branches/arwinss/reactos/ (props changed) branches/arwinss/reactos/base/shell/explorer/explorer.cpp branches/arwinss/reactos/base/shell/explorer/taskbar/favorites.cpp branches/arwinss/reactos/dll/directx/d3d8/d3d8.spec (props changed) branches/arwinss/reactos/dll/directx/dsound_new/ (props changed) branches/arwinss/reactos/dll/directx/dsound_new/classfactory.c (props changed) branches/arwinss/reactos/dll/directx/dsound_new/dsound.spec (props changed) branches/arwinss/reactos/dll/directx/dsound_new/regsvr.c (props changed) branches/arwinss/reactos/dll/shellext/devcpux/devcpux.spec (props changed) branches/arwinss/reactos/dll/shellext/slayer/slayer.spec (props changed) branches/arwinss/reactos/dll/win32/gdi32/ (props changed) branches/arwinss/reactos/dll/win32/kernel32/kernel32.pspec (props changed) branches/arwinss/reactos/dll/win32/user32/ (props changed) branches/arwinss/reactos/dll/win32/winex11.drv/ (props changed) branches/arwinss/reactos/include/ndk/amd64/ (props changed) branches/arwinss/reactos/include/ndk/amd64/asmmacro.S (props changed) branches/arwinss/reactos/include/psdk/ (props changed) branches/arwinss/reactos/lib/sdk/crt/time/ (props changed) branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c (props changed) branches/arwinss/reactos/subsystems/win32/win32k/include/ (props changed) branches/arwinss/reactos/subsystems/win32/win32k/include/request.h (props changed) branches/arwinss/reactos/subsystems/win32/win32k/include/user.h (props changed) branches/arwinss/reactos/subsystems/win32/win32k/wine/ (props changed) branches/arwinss/reactos/tools/rsym/log2lines.c (props changed) branches/arwinss/reactos/tools/rsym/log2lines.mak (props changed) branches/arwinss/reactos/tools/rsym/rsym.c (props changed) branches/arwinss/reactos/tools/rsym/rsym.h (props changed) branches/arwinss/reactos/tools/rsym/rsym.mak (props changed) branches/arwinss/reactos/tools/rsym/rsym_common.c (props changed) Propchange: branches/arwinss/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos:42000-44999,45097-45099,45319,45418-45419,45535-45539 +/trunk/reactos:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539 Modified: branches/arwinss/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/shell/expl… ============================================================================== --- branches/arwinss/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] (original) +++ branches/arwinss/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] Sat Feb 20 11:44:36 2010 @@ -94,9 +94,9 @@ _cfg_path.printf(TEXT("%s\\ros-explorer-cfg.xml"), _cfg_dir.c_str()); if (!_cfg.read_file(_cfg_path)) { - //if (_cfg._last_error != XML_ERROR_NO_ELEMENTS) - MessageBox(_hwndDesktop, _cfg._errors.str(), - TEXT("ROS Explorer - reading user settings"), MB_OK); + if (!_cfg._errors.empty()) + MessageBox(_hwndDesktop, _cfg._errors.str(), + TEXT("ROS Explorer - reading user settings"), MB_OK); _cfg.read_file(TEXT("explorer-cfg-template.xml")); } Modified: branches/arwinss/reactos/base/shell/explorer/taskbar/favorites.cpp URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/shell/expl… ============================================================================== --- branches/arwinss/reactos/base/shell/explorer/taskbar/favorites.cpp [iso-8859-1] (original) +++ branches/arwinss/reactos/base/shell/explorer/taskbar/favorites.cpp [iso-8859-1] Sat Feb 20 11:44:36 2010 @@ -427,8 +427,9 @@ XMLDoc xbel; if (!xbel.read_file(path)) { - MessageBox(g_Globals._hwndDesktop, xbel._errors.str(), - TEXT("ROS Explorer - reading bookmark file"), MB_OK); + if (!xbel._errors.empty()) + MessageBox(g_Globals._hwndDesktop, xbel._errors.str(), + TEXT("ROS Explorer - reading bookmark file"), MB_OK); } const_XMLPos pos(&xbel); Propchange: branches/arwinss/reactos/dll/directx/d3d8/d3d8.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36930,36936,36992,38148-38151,38264-38265,38268,38355,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/dll/directx/d3d8/d3d8.spec:43127-44999,45097-45099,45319,45418-45419,45535-45539 +/trunk/reactos/dll/directx/d3d8/d3d8.spec:43127-44999,45011,45097-45099,45319,45418-45419,45535-45539 Propchange: branches/arwinss/reactos/dll/directx/dsound_new/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/directx/dsound_new:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 -/trunk/reactos/dll/directx/dsound_new:43669-44421,45319,45418-45419,45535-45539 +/trunk/reactos/dll/directx/dsound_new:43669-44421,45011,45319,45418-45419,45535-45539 Propchange: branches/arwinss/reactos/dll/directx/dsound_new/classfactory.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/classfactory.c:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36502-36503,36505,36936,36992,38149-38150,38264,38355,39639,40122-40123,40125,40155,40247,40324,40753,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857,43860,43905,43907,43969,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 /branches/ros-amd64-bringup/reactos/dll/win32/netshell/classfactory.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 -/trunk/reactos/dll/directx/dsound_new/classfactory.c:43925-44999,45319,45418-45419,45535-45539 +/trunk/reactos/dll/directx/dsound_new/classfactory.c:43925-44999,45011,45319,45418-45419,45535-45539 Propchange: branches/arwinss/reactos/dll/directx/dsound_new/dsound.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/directx/dsound/dsound.spec:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 /branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/dsound.spec:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36502-36503,36505,36936,36992,38149-38150,38264,38355,39639,40122-40123,40125,40155,40247,40324,40753,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857,43860,43905,43907,43969,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/dll/directx/dsound_new/dsound.spec:43925-44999,45319,45418-45419,45535-45539 +/trunk/reactos/dll/directx/dsound_new/dsound.spec:43925-44999,45011,45319,45418-45419,45535-45539 Propchange: branches/arwinss/reactos/dll/directx/dsound_new/regsvr.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/directx/dsound/regsvr.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 /branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/regsvr.c:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36502-36503,36505,36936,36992,38149-38150,38264,38355,39639,40122-40123,40125,40155,40247,40324,40753,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857,43860,43905,43907,43969,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/dll/directx/dsound_new/regsvr.c:43925-44999,45319,45418-45419,45535-45539 +/trunk/reactos/dll/directx/dsound_new/regsvr.c:43925-44999,45011,45319,45418-45419,45535-45539 Propchange: branches/arwinss/reactos/dll/shellext/devcpux/devcpux.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/dll/shellext/devcpux/devcpux.spec:43127-44999,45097-45099,45319,45418-45419,45535-45539 +/trunk/reactos/dll/shellext/devcpux/devcpux.spec:43127-44999,45011,45097-45099,45319,45418-45419,45535-45539 Propchange: branches/arwinss/reactos/dll/shellext/slayer/slayer.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/dll/shellext/slayer/slayer.spec:43127-44999,45097-45099,45319,45418-45419,45535-45539 +/trunk/reactos/dll/shellext/slayer/slayer.spec:43127-44999,45011,45097-45099,45319,45418-45419,45535-45539 Propchange: branches/arwinss/reactos/dll/win32/gdi32/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/gdi32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/win32/gdi32:42000-44999,45097-45099,45319,45418-45419,45535-45539 +/trunk/reactos/dll/win32/gdi32:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539 /vendor/wine/dlls/gdi32/current:43136,43149,43398,43708,44151,44715,45044,45206,45455 Propchange: branches/arwinss/reactos/dll/win32/kernel32/kernel32.pspec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos/dll/win32/kernel32/kernel32.pspec:42000-44999,45097-45099,45319,45418-45419,45535-45539 +/trunk/reactos/dll/win32/kernel32/kernel32.pspec:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539 Propchange: branches/arwinss/reactos/dll/win32/user32/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/user32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/win32/user32:42000-44999,45097-45099,45319,45418-45419,45535-45539 +/trunk/reactos/dll/win32/user32:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539 /vendor/wine/dlls/user32/current:43136,43149,43398,43708,44151,44715,45044,45206,45455 Propchange: branches/arwinss/reactos/dll/win32/winex11.drv/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/winex11.drv:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/win32/winex11.drv:42000-44999,45097-45099,45319,45418-45419,45535-45539 +/trunk/reactos/dll/win32/winex11.drv:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539 /vendor/wine/dlls/winex11.drv/current:43149,43398,43708,44151,44715,45044,45206,45455 Propchange: branches/arwinss/reactos/include/ndk/amd64/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/ndk/amd64:34780-34782,34908-34909,34925,34965,34967,34970,35323-35324,35347-35348,35361,35436,35509,35588,35683,35739,35762,35777,35805,35823,35827,35952,35966,36172,36360,36445,36502-36503,36505,36899,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37990,38013-38014,38149-38150,38264,38355,39338,39347,39639,40088,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41029-41030,41044-41045,41047-41049,41071,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43426,43447,43454,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43777,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44178,44205,44218,44238,44294,44338,44389,44391,44426,44460,44491,44500,44530,44540,44601,44623,44631 -/trunk/reactos/include/ndk/amd64:43125-44999,45097-45099,45319,45418-45419,45535-45539 +/trunk/reactos/include/ndk/amd64:43125-44999,45011,45097-45099,45319,45418-45419,45535-45539 Propchange: branches/arwinss/reactos/include/ndk/amd64/asmmacro.S ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37475,37536,37820-37821,37868-37869,37990,38013-38014,38149-38150,38264,38355,39338,39347,39639,40088,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41029-41030,41044-41045,41047-41049,41071,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43426,43447,43454,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43777,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44178,44205,44218,44238,44294,44338,44389,44391,44426,44460,44491,44500,44530,44540,44601,44623,44631 -/trunk/reactos/include/ndk/amd64/asmmacro.S:43669-44999,45097-45099,45319,45418-45419,45535-45539 +/trunk/reactos/include/ndk/amd64/asmmacro.S:43669-44999,45011,45097-45099,45319,45418-45419,45535-45539 Propchange: branches/arwinss/reactos/include/psdk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/psdk:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos/include/psdk:42000-44999,45097-45099,45319,45418-45419,45535-45539 +/trunk/reactos/include/psdk:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539 Propchange: branches/arwinss/reactos/lib/sdk/crt/time/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,4 +1,4 @@ /branches/ros-amd64-bringup/reactos/lib/sdk/crt/time:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 /branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new:42414 -/trunk/reactos/lib/sdk/crt/time:42678-44999,45097-45099,45319,45418-45419,45535-45539 +/trunk/reactos/lib/sdk/crt/time:42678-44999,45011,45097-45099,45319,45418-45419,45535-45539 /trunk/reactos/lib/sdk/crt/time_new:39350-42241,42401-42678 Propchange: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:42000-44999,45097-45099,45319,45418-45419,45535-45539 +/trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539 Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos/subsystems/win32/win32k/include:42000-44999,45097-45099,45319,45418-45419,45535-45539 +/trunk/reactos/subsystems/win32/win32k/include:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539 /vendor/wine/server/current:45044 Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/request.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/request.h:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/subsystems/win32/win32k/include/request.h:42000-44999,45097-45099,45319,45418-45419,45535-45539 +/trunk/reactos/subsystems/win32/win32k/include/request.h:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539 /vendor/wine/server/current/request.h:43136,43398,43708,45044 Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/user.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/user.h:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/subsystems/win32/win32k/include/user.h:42000-43126,43669-44999,45097-45099,45319,45418-45419,45535-45539 +/trunk/reactos/subsystems/win32/win32k/include/user.h:42000-43126,43669-44999,45011,45097-45099,45319,45418-45419,45535-45539 /vendor/wine/server/current/user.h:43708,45044 Propchange: branches/arwinss/reactos/subsystems/win32/win32k/wine/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/wine:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/subsystems/win32/win32k/wine:42000-43126,43669-44999,45097-45099,45319,45418-45419,45535-45539 +/trunk/reactos/subsystems/win32/win32k/wine:42000-43126,43669-44999,45011,45097-45099,45319,45418-45419,45535-45539 /vendor/wine/server/current:43708,44715,45044,45206 Propchange: branches/arwinss/reactos/tools/rsym/log2lines.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/log2lines.c:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/tools/rsym/log2lines.c:43125-44999,45097-45099,45319,45418-45419,45535-45539 +/trunk/reactos/tools/rsym/log2lines.c:43125-44999,45011,45097-45099,45319,45418-45419,45535-45539 Propchange: branches/arwinss/reactos/tools/rsym/log2lines.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/log2lines.mak:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/tools/rsym/log2lines.mak:43125-44999,45097-45099,45319,45418-45419,45535-45539 +/trunk/reactos/tools/rsym/log2lines.mak:43125-44999,45011,45097-45099,45319,45418-45419,45535-45539 Propchange: branches/arwinss/reactos/tools/rsym/rsym.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37291,37302,37305,37320,37329,37462,37895,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/tools/rsym/rsym.c:42000-44999,45097-45099,45319,45418-45419,45535-45539 +/trunk/reactos/tools/rsym/rsym.c:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539 Propchange: branches/arwinss/reactos/tools/rsym/rsym.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37291,37302,37305,37320,37329,37462,37895,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/tools/rsym/rsym.h:42000-44999,45097-45099,45319,45418-45419,45535-45539 +/trunk/reactos/tools/rsym/rsym.h:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539 Propchange: branches/arwinss/reactos/tools/rsym/rsym.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37291,37302,37305,37320,37329,37462,37895,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/tools/rsym/rsym.mak:42000-44999,45097-45099,45319,45418-45419,45535-45539 +/trunk/reactos/tools/rsym/rsym.mak:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539 Propchange: branches/arwinss/reactos/tools/rsym/rsym_common.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 20 11:44:36 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37291,37302,37305,37320,37329,37462,37895,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/tools/rsym/rsym_common.c:42000-44999,45097-45099,45319,45418-45419,45535-45539 +/trunk/reactos/tools/rsym/rsym_common.c:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539

1 0

[dgorbachev] 45629: [SYSSETUP] Wait until all autostart services are up. Bug #4194.
by dgorbachev＠svn.reactos.org 20 Feb '10

20 Feb '10

Author: dgorbachev Date: Sat Feb 20 01:32:31 2010 New Revision: 45629 URL: http://svn.reactos.org/svn/reactos?rev=45629&view=rev Log: [SYSSETUP] Wait until all autostart services are up. Bug #4194. Modified: branches/arwinss/reactos/dll/win32/syssetup/install.c Modified: branches/arwinss/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/sysse… ============================================================================== --- branches/arwinss/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/syssetup/install.c [iso-8859-1] Sat Feb 20 01:32:31 2010 @@ -481,9 +481,18 @@ DWORD BytesNeeded = 0; DWORD dwWaitTime; DWORD dwMaxWait; + HANDLE hEvent; BOOL ret = FALSE; - hSCManager = OpenSCManager(NULL, NULL, 0); + hEvent = OpenEventW(EVENT_ALL_ACCESS, + FALSE, + L"SC_AutoStartComplete"); + if (hEvent == NULL) + goto cleanup; + + WaitForSingleObject(hEvent, INFINITE); + + hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT); if (hSCManager == NULL) goto cleanup;

1 0

[dgorbachev] 45628: [SERVICES] When autostart services are up, signal an event.
by dgorbachev＠svn.reactos.org 20 Feb '10

20 Feb '10

Author: dgorbachev Date: Sat Feb 20 01:32:23 2010 New Revision: 45628 URL: http://svn.reactos.org/svn/reactos?rev=45628&view=rev Log: [SERVICES] When autostart services are up, signal an event. Modified: branches/arwinss/reactos/base/system/services/services.c Modified: branches/arwinss/reactos/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/system/ser… ============================================================================== --- branches/arwinss/reactos/base/system/services/services.c [iso-8859-1] (original) +++ branches/arwinss/reactos/base/system/services/services.c [iso-8859-1] Sat Feb 20 01:32:23 2010 @@ -48,35 +48,33 @@ BOOL -ScmCreateStartEvent(PHANDLE StartEvent) +ScmCreateEvent(PHANDLE Event, LPCWSTR Name) { HANDLE hEvent; - hEvent = CreateEvent(NULL, - TRUE, - FALSE, - TEXT("SvcctrlStartEvent_A3752DX")); + hEvent = CreateEventW(NULL, + TRUE, + FALSE, + Name); if (hEvent == NULL) { if (GetLastError() == ERROR_ALREADY_EXISTS) { - hEvent = OpenEvent(EVENT_ALL_ACCESS, - FALSE, - TEXT("SvcctrlStartEvent_A3752DX")); - if (hEvent == NULL) - { - return FALSE; - } - } - else - { - return FALSE; - } - } - - *StartEvent = hEvent; - - return TRUE; + hEvent = OpenEventW(EVENT_ALL_ACCESS, + FALSE, + Name); + } + } + + if (hEvent) + { + DPRINT("SERVICES: created event %S with handle %x\n", Name, hEvent); + *Event = hEvent; + return TRUE; + } + + DPRINT1("SERVICES: Failed to create event %S\n", Name); + return FALSE; } @@ -299,6 +297,7 @@ int nShowCmd) { HANDLE hScmStartEvent; + HANDLE hScmAutoStartCompleteEvent; HANDLE hEvent; DWORD dwError; @@ -307,14 +306,16 @@ /* Acquire privileges to load drivers */ AcquireLoadDriverPrivilege(); - /* Create start event */ - if (!ScmCreateStartEvent(&hScmStartEvent)) - { - DPRINT1("SERVICES: Failed to create start event\n"); + /* Create events */ + if (!ScmCreateEvent(&hScmAutoStartCompleteEvent, L"SC_AutoStartComplete")) + { ExitThread(0); } - DPRINT("SERVICES: created start event with handle %x.\n", hScmStartEvent); + if (!ScmCreateEvent(&hScmStartEvent, L"SvcctrlStartEvent_A3752DX")) + { + ExitThread(0); + } // ScmInitThreadManager(); @@ -353,6 +354,9 @@ DPRINT("SERVICES: Running.\n"); + + /* Signal complete event */ + SetEvent(hScmAutoStartCompleteEvent); #if 1 hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);

1 0

[sir_richard] 45627: [NTOS]: Disable support for global pages since it does not seem to work right on real hardware. Additionally, the code had been previously enabling global pages before the variable determining the support for such pages was even enabled, causing non-global pages to be used initially, followed later by global pages once the variable had been setup. To fix this mess, remove all global page support for now. Fixes booting on certain real hardware (or fixes other random memory co
by sir_richard＠svn.reactos.org 19 Feb '10

19 Feb '10

Author: sir_richard Date: Fri Feb 19 23:43:34 2010 New Revision: 45627 URL: http://svn.reactos.org/svn/reactos?rev=45627&view=rev Log: [NTOS]: Disable support for global pages since it does not seem to work right on real hardware. Additionally, the code had been previously enabling global pages before the variable determining the support for such pages was even enabled, causing non-global pages to be used initially, followed later by global pages once the variable had been setup. To fix this mess, remove all global page support for now. Fixes booting on certain real hardware (or fixes other random memory corruptions). Thanks to Caemyr. Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/ke/i386/patpge.c trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Fri Feb 19 23:43:34 2010 @@ -439,7 +439,6 @@ extern BOOLEAN KeI386VirtualIntExtensions; extern KIDTENTRY KiIdt[MAXIMUM_IDTVECTOR]; extern KDESCRIPTOR KiIdtDescriptor; -extern ULONG Ke386GlobalPagesEnabled; extern BOOLEAN KiI386PentiumLockErrataPresent; extern ULONG KeI386NpxPresent; extern ULONG KeI386XMMIPresent; Modified: trunk/reactos/ntoskrnl/ke/i386/patpge.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/patpge.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/patpge.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/patpge.c [iso-8859-1] Fri Feb 19 23:43:34 2010 @@ -11,10 +11,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> - -/* GLOBALS *******************************************************************/ - -ULONG Ke386GlobalPagesEnabled; /* FUNCTIONS *****************************************************************/ @@ -46,8 +42,8 @@ __writecr3(Cr3); /* Now enable PGE */ - __writecr4(Cr4 | CR4_PGE); - Ke386GlobalPagesEnabled = TRUE; + DPRINT1("Global page support detected but not yet taken advantage of\n"); + //__writecr4(Cr4 | CR4_PGE); /* Restore interrupts */ _enable(); Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Fri Feb 19 23:43:34 2010 @@ -175,13 +175,14 @@ } /* Check for global bit */ +#if 0 if (KeFeatureBits & KF_GLOBAL_PAGE) { /* Set it on the template PTE and PDE */ ValidKernelPte.u.Hard.Global = TRUE; ValidKernelPde.u.Hard.Global = TRUE; } - +#endif /* Now templates are ready */ TempPte = ValidKernelPte; TempPde = ValidKernelPde; Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Fri Feb 19 23:43:34 2010 @@ -284,10 +284,6 @@ KeBugCheck(MEMORY_MANAGEMENT); } Entry = PFN_TO_PTE(Pfn) | PA_PRESENT | PA_READWRITE; - if (Ke386GlobalPagesEnabled) - { - Entry |= PA_GLOBAL; - } if(0 != InterlockedCompareExchangePte(&MmGlobalKernelPageDirectory[PdeOffset], Entry, 0)) { MmReleasePageMemoryConsumer(MC_SYSTEM, Pfn); @@ -758,10 +754,6 @@ if (Address >= MmSystemRangeStart) { Attributes &= ~PA_USER; - if (Ke386GlobalPagesEnabled) - { - Attributes |= PA_GLOBAL; - } } else { @@ -907,10 +899,6 @@ if (Address >= MmSystemRangeStart) { Attributes &= ~PA_USER; - if (Ke386GlobalPagesEnabled) - { - Attributes |= PA_GLOBAL; - } } else { @@ -1017,11 +1005,6 @@ 0 == MmGlobalKernelPageDirectory[i] && 0 != CurrentPageDirectory[i]) { MmGlobalKernelPageDirectory[i] = CurrentPageDirectory[i]; - if (Ke386GlobalPagesEnabled) - { - MmGlobalKernelPageDirectory[i] |= PA_GLOBAL; - CurrentPageDirectory[i] |= PA_GLOBAL; - } } } }

1 0

[ekohl] 45626: [SERVICES] Set default status to SERVICE_START_PENDING when starting a service. [SYSSETUP] Wait until PlugPlay service is up. Bug #4142. [UMPNPMGR] Update the service control manager's status information. Patches by Dmitry Gorbachev.
by ekohl＠svn.reactos.org 19 Feb '10

19 Feb '10

Author: ekohl Date: Fri Feb 19 21:03:11 2010 New Revision: 45626 URL: http://svn.reactos.org/svn/reactos?rev=45626&view=rev Log: [SERVICES] Set default status to SERVICE_START_PENDING when starting a service. [SYSSETUP] Wait until PlugPlay service is up. Bug #4142. [UMPNPMGR] Update the service control manager's status information. Patches by Dmitry Gorbachev. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/base/system/services/database.c trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Fri Feb 19 21:03:11 2010 @@ -51,12 +51,11 @@ /* GLOBALS ******************************************************************/ -static VOID CALLBACK -ServiceMain(DWORD argc, LPTSTR *argv); - -static SERVICE_TABLE_ENTRY ServiceTable[2] = -{ - {TEXT("PlugPlay"), ServiceMain}, +static VOID CALLBACK ServiceMain(DWORD, LPWSTR *); +static WCHAR ServiceName[] = L"PlugPlay"; +static SERVICE_TABLE_ENTRYW ServiceTable[] = +{ + {ServiceName, ServiceMain}, {NULL, NULL} }; @@ -2446,16 +2445,92 @@ } -static VOID CALLBACK -ServiceMain(DWORD argc, LPTSTR *argv) +static DWORD WINAPI +ServiceControlHandler(DWORD dwControl, + DWORD dwEventType, + LPVOID lpEventData, + LPVOID lpContext) +{ + /* FIXME */ + DPRINT1("ServiceControlHandler() called (control code %lu)\n", dwControl); + return ERROR_SUCCESS; +} + + +static DWORD +ServiceInit(VOID) { HANDLE hThread; DWORD dwThreadId; - - UNREFERENCED_PARAMETER(argc); - UNREFERENCED_PARAMETER(argv); - - DPRINT("ServiceMain() called\n"); + DWORD dwError; + BOOLEAN OldValue; + + /* We need this privilege for using CreateProcessAsUserW */ + RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, + TRUE, + FALSE, + &OldValue); + + hInstallEvent = CreateEvent(NULL, + TRUE, + SetupIsActive()/*FALSE*/, + NULL); + if (hInstallEvent == NULL) + { + dwError = GetLastError(); + DPRINT1("Could not create the Install Event! (Error %lu)\n", dwError); + return dwError; + } + + hDeviceInstallListNotEmpty = CreateEvent(NULL, + FALSE, + FALSE, + NULL); + if (hDeviceInstallListNotEmpty == NULL) + { + dwError = GetLastError(); + DPRINT1("Could not create the Event! (Error %lu)\n", dwError); + return dwError; + } + + hNoPendingInstalls = CreateEventW(NULL, + TRUE, + FALSE, + L"Global\\PnP_No_Pending_Install_Events"); + if (hNoPendingInstalls == NULL) + { + dwError = GetLastError(); + DPRINT1("Could not create the Event! (Error %lu)\n", dwError); + return dwError; + } + +#ifdef HAVE_SLIST_ENTRY_IMPLEMENTED + InitializeSListHead(&DeviceInstallListHead); +#else + InitializeListHead(&DeviceInstallListHead); +#endif + + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Enum", + 0, + KEY_ALL_ACCESS, + &hEnumKey); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Could not open the Enum Key! (Error %lu)\n", dwError); + return dwError; + } + + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Control\\Class", + 0, + KEY_ALL_ACCESS, + &hClassKey); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Could not open the Class Key! (Error %lu)\n", dwError); + return dwError; + } hThread = CreateThread(NULL, 0, @@ -2463,8 +2538,11 @@ NULL, 0, &dwThreadId); - if (hThread != NULL) - CloseHandle(hThread); + if (hThread == NULL) + { + return GetLastError(); + } + CloseHandle(hThread); hThread = CreateThread(NULL, 0, @@ -2472,8 +2550,11 @@ NULL, 0, &dwThreadId); - if (hThread != NULL) - CloseHandle(hThread); + if (hThread == NULL) + { + return GetLastError(); + } + CloseHandle(hThread); hThread = CreateThread(NULL, 0, @@ -2481,87 +2562,80 @@ NULL, 0, &dwThreadId); - if (hThread != NULL) - CloseHandle(hThread); - - DPRINT("ServiceMain() done\n"); -} - - -int -wmain(int argc, WCHAR *argv[]) -{ - BOOLEAN OldValue; + if (hThread == NULL) + { + return GetLastError(); + } + CloseHandle(hThread); + + return ERROR_SUCCESS; +} + + +static VOID CALLBACK +ServiceMain(DWORD argc, + LPWSTR *argv) +{ + SERVICE_STATUS ServiceStatus; + SERVICE_STATUS_HANDLE ServiceStatusHandle; DWORD dwError; UNREFERENCED_PARAMETER(argc); UNREFERENCED_PARAMETER(argv); - DPRINT("Umpnpmgr: main() started\n"); - - /* We need this privilege for using CreateProcessAsUserW */ - RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, TRUE, FALSE, &OldValue); - - hInstallEvent = CreateEvent(NULL, TRUE, SetupIsActive()/*FALSE*/, NULL); - if (hInstallEvent == NULL) + DPRINT("ServiceMain() called\n"); + + ServiceStatusHandle = RegisterServiceCtrlHandlerExW(ServiceName, + ServiceControlHandler, + NULL); + if (!ServiceStatusHandle) { dwError = GetLastError(); - DPRINT1("Could not create the Install Event! (Error %lu)\n", dwError); - return dwError; - } - - hDeviceInstallListNotEmpty = CreateEvent(NULL, FALSE, FALSE, NULL); - if (hDeviceInstallListNotEmpty == NULL) - { - dwError = GetLastError(); - DPRINT1("Could not create the Event! (Error %lu)\n", dwError); - return dwError; - } - - hNoPendingInstalls = CreateEventW(NULL, - TRUE, - FALSE, - L"Global\\PnP_No_Pending_Install_Events"); - if (hNoPendingInstalls == NULL) - { - dwError = GetLastError(); - DPRINT1("Could not create the Event! (Error %lu)\n", dwError); - return dwError; - } - -#ifdef HAVE_SLIST_ENTRY_IMPLEMENTED - InitializeSListHead(&DeviceInstallListHead); -#else - InitializeListHead(&DeviceInstallListHead); -#endif - - dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"System\\CurrentControlSet\\Enum", - 0, - KEY_ALL_ACCESS, - &hEnumKey); + DPRINT1("RegisterServiceCtrlHandlerW() failed! (Error %lu)\n", dwError); + return; + } + + ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + ServiceStatus.dwCurrentState = SERVICE_START_PENDING; + ServiceStatus.dwControlsAccepted = 0; + ServiceStatus.dwWin32ExitCode = NO_ERROR; + ServiceStatus.dwServiceSpecificExitCode = 0; + ServiceStatus.dwCheckPoint = 0; + ServiceStatus.dwWaitHint = 2000; + + SetServiceStatus(ServiceStatusHandle, + &ServiceStatus); + + dwError = ServiceInit(); if (dwError != ERROR_SUCCESS) { - DPRINT1("Could not open the Enum Key! (Error %lu)\n", dwError); - return dwError; - } - - dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"System\\CurrentControlSet\\Control\\Class", - 0, - KEY_ALL_ACCESS, - &hClassKey); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("Could not open the Class Key! (Error %lu)\n", dwError); - return dwError; - } - - StartServiceCtrlDispatcher(ServiceTable); - - DPRINT("Umpnpmgr: main() done\n"); - - ExitThread(0); + DPRINT1("Service stopped\n"); + ServiceStatus.dwCurrentState = SERVICE_STOPPED; + } + else + { + ServiceStatus.dwCurrentState = SERVICE_RUNNING; + } + + SetServiceStatus(ServiceStatusHandle, + &ServiceStatus); + + DPRINT("ServiceMain() done\n"); +} + + +int +wmain(int argc, + WCHAR *argv[]) +{ + UNREFERENCED_PARAMETER(argc); + UNREFERENCED_PARAMETER(argv); + + DPRINT1("Umpnpmgr: main() started\n"); + + StartServiceCtrlDispatcherW(ServiceTable); + + DPRINT1("Umpnpmgr: main() done\n"); return 0; } Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Fri Feb 19 21:03:11 2010 @@ -1054,7 +1054,7 @@ { Group->ServicesRunning = TRUE; } - Service->Status.dwCurrentState = SERVICE_RUNNING; + Service->Status.dwCurrentState = SERVICE_START_PENDING; } #if 0 else Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Fri Feb 19 21:03:11 2010 @@ -20,7 +20,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * PURPOSE: System setup - * FILE: lib/syssetup/install.c + * FILE: dll/win32/syssetup/install.c * PROGRAMER: Eric Kohl */ @@ -473,30 +473,100 @@ static BOOL EnableUserModePnpManager(VOID) { + SERVICE_STATUS_PROCESS ServiceStatus; SC_HANDLE hSCManager = NULL; SC_HANDLE hService = NULL; + DWORD dwStartTickCount; + DWORD dwOldCheckPoint; + DWORD BytesNeeded = 0; + DWORD dwWaitTime; + DWORD dwMaxWait; BOOL ret = FALSE; hSCManager = OpenSCManager(NULL, NULL, 0); if (hSCManager == NULL) goto cleanup; - hService = OpenServiceW(hSCManager, L"PlugPlay", SERVICE_CHANGE_CONFIG | SERVICE_START); + hService = OpenServiceW(hSCManager, + L"PlugPlay", + SERVICE_CHANGE_CONFIG | SERVICE_START | SERVICE_QUERY_STATUS); if (hService == NULL) goto cleanup; - ret = ChangeServiceConfigW( - hService, - SERVICE_NO_CHANGE, SERVICE_AUTO_START, SERVICE_NO_CHANGE, - NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ret = ChangeServiceConfigW(hService, + SERVICE_NO_CHANGE, + SERVICE_AUTO_START, + SERVICE_NO_CHANGE, + NULL, NULL, NULL, + NULL, NULL, NULL, NULL); if (!ret) goto cleanup; ret = StartServiceW(hService, 0, NULL); if (!ret) + { + /* If the service is already running, just return TRUE */ + ret = GetLastError() == ERROR_SERVICE_ALREADY_RUNNING; goto cleanup; - - ret = TRUE; + } + + ret = QueryServiceStatusEx(hService, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded); + if (!ret) + goto cleanup; + + /* We don't want to wait for more than 30 seconds */ + dwMaxWait = 30000; + dwStartTickCount = GetTickCount(); + + /* Loop until it's running */ + while (ServiceStatus.dwCurrentState != SERVICE_RUNNING) + { + dwOldCheckPoint = ServiceStatus.dwCheckPoint; + dwWaitTime = ServiceStatus.dwWaitHint / 10; + + /* Get the latest status info */ + if (!QueryServiceStatusEx(hService, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded)) + { + /* Something went wrong... */ + break; + } + + /* Is the service making progress? */ + if (ServiceStatus.dwCheckPoint > dwOldCheckPoint) + { + /* It is, get the latest tickcount to reset the max wait time */ + dwStartTickCount = GetTickCount(); + dwOldCheckPoint = ServiceStatus.dwCheckPoint; + } + else + { + /* It's not, make sure we haven't exceeded our wait time */ + if (GetTickCount() >= dwStartTickCount + dwMaxWait) + { + /* We have, give up */ + break; + } + } + + /* Adjust the wait hint times */ + if (dwWaitTime < 200) + dwWaitTime = 200; + else if (dwWaitTime > 10000) + dwWaitTime = 10000; + + /* Wait before trying again */ + Sleep(dwWaitTime); + } + + ret = ServiceStatus.dwCurrentState == SERVICE_RUNNING; cleanup: if (hSCManager != NULL)

1 0

[sir_richard] 45625: [NTOS]: Fix premature setting of the page location of a newly allocated MDL page. Because the zeroing of non-zeroed pages is done after the initial page allocation loop (and by checking which list the page was on), setting the page location as ActiveAndValid made the zero loop believe the page was unzeroed (even though it could've come from the zeroed list), causing a superflous second zero operation.
by sir_richard＠svn.reactos.org 19 Feb '10

19 Feb '10

Author: sir_richard Date: Fri Feb 19 19:29:29 2010 New Revision: 45625 URL: http://svn.reactos.org/svn/reactos?rev=45625&view=rev Log: [NTOS]: Fix premature setting of the page location of a newly allocated MDL page. Because the zeroing of non-zeroed pages is done after the initial page allocation loop (and by checking which list the page was on), setting the page location as ActiveAndValid made the zero loop believe the page was unzeroed (even though it could've come from the zeroed list), causing a superflous second zero operation. Modified: trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Fri Feb 19 19:29:29 2010 @@ -480,7 +480,6 @@ Pfn1->u3.e1.StartOfAllocation = 1; Pfn1->u3.e1.EndOfAllocation = 1; Pfn1->u3.e2.ReferenceCount = 1; - Pfn1->u3.e1.PageLocation = ActiveAndValid; Pfn1->SavedSwapEntry = 0; //

1 0

[sir_richard] 45624: [NTOS]: Fix a logic error which could cause pages on the free list which failed to be zeroed out due to running out of hyperspace mappings to appear as being on the zero page list even though they were inserted back on the free page list.
by sir_richard＠svn.reactos.org 19 Feb '10

19 Feb '10

Author: sir_richard Date: Fri Feb 19 19:25:29 2010 New Revision: 45624 URL: http://svn.reactos.org/svn/reactos?rev=45624&view=rev Log: [NTOS]: Fix a logic error which could cause pages on the free list which failed to be zeroed out due to running out of hyperspace mappings to appear as being on the zero page list even though they were inserted back on the free page list. Modified: trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Fri Feb 19 19:25:29 2010 @@ -1000,15 +1000,16 @@ Status = MiZeroPage(Pfn); oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - PageDescriptor->u3.e1.PageLocation = ZeroedPageList; if (NT_SUCCESS(Status)) { InsertHeadList(&FreeZeroedPageListHead, ListEntry); + PageDescriptor->u3.e1.PageLocation = ZeroedPageList; Count++; } else { InsertHeadList(&FreeUnzeroedPageListHead, ListEntry); + PageDescriptor->u3.e1.PageLocation = FreePageList; UnzeroedPageCount++; }

1 0

[sir_richard] 45623: [NTOS]: Fix an off-by-! error which caused MDL page allocation to use used pages instead of free pages.
by sir_richard＠svn.reactos.org 19 Feb '10

19 Feb '10

Author: sir_richard Date: Fri Feb 19 19:23:07 2010 New Revision: 45623 URL: http://svn.reactos.org/svn/reactos?rev=45623&view=rev Log: [NTOS]: Fix an off-by-! error which caused MDL page allocation to use used pages instead of free pages. Modified: trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Fri Feb 19 19:23:07 2010 @@ -516,7 +516,7 @@ // // Make sure it's free and if this is our first pass, zeroed // - if (!MiIsPfnInUse(Pfn1)) continue; + if (MiIsPfnInUse(Pfn1)) continue; if ((Pfn1->u3.e1.PageLocation == ZeroedPageList) != LookForZeroedPages) continue; //

1 0

[sir_richard] 45622: [NTOS]: It seems the code to release a page was not properly removing a page from the working set bitmap/list in one scenario, so I added the call here too.
by sir_richard＠svn.reactos.org 19 Feb '10

19 Feb '10

Author: sir_richard Date: Fri Feb 19 18:55:22 2010 New Revision: 45622 URL: http://svn.reactos.org/svn/reactos?rev=45622&view=rev Log: [NTOS]: It seems the code to release a page was not properly removing a page from the working set bitmap/list in one scenario, so I added the call here too. Modified: trunk/reactos/ntoskrnl/mm/balance.c Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Fri Feb 19 18:55:22 2010 @@ -120,6 +120,7 @@ if (IsListEmpty(&AllocationListHead) || MmAvailablePages < MiMinimumAvailablePages) { KeReleaseSpinLock(&AllocationListLock, OldIrql); + if(Consumer == MC_USER) MmRemoveLRUUserPage(Page); OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MmDereferencePage(Page); KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql);

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2010