Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[mpiulachs] 33539: - Add specific properties to the keyboardlayout module type. They will assist us on autogenerating/updating the [keyboardLayout] & [Files.KeyboardLayout] from txtsetup and registry information automatically in the near future note: All rbuild files in reactos\dll\keyboard must be updated to contain the follwing information: <module name="kbdusl" type="keyboardlayout" (...) description="US Dvorak for left hand" lcid="00030409" layoutId="001A" layoutnameresid="5027" >

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Thu May 15 17:38:18 2008 New Revision: 33539 URL: http://svn.reactos.org/svn/reactos?rev=33539&view=rev Log: - Add specific properties to the keyboardlayout module type. They will assist us on autogenerating/updating the [keyboardLayout] & [Files.KeyboardLayout] from txtsetup and registry information automatically in the near future note: All rbuild files in reactos\dll\keyboard must be updated to contain the follwing information: <module name="kbdusl" type="keyboardlayout" (...) description="US Dvorak for left hand" lcid="00030409" layoutId="001A" layoutnameresid="5027" > Modified: trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Thu May 15 17:38:18 2008 @@ -479,6 +479,18 @@ lcid = att->value; else lcid = ""; + + att = moduleNode.GetAttribute ( "layoutid", false ); + if (type == KeyboardLayout && att != NULL ) + layoutId = att->value; + else + layoutId = ""; + + att = moduleNode.GetAttribute ( "layoutnameresid", false ); + if (type == KeyboardLayout && att != NULL ) + layoutNameResId = att->value; + else + layoutNameResId = ""; SetImportLibrary ( NULL ); } Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] Thu May 15 17:38:18 2008 @@ -378,6 +378,8 @@ FileLocation *install; std::string description; std::string lcid; + std::string layoutId; + std::string layoutNameResId; Module ( const Project& project, const XMLElement& moduleNode,

16 years, 4 months

[mpiulachs] 33538: - change module type kernelmodedll -> keyboardlayout

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Thu May 15 17:23:34 2008 New Revision: 33538 URL: http://svn.reactos.org/svn/reactos?rev=33538&view=rev Log: - change module type kernelmodedll -> keyboardlayout Modified: trunk/reactos/dll/keyboard/kbda1/kbda1.rbuild trunk/reactos/dll/keyboard/kbda2/kbda2.rbuild trunk/reactos/dll/keyboard/kbda3/kbda3.rbuild trunk/reactos/dll/keyboard/kbdal/kbdal.rbuild trunk/reactos/dll/keyboard/kbdarme/kbdarme.rbuild trunk/reactos/dll/keyboard/kbdarmw/kbdarmw.rbuild trunk/reactos/dll/keyboard/kbdaze/kbdaze.rbuild trunk/reactos/dll/keyboard/kbdazel/kbdazel.rbuild trunk/reactos/dll/keyboard/kbdbe/kbdbe.rbuild trunk/reactos/dll/keyboard/kbdbga/kbdbga.rbuild trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild trunk/reactos/dll/keyboard/kbdblr/kbdblr.rbuild trunk/reactos/dll/keyboard/kbdbr/kbdbr.rbuild trunk/reactos/dll/keyboard/kbdbur/kbdbur.rbuild trunk/reactos/dll/keyboard/kbdcan/kbdcan.rbuild trunk/reactos/dll/keyboard/kbdcr/kbdcr.rbuild trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild trunk/reactos/dll/keyboard/kbdda/kbdda.rbuild trunk/reactos/dll/keyboard/kbddv/kbddv.rbuild trunk/reactos/dll/keyboard/kbdes/kbdes.rbuild trunk/reactos/dll/keyboard/kbdest/kbdest.rbuild trunk/reactos/dll/keyboard/kbdfc/kbdfc.rbuild trunk/reactos/dll/keyboard/kbdfi/kbdfi.rbuild trunk/reactos/dll/keyboard/kbdfr/kbdfr.rbuild trunk/reactos/dll/keyboard/kbdgeo/kbdgeo.rbuild trunk/reactos/dll/keyboard/kbdgerg/kbdgerg.rbuild trunk/reactos/dll/keyboard/kbdgneo/kbdgneo.rbuild trunk/reactos/dll/keyboard/kbdgr/kbdgr.rbuild trunk/reactos/dll/keyboard/kbdgrist/kbdgrist.rbuild trunk/reactos/dll/keyboard/kbdhe/kbdhe.rbuild trunk/reactos/dll/keyboard/kbdheb/kbdheb.rbuild trunk/reactos/dll/keyboard/kbdhu/kbdhu.rbuild trunk/reactos/dll/keyboard/kbdic/kbdic.rbuild trunk/reactos/dll/keyboard/kbdinasa/kbdinasa.rbuild trunk/reactos/dll/keyboard/kbdinben/kbdinben.rbuild trunk/reactos/dll/keyboard/kbdindev/kbdindev.rbuild trunk/reactos/dll/keyboard/kbdinguj/kbdinguj.rbuild trunk/reactos/dll/keyboard/kbdinmal/kbdinmal.rbuild trunk/reactos/dll/keyboard/kbdit/kbdit.rbuild trunk/reactos/dll/keyboard/kbdja/kbdja.rbuild trunk/reactos/dll/keyboard/kbdkaz/kbdkaz.rbuild trunk/reactos/dll/keyboard/kbdlt/kbdlt.rbuild trunk/reactos/dll/keyboard/kbdlv/kbdlv.rbuild trunk/reactos/dll/keyboard/kbdmac/kbdmac.rbuild trunk/reactos/dll/keyboard/kbdne/kbdne.rbuild trunk/reactos/dll/keyboard/kbdno/kbdno.rbuild trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild (contents, props changed) trunk/reactos/dll/keyboard/kbdpo/kbdpo.rbuild trunk/reactos/dll/keyboard/kbdro/kbdro.rbuild trunk/reactos/dll/keyboard/kbdru/kbdru.rbuild trunk/reactos/dll/keyboard/kbdru1/kbdru1.rbuild trunk/reactos/dll/keyboard/kbdsg/kbdsg.rbuild trunk/reactos/dll/keyboard/kbdsk/kbdsk.rbuild trunk/reactos/dll/keyboard/kbdsw/kbdsw.rbuild trunk/reactos/dll/keyboard/kbdtat/kbdtat.rbuild trunk/reactos/dll/keyboard/kbdth/kbdth.rbuild trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild trunk/reactos/dll/keyboard/kbduk/kbduk.rbuild trunk/reactos/dll/keyboard/kbdur/kbdur.rbuild trunk/reactos/dll/keyboard/kbdurs/kbdurs.rbuild trunk/reactos/dll/keyboard/kbdus/kbdus.rbuild trunk/reactos/dll/keyboard/kbdusa/kbdusa.rbuild trunk/reactos/dll/keyboard/kbdusl/kbdusl.rbuild trunk/reactos/dll/keyboard/kbdusr/kbdusr.rbuild trunk/reactos/dll/keyboard/kbdusx/kbdusx.rbuild trunk/reactos/dll/keyboard/kbduzb/kbduzb.rbuild trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild trunk/reactos/dll/keyboard/kbdycc/kbdycc.rbuild trunk/reactos/dll/keyboard/kbdycl/kbdycl.rbuild Modified: trunk/reactos/dll/keyboard/kbda1/kbda1.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbda1/kbda1.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbda1/kbda1.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbda1/kbda1.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbda1" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbda1.dll" allowwarnings="true"> +<module name="kbda1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbda1.dll" allowwarnings="true"> <importlibrary definition="kbda1.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbda2/kbda2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbda2/kbda2.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbda2/kbda2.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbda2/kbda2.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbda2" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbda2.dll" allowwarnings="true"> +<module name="kbda2" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbda2.dll" allowwarnings="true"> <importlibrary definition="kbda2.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbda3/kbda3.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbda3/kbda3.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbda3/kbda3.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbda3/kbda3.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbda3" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbda3.dll" allowwarnings="true"> +<module name="kbda3" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbda3.dll" allowwarnings="true"> <importlibrary definition="kbda3.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdal/kbdal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdal/kbdal.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdal/kbdal.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdal/kbdal.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdal" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdal.dll" allowwarnings="true"> +<module name="kbdal" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdal.dll" allowwarnings="true"> <importlibrary definition="kbdal.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdarme/kbdarme.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdarme/kbdar… ============================================================================== --- trunk/reactos/dll/keyboard/kbdarme/kbdarme.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdarme/kbdarme.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdarme" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdarme.dll" allowwarnings="true"> +<module name="kbdarme" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdarme.dll" allowwarnings="true"> <importlibrary definition="kbdarme.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdarmw/kbdarmw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdarmw/kbdar… ============================================================================== --- trunk/reactos/dll/keyboard/kbdarmw/kbdarmw.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdarmw/kbdarmw.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdarmw" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdarmw.dll" allowwarnings="true"> +<module name="kbdarmw" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdarmw.dll" allowwarnings="true"> <importlibrary definition="kbdarmw.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdaze/kbdaze.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdaze/kbdaze… ============================================================================== --- trunk/reactos/dll/keyboard/kbdaze/kbdaze.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdaze/kbdaze.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdaze" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdaze.dll" allowwarnings="true"> +<module name="kbdaze" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdaze.dll" allowwarnings="true"> <importlibrary definition="kbdaze.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdazel/kbdazel.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdazel/kbdaz… ============================================================================== --- trunk/reactos/dll/keyboard/kbdazel/kbdazel.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdazel/kbdazel.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdazel" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdazel.dll" allowwarnings="true"> +<module name="kbdazel" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdazel.dll" allowwarnings="true"> <importlibrary definition="kbdazel.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdbe/kbdbe.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbe/kbdbe.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbe/kbdbe.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbe/kbdbe.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdbe" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdbe.dll" allowwarnings="true"> +<module name="kbdbe" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbe.dll" allowwarnings="true"> <importlibrary definition="kbdbe.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdbga/kbdbga.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbga/kbdbga… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbga/kbdbga.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbga/kbdbga.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,4 +1,4 @@ -<module name="kbdbga" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdbga.dll" allowwarnings="true"> +<module name="kbdbga" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbga.dll" allowwarnings="true"> <importlibrary definition="kbdbga.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbgm/kbdbgm… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,4 +1,4 @@ -<module name="kbdbgm" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdbgm.dll" allowwarnings="true"> +<module name="kbdbgm" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbgm.dll" allowwarnings="true"> <importlibrary definition="kbdbgm.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbgt/kbdbgt… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,4 +1,4 @@ -<module name="kbdbgt" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdbgt.dll" allowwarnings="true"> +<module name="kbdbgt" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbgt.dll" allowwarnings="true"> <importlibrary definition="kbdbgt.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdblr/kbdblr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdblr/kbdblr… ============================================================================== --- trunk/reactos/dll/keyboard/kbdblr/kbdblr.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdblr/kbdblr.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdblr" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdblr.dll" allowwarnings="true"> +<module name="kbdblr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdblr.dll" allowwarnings="true"> <importlibrary definition="kbdblr.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdbr/kbdbr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbr/kbdbr.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbr/kbdbr.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbr/kbdbr.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdbr" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdbr.dll" allowwarnings="true"> +<module name="kbdbr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbr.dll" allowwarnings="true"> <importlibrary definition="kbdbr.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdbur/kbdbur.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbur/kbdbur… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbur/kbdbur.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbur/kbdbur.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdbur" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdbur.dll" allowwarnings="true"> +<module name="kbdbur" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbur.dll" allowwarnings="true"> <importlibrary definition="kbdbur.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdcan/kbdcan.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcan/kbdcan… ============================================================================== --- trunk/reactos/dll/keyboard/kbdcan/kbdcan.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdcan/kbdcan.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdcan" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdcan.dll" allowwarnings="true"> +<module name="kbdcan" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdcan.dll" allowwarnings="true"> <importlibrary definition="kbdcan.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdcr/kbdcr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcr/kbdcr.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdcr/kbdcr.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdcr/kbdcr.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdcr" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdcr.dll" allowwarnings="true"> +<module name="kbdcr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdcr.dll" allowwarnings="true"> <importlibrary definition="kbdcr.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcz1/kbdcz1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,4 +1,4 @@ -<module name="kbdcz1" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdcz1.dll" allowwarnings="true"> +<module name="kbdcz1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdcz1.dll" allowwarnings="true"> <importlibrary definition="kbdcz1.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdda/kbdda.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdda/kbdda.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdda/kbdda.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdda/kbdda.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdda" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdda.dll" allowwarnings="true"> +<module name="kbdda" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdda.dll" allowwarnings="true"> <importlibrary definition="kbdda.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbddv/kbddv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbddv/kbddv.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbddv/kbddv.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbddv/kbddv.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbddv" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbddv.dll" allowwarnings="true"> +<module name="kbddv" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbddv.dll" allowwarnings="true"> <importlibrary definition="kbddv.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdes/kbdes.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdes/kbdes.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdes/kbdes.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdes/kbdes.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdes" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdes.dll" allowwarnings="true"> +<module name="kbdes" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdes.dll" allowwarnings="true"> <importlibrary definition="kbdes.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdest/kbdest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdest/kbdest… ============================================================================== --- trunk/reactos/dll/keyboard/kbdest/kbdest.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdest/kbdest.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdest" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdest.dll" allowwarnings="true"> +<module name="kbdest" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdest.dll" allowwarnings="true"> <importlibrary definition="kbdest.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdfc/kbdfc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdfc/kbdfc.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdfc/kbdfc.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdfc/kbdfc.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdfc" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdfc.dll" allowwarnings="true"> +<module name="kbdfc" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdfc.dll" allowwarnings="true"> <importlibrary definition="kbdfc.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdfi/kbdfi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdfi/kbdfi.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdfi/kbdfi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdfi/kbdfi.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdfi" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdfi.dll" allowwarnings="true"> +<module name="kbdfi" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdfi.dll" allowwarnings="true"> <importlibrary definition="kbdfi.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdfr/kbdfr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdfr/kbdfr.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdfr/kbdfr.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdfr/kbdfr.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdfr" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdfr.dll" allowwarnings="true"> +<module name="kbdfr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdfr.dll" allowwarnings="true"> <importlibrary definition="kbdfr.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdgeo/kbdgeo.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdgeo/kbdgeo… ============================================================================== --- trunk/reactos/dll/keyboard/kbdgeo/kbdgeo.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdgeo/kbdgeo.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdgeo" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdgeo.dll" allowwarnings="true"> +<module name="kbdgeo" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdgeo.dll" allowwarnings="true"> <importlibrary definition="kbdgeo.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdgerg/kbdgerg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdgerg/kbdge… ============================================================================== --- trunk/reactos/dll/keyboard/kbdgerg/kbdgerg.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdgerg/kbdgerg.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdgerg" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdgerg.dll" allowwarnings="true"> +<module name="kbdgerg" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdgerg.dll" allowwarnings="true"> <importlibrary definition="kbdgerg.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdgneo/kbdgneo.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdgneo/kbdgn… ============================================================================== --- trunk/reactos/dll/keyboard/kbdgneo/kbdgneo.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdgneo/kbdgneo.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdgneo" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdgneo.dll" allowwarnings="true"> +<module name="kbdgneo" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdgneo.dll" allowwarnings="true"> <importlibrary definition="kbdgneo.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdgr/kbdgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdgr/kbdgr.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdgr/kbdgr.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdgr/kbdgr.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdgr" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdgr.dll" allowwarnings="true"> +<module name="kbdgr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdgr.dll" allowwarnings="true"> <importlibrary definition="kbdgr.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdgrist/kbdgrist.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdgrist/kbdg… ============================================================================== --- trunk/reactos/dll/keyboard/kbdgrist/kbdgrist.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdgrist/kbdgrist.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdgrist" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdgrist.dll" allowwarnings="true"> +<module name="kbdgrist" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdgrist.dll" allowwarnings="true"> <importlibrary definition="kbdgrist.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdhe/kbdhe.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdhe/kbdhe.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdhe/kbdhe.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdhe/kbdhe.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdhe" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdhe.dll" allowwarnings="true"> +<module name="kbdhe" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdhe.dll" allowwarnings="true"> <importlibrary definition="kbdhe.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdheb/kbdheb.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdheb/kbdheb… ============================================================================== --- trunk/reactos/dll/keyboard/kbdheb/kbdheb.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdheb/kbdheb.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdheb" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdheb.dll" allowwarnings="true"> +<module name="kbdheb" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdheb.dll" allowwarnings="true"> <importlibrary definition="kbdheb.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdhu/kbdhu.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdhu/kbdhu.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdhu/kbdhu.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdhu/kbdhu.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdhu" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdhu.dll" allowwarnings="true"> +<module name="kbdhu" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdhu.dll" allowwarnings="true"> <importlibrary definition="kbdhu.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdic/kbdic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdic/kbdic.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdic/kbdic.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdic/kbdic.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdic" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdic.dll" allowwarnings="true"> +<module name="kbdic" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdic.dll" allowwarnings="true"> <importlibrary definition="kbdic.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdinasa/kbdinasa.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinasa/kbdi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdinasa/kbdinasa.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdinasa/kbdinasa.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdinasa" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdinasa.dll" allowwarnings="true"> +<module name="kbdinasa" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdinasa.dll" allowwarnings="true"> <importlibrary definition="kbdinasa.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdinben/kbdinben.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinben/kbdi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdinben/kbdinben.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdinben/kbdinben.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdinben" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdinben.dll" allowwarnings="true"> +<module name="kbdinben" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdinben.dll" allowwarnings="true"> <importlibrary definition="kbdinben.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdindev/kbdindev.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdindev/kbdi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdindev/kbdindev.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdindev/kbdindev.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdindev" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdindev.dll" allowwarnings="true"> +<module name="kbdindev" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdindev.dll" allowwarnings="true"> <importlibrary definition="kbdindev.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdinguj/kbdinguj.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinguj/kbdi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdinguj/kbdinguj.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdinguj/kbdinguj.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdinguj" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdinguj.dll" allowwarnings="true"> +<module name="kbdinguj" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdinguj.dll" allowwarnings="true"> <importlibrary definition="kbdinguj.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdinmal/kbdinmal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinmal/kbdi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdinmal/kbdinmal.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdinmal/kbdinmal.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdinmal" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdinmal.dll" allowwarnings="true"> +<module name="kbdinmal" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdinmal.dll" allowwarnings="true"> <importlibrary definition="kbdinmal.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdit/kbdit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdit/kbdit.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdit/kbdit.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdit/kbdit.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdit" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdit.dll" allowwarnings="true"> +<module name="kbdit" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdit.dll" allowwarnings="true"> <importlibrary definition="kbdit.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdja/kbdja.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdja/kbdja.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdja/kbdja.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdja/kbdja.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdja" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdja.dll" allowwarnings="true"> +<module name="kbdja" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdja.dll" allowwarnings="true"> <importlibrary definition="kbdja.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdkaz/kbdkaz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdkaz/kbdkaz… ============================================================================== --- trunk/reactos/dll/keyboard/kbdkaz/kbdkaz.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdkaz/kbdkaz.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdkaz" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdkaz.dll" allowwarnings="true"> +<module name="kbdkaz" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdkaz.dll" allowwarnings="true"> <importlibrary definition="kbdkaz.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdlt/kbdlt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdlt/kbdlt.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdlt/kbdlt.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdlt/kbdlt.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,4 +1,4 @@ -<module name="kbdlt" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdlt.dll" allowwarnings="true"> +<module name="kbdlt" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdlt.dll" allowwarnings="true"> <importlibrary definition="kbdlt.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdlv/kbdlv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdlv/kbdlv.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdlv/kbdlv.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdlv/kbdlv.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdlv" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdlv.dll" allowwarnings="true"> +<module name="kbdlv" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdlv.dll" allowwarnings="true"> <importlibrary definition="kbdlv.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdmac/kbdmac.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdmac/kbdmac… ============================================================================== --- trunk/reactos/dll/keyboard/kbdmac/kbdmac.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdmac/kbdmac.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdmac" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdmac.dll" allowwarnings="true"> +<module name="kbdmac" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdmac.dll" allowwarnings="true"> <importlibrary definition="kbdmac.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdne/kbdne.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdne/kbdne.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdne/kbdne.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdne/kbdne.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdne" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdne.dll" allowwarnings="true"> +<module name="kbdne" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdne.dll" allowwarnings="true"> <importlibrary definition="kbdne.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdno/kbdno.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdno/kbdno.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdno/kbdno.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdno/kbdno.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdno" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdno.dll" allowwarnings="true"> +<module name="kbdno" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdno.dll" allowwarnings="true"> <importlibrary definition="kbdno.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpl1/kbdpl1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,10 +1,10 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdpl1" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdpl1.dll" allowwarnings="true"> - <importlibrary definition="kbdpl1.def" /> - <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> - <define name="_WIN32_WINNT">0x0500</define> - <file>kbdpl1.c</file> - <file>kbdpl1.rc</file> -</module> +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kbdpl1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdpl1.dll" allowwarnings="true"> + <importlibrary definition="kbdpl1.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdpl1.c</file> + <file>kbdpl1.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/keyboard/kbdpo/kbdpo.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpo/kbdpo.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdpo/kbdpo.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdpo/kbdpo.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdpo" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdpo.dll" allowwarnings="true"> +<module name="kbdpo" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdpo.dll" allowwarnings="true"> <importlibrary definition="kbdpo.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdro/kbdro.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdro/kbdro.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdro/kbdro.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdro/kbdro.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdro" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdro.dll" allowwarnings="true"> +<module name="kbdro" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdro.dll" allowwarnings="true"> <importlibrary definition="kbdro.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdru/kbdru.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdru/kbdru.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdru/kbdru.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdru/kbdru.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdru" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdru.dll" allowwarnings="true"> +<module name="kbdru" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdru.dll" allowwarnings="true"> <importlibrary definition="kbdru.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdru1/kbdru1.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdru1/kbdru1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdru1/kbdru1.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdru1/kbdru1.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdru1" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdru1.dll" allowwarnings="true"> +<module name="kbdru1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdru1.dll" allowwarnings="true"> <importlibrary definition="kbdru1.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdsg/kbdsg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsg/kbdsg.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsg/kbdsg.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdsg/kbdsg.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdsg" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdsg.dll" allowwarnings="true"> +<module name="kbdsg" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdsg.dll" allowwarnings="true"> <importlibrary definition="kbdsg.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdsk/kbdsk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk/kbdsk.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk/kbdsk.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdsk/kbdsk.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdsk" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdsk.dll" allowwarnings="true"> +<module name="kbdsk" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdsk.dll" allowwarnings="true"> <importlibrary definition="kbdsk.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdsw/kbdsw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsw/kbdsw.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsw/kbdsw.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdsw/kbdsw.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdsw" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdsw.dll" allowwarnings="true"> +<module name="kbdsw" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdsw.dll" allowwarnings="true"> <importlibrary definition="kbdsw.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdtat/kbdtat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtat/kbdtat… ============================================================================== --- trunk/reactos/dll/keyboard/kbdtat/kbdtat.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdtat/kbdtat.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdtat" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdtat.dll" allowwarnings="true"> +<module name="kbdtat" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdtat.dll" allowwarnings="true"> <importlibrary definition="kbdtat.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdth/kbdth.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth/kbdth.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth/kbdth.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdth/kbdth.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdth" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdth.dll" allowwarnings="true"> +<module name="kbdth" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdth.dll" allowwarnings="true"> <importlibrary definition="kbdth.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtuf/kbdtuf… ============================================================================== --- trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdtuf" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdtuf.dll" allowwarnings="true"> +<module name="kbdtuf" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdtuf.dll" allowwarnings="true"> <importlibrary definition="kbdtuf.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtuq/kbdtuq… ============================================================================== --- trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdtuq" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdtuq.dll" allowwarnings="true"> +<module name="kbdtuq" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdtuq.dll" allowwarnings="true"> <importlibrary definition="kbdtuq.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbduk/kbduk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbduk/kbduk.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbduk/kbduk.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbduk/kbduk.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbduk" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbduk.dll" allowwarnings="true"> +<module name="kbduk" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbduk.dll" allowwarnings="true"> <importlibrary definition="kbduk.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdur/kbdur.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdur/kbdur.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdur/kbdur.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdur/kbdur.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdur" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdur.dll" allowwarnings="true"> +<module name="kbdur" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdur.dll" allowwarnings="true"> <importlibrary definition="kbdur.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdurs/kbdurs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdurs/kbdurs… ============================================================================== --- trunk/reactos/dll/keyboard/kbdurs/kbdurs.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdurs/kbdurs.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdurs" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdurs.dll" allowwarnings="true"> +<module name="kbdurs" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdurs.dll" allowwarnings="true"> <importlibrary definition="kbdurs.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdus/kbdus.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdus/kbdus.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdus/kbdus.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdus/kbdus.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdus" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdus.dll" allowwarnings="true"> +<module name="kbdus" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdus.dll" allowwarnings="true"> <importlibrary definition="kbdus.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdusa/kbdusa.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusa/kbdusa… ============================================================================== --- trunk/reactos/dll/keyboard/kbdusa/kbdusa.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdusa/kbdusa.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdusa" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdusa.dll" allowwarnings="true"> +<module name="kbdusa" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdusa.dll" allowwarnings="true"> <importlibrary definition="kbdusa.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdusl/kbdusl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusl/kbdusl… ============================================================================== --- trunk/reactos/dll/keyboard/kbdusl/kbdusl.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdusl/kbdusl.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdusl" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdusl.dll" allowwarnings="true"> +<module name="kbdusl" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdusl.dll" allowwarnings="true"> <importlibrary definition="kbdusl.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdusr/kbdusr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusr/kbdusr… ============================================================================== --- trunk/reactos/dll/keyboard/kbdusr/kbdusr.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdusr/kbdusr.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdusr" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdusr.dll" allowwarnings="true"> +<module name="kbdusr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdusr.dll" allowwarnings="true"> <importlibrary definition="kbdusr.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdusx/kbdusx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusx/kbdusx… ============================================================================== --- trunk/reactos/dll/keyboard/kbdusx/kbdusx.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdusx/kbdusx.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdusx" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdusx.dll" allowwarnings="true"> +<module name="kbdusx" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdusx.dll" allowwarnings="true"> <importlibrary definition="kbdusx.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbduzb/kbduzb.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbduzb/kbduzb… ============================================================================== --- trunk/reactos/dll/keyboard/kbduzb/kbduzb.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbduzb/kbduzb.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbduzb" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbduzb.dll" allowwarnings="true"> +<module name="kbduzb" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbduzb.dll" allowwarnings="true"> <importlibrary definition="kbduzb.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdvntc/kbdvn… ============================================================================== --- trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdvntc" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdvntc.dll" allowwarnings="true"> +<module name="kbdvntc" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdvntc.dll" allowwarnings="true"> <importlibrary definition="kbdvntc.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdycc/kbdycc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdycc/kbdycc… ============================================================================== --- trunk/reactos/dll/keyboard/kbdycc/kbdycc.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdycc/kbdycc.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdycc" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdycc.dll" allowwarnings="true"> +<module name="kbdycc" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdycc.dll" allowwarnings="true"> <importlibrary definition="kbdycc.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/keyboard/kbdycl/kbdycl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdycl/kbdycl… ============================================================================== --- trunk/reactos/dll/keyboard/kbdycl/kbdycl.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdycl/kbdycl.rbuild [iso-8859-1] Thu May 15 17:23:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdycl" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdycl.dll" allowwarnings="true"> +<module name="kbdycl" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdycl.dll" allowwarnings="true"> <importlibrary definition="kbdycl.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" />

16 years, 4 months

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu May 15 15:43:26 2008 New Revision: 33537 URL: http://svn.reactos.org/svn/reactos?rev=33537&view=rev Log: Improve filter command by changing its syntax Syntax: filter [error|warning|trace|info|level]+|-[componentname|default] Modified: trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Thu May 15 15:43:26 2008 @@ -337,6 +337,7 @@ /* Convert Level to mask if it isn't already one */ if (Level < 32) Level = 1 << Level; + Level &= ~DPFLTR_MASK; /* Check if it is the default component */ if (ComponentId == DPFLTR_DEFAULT_ID) Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Thu May 15 15:43:26 2008 @@ -147,7 +147,7 @@ /* Others */ { NULL, NULL, "Others", NULL }, { "bugcheck", "bugcheck", "Bugchecks the system.", KdbpCmdBugCheck }, - { "filter", "filter componentname [error|warning|trace|info|level] [on|off]", "Enable/disable debug channels", KdbpCmdFilter }, + { "filter", "filter [error|warning|trace|info|level]+|-[componentname|default]", "Enable/disable debug channels", KdbpCmdFilter }, { "set", "set [var] [value]", "Sets var to value or displays value of var.", KdbpCmdSet }, { "help", "help", "Display help screen.", KdbpCmdHelp } }; @@ -377,68 +377,78 @@ STATIC BOOLEAN KdbpCmdFilter(ULONG Argc, PCHAR Argv[]) { - ULONG ComponentId, Level; - BOOLEAN State; - PCHAR pend; - - if (Argc < 2) - { - KdbpPrint("filter: component name argument required!\n"); - return TRUE; - } - if (!KdbpGetComponentId(Argv[1], &ComponentId)) - { - KdbpPrint("filter: '%s' is not a valid component name!\n", Argv[1]); - return TRUE; - } - - if (Argc < 3) - { - KdbpPrint("filter: level argument required!\n"); - return TRUE; - } - if (_stricmp(Argv[2], "error") == 0) - Level = DPFLTR_ERROR_LEVEL; - else if (_stricmp(Argv[2], "warning") == 0) - Level = DPFLTR_WARNING_LEVEL; - else if (_stricmp(Argv[2], "trace") == 0) - Level = DPFLTR_TRACE_LEVEL; - else if (_stricmp(Argv[2], "info") == 0) - Level = DPFLTR_INFO_LEVEL; - else - { - Level = strtoul(Argv[2], &pend, 0); - if (Argv[2] == pend || *pend != '\0') - { - KdbpPrint("filter: '%s' is not a valid level!\n", Argv[2]); - return TRUE; - } - } - - if (Argc < 4) - { - /* Display the state of the filter */ - if (NtQueryDebugFilterState(ComponentId, Level)) - KdbpPrint("Debug messages are enabled.\n"); - else - KdbpPrint("Debug messages are disabled.\n"); - return TRUE; - } - else - { - /* Set the filter state */ - if (_stricmp(Argv[3], "on") == 0) - State = TRUE; - else if (_stricmp(Argv[3], "off") == 0) - State = FALSE; - else - { - KdbpPrint("filter: '%s' is not a valid state!\n", Argv[3]); - return TRUE; - } - - return NT_SUCCESS(NtSetDebugFilterState(ComponentId, Level, State)); - } + ULONG i, j, ComponentId, Level; + ULONG set = DPFLTR_MASK, clear = DPFLTR_MASK; + PCHAR pend; + LPCSTR opt, p; + static struct { + LPCSTR Name; + ULONG Level; + } debug_classes[] = { + { "error", 1 << DPFLTR_ERROR_LEVEL }, + { "warning", 1 << DPFLTR_WARNING_LEVEL }, + { "trace", 1 << DPFLTR_TRACE_LEVEL }, + { "info", 1 << DPFLTR_INFO_LEVEL }, + }; + + for (i = 1; i < Argc; i++) + { + opt = Argv[i]; + p = opt + strcspn(opt, "+-"); + if (!p[0]) p = opt; /* assume it's a debug channel name */ + + if (p > opt) + { + for (j = 0; j < sizeof(debug_classes) / sizeof(debug_classes[0]); j++) + { + SIZE_T len = strlen(debug_classes[j].Name); + if (len != (p - opt)) + continue; + if (_strnicmp(opt, debug_classes[j].Name, len) == 0) /* found it */ + { + if (*p == '+') + set |= debug_classes[j].Level; + else + clear |= debug_classes[j].Level; + break; + } + } + if (j == sizeof(debug_classes) / sizeof(debug_classes[0])) + { + Level = strtoul(opt, &pend, 0); + if (pend != p) + { + KdbpPrint("filter: bad class name '%.*s'\n", p - opt, opt); + continue; + } + if (*p == '+') + set |= Level; + else + clear |= Level; + } + } + else + { + if (*p == '-') + clear = ~0; + else + set = ~0; + } + if (*p == '+' || *p == '-') + p++; + + if (!KdbpGetComponentId(p, &ComponentId)) + { + KdbpPrint("filter: '%s' is not a valid component name!\n", p); + return TRUE; + } + + /* Get current mask value */ + NtSetDebugFilterState(ComponentId, set, TRUE); + NtSetDebugFilterState(ComponentId, clear, FALSE); + } + + return TRUE; } /*!\brief Disassembles 10 instructions at eip or given address or

16 years, 4 months

[hpoussin] 33536: Fix debug output of strings

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu May 15 15:29:50 2008 New Revision: 33536 URL: http://svn.reactos.org/svn/reactos?rev=33536&view=rev Log: Fix debug output of strings Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/call.c trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmddbg.c trunk/reactos/base/shell/cmd/config.h trunk/reactos/base/shell/cmd/copy.c trunk/reactos/base/shell/cmd/date.c trunk/reactos/base/shell/cmd/del.c trunk/reactos/base/shell/cmd/dir.c trunk/reactos/base/shell/cmd/echo.c trunk/reactos/base/shell/cmd/for.c trunk/reactos/base/shell/cmd/goto.c trunk/reactos/base/shell/cmd/if.c trunk/reactos/base/shell/cmd/move.c trunk/reactos/base/shell/cmd/pause.c trunk/reactos/base/shell/cmd/precomp.h trunk/reactos/base/shell/cmd/ren.c trunk/reactos/base/shell/cmd/shift.c trunk/reactos/base/shell/cmd/start.c trunk/reactos/base/shell/cmd/time.c trunk/reactos/base/shell/cmd/where.c trunk/reactos/base/shell/cmd/window.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] Thu May 15 15:29:50 2008 @@ -170,7 +170,7 @@ VOID ExitBatch (LPTSTR msg) { - TRACE ("ExitBatch: (\'%s\')\n", msg); + TRACE ("ExitBatch: (\'%s\')\n", debugstr_aw(msg)); if (bc != NULL) { @@ -223,7 +223,7 @@ FILE_FLAG_SEQUENTIAL_SCAN, NULL); TRACE ("Batch: (\'%s\', \'%s\', \'%s\') hFile = %x\n", - fullname, firstword, param, hFile); + debugstr_aw(fullname), debugstr_aw(firstword), debugstr_aw(param), hFile); if (hFile == INVALID_HANDLE_VALUE) { @@ -434,7 +434,7 @@ continue; } - TRACE ("ReadBatchLine(): textline: \'%s\'\n", textline); + TRACE ("ReadBatchLine(): textline: \'%s\'\n", debugstr_aw(textline)); /* Strip leading spaces and trailing space/control chars */ for (first = textline; _istspace (*first); first++) Modified: trunk/reactos/base/shell/cmd/call.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/call.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/call.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/call.c [iso-8859-1] Thu May 15 15:29:50 2008 @@ -44,7 +44,7 @@ { LPBATCH_CONTEXT n = NULL; - TRACE ("cmd_call: (\'%s\',\'%s\')\n", cmd, param); + TRACE ("cmd_call: (\'%s\',\'%s\')\n", debugstr_aw(cmd), debugstr_aw(param)); if (!_tcsncmp (param, _T("/?"), 2)) { ConOutResPaging(TRUE,STRING_CALL_HELP); Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Thu May 15 15:29:50 2008 @@ -283,7 +283,7 @@ MYEX hShExt; HINSTANCE ret; - TRACE ("RunFile(%s)\n", filename); + TRACE ("RunFile(%s)\n", debugstr_aw(filename)); hShell32 = LoadLibrary(_T("SHELL32.DLL")); if (!hShell32) { @@ -330,7 +330,7 @@ TCHAR szWindowTitle[MAX_PATH]; DWORD dwExitCode = 0; - TRACE ("Execute: \'%s\' \'%s\'\n", first, rest); + TRACE ("Execute: \'%s\' \'%s\'\n", debugstr_aw(first), debugstr_aw(rest)); /* we need biger buffer that First, Rest, Full are already need rewrite some code to use cmd_realloc when it need instead @@ -465,7 +465,7 @@ dot = _tcsrchr (szFullName, _T('.')); if (dot && (!_tcsicmp (dot, _T(".bat")) || !_tcsicmp (dot, _T(".cmd")))) { - TRACE ("[BATCH: %s %s]\n", szFullName, rest); + TRACE ("[BATCH: %s %s]\n", debugstr_aw(szFullName), debugstr_aw(rest)); Batch (szFullName, first, rest); } else @@ -474,7 +474,7 @@ PROCESS_INFORMATION prci; STARTUPINFO stui; - TRACE ("[EXEC: %s %s]\n", full, rest); + TRACE ("[EXEC: %s %s]\n", debugstr_aw(full), debugstr_aw(rest)); /* build command line for CreateProcess() */ /* fill startup info */ @@ -522,11 +522,11 @@ } else { - TRACE ("[ShellExecute: %s]\n", full); + TRACE ("[ShellExecute: %s]\n", debugstr_aw(full)); // See if we can run this with ShellExecute() ie myfile.xls if (!RunFile(full)) { - TRACE ("[ShellExecute failed!: %s]\n", full); + TRACE ("[ShellExecute failed!: %s]\n", debugstr_aw(full)); error_bad_command (); nErrorLevel = 1; } @@ -572,7 +572,7 @@ INT cl; LPCOMMAND cmdptr; - TRACE ("DoCommand: (\'%s\')\n", line); + TRACE ("DoCommand: (\'%s\')\n", debugstr_aw(line)); com = cmd_alloc( (_tcslen(line) +512)*sizeof(TCHAR) ); if (com == NULL) @@ -707,7 +707,7 @@ _tcscpy (cmdline, cmd); s = &cmdline[0]; - TRACE ("ParseCommandLine: (\'%s\')\n", s); + TRACE ("ParseCommandLine: (\'%s\')\n", debugstr_aw(s)); #ifdef FEATURE_ALIASES /* expand all aliases */ @@ -793,7 +793,7 @@ ConErrPrintf(szMsg, in); return; } - TRACE ("Input redirected from: %s\n", in); + TRACE ("Input redirected from: %s\n", debugstr_aw(in)); } /* Now do all but the last pipe command */ @@ -913,7 +913,7 @@ if (GetFileType (hFile) == FILE_TYPE_DISK) SetFilePointer (hFile, 0, &lHighPos, FILE_END); } - TRACE ("Output redirected to: %s\n", out); + TRACE ("Output redirected to: %s\n", debugstr_aw(out)); } else if (hOldConOut != INVALID_HANDLE_VALUE) { @@ -971,7 +971,7 @@ if (GetFileType (hFile) == FILE_TYPE_DISK) SetFilePointer (hFile, 0, &lHighPos, FILE_END); } - TRACE ("Error redirected to: %s\n", err); + TRACE ("Error redirected to: %s\n", debugstr_aw(err)); } else if (hOldConErr != INVALID_HANDLE_VALUE) { @@ -1686,7 +1686,7 @@ TRACE ("[command args:\n"); for (i = 0; i < argc; i++) { - TRACE ("%d. %s\n", i, argv[i]); + TRACE ("%d. %s\n", i, debugstr_aw(argv[i])); } TRACE ("]\n"); Modified: trunk/reactos/base/shell/cmd/cmddbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmddbg.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/cmddbg.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmddbg.c [iso-8859-1] Thu May 15 15:29:50 2008 @@ -244,4 +244,4 @@ ExitProcess(code); } -#endif /* _DEBUG */ +#endif /* _DEBUG_MEM */ Modified: trunk/reactos/base/shell/cmd/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/config.h?re… ============================================================================== --- trunk/reactos/base/shell/cmd/config.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/config.h [iso-8859-1] Thu May 15 15:29:50 2008 @@ -11,9 +11,6 @@ #ifndef _CONFIG_H_INCLUDED_ #define _CONFIG_H_INCLUDED_ - -/* Define to enable debugging code */ -//#define _DEBUG #define WIN32_LEAN_AND_MEAN Modified: trunk/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/copy.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] Thu May 15 15:29:50 2008 @@ -165,10 +165,10 @@ } else if (!append) { - TRACE ("SetFileAttributes (%s, FILE_ATTRIBUTE_NORMAL);\n", dest); + TRACE ("SetFileAttributes (%s, FILE_ATTRIBUTE_NORMAL);\n", debugstr_aw(dest)); SetFileAttributes (dest, FILE_ATTRIBUTE_NORMAL); - TRACE ("DeleteFile (%s);\n", dest); + TRACE ("DeleteFile (%s);\n", debugstr_aw(dest)); DeleteFile (dest); hFileDest = CreateFile (dest, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); Modified: trunk/reactos/base/shell/cmd/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/date.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/date.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/date.c [iso-8859-1] Thu May 15 15:29:50 2008 @@ -226,7 +226,7 @@ PrintDateString (); ConInString (s, 40); - TRACE ("\'%s\'\n", s); + TRACE ("\'%s\'\n", debugstr_aw(s)); while (*s && s[_tcslen (s) - 1] < _T(' ')) s[_tcslen (s) - 1] = _T('\0'); if (ParseDate (s)) Modified: trunk/reactos/base/shell/cmd/del.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/del.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/del.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/del.c [iso-8859-1] Thu May 15 15:29:50 2008 @@ -251,9 +251,7 @@ continue; -#ifdef _DEBUG - ConErrPrintf(_T("Full filename: %s\n"), szFullPath); -#endif + TRACE("Full filename: %s\n", debugstr_aw(szFullPath)); /* ask for deleting */ if (*dwFlags & DEL_PROMPT) Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] Thu May 15 15:29:50 2008 @@ -1590,9 +1590,7 @@ ptrStartNode = cmd_alloc(sizeof(DIRFINDLISTNODE)); if (ptrStartNode == NULL) { -#ifdef _DEBUG - ConErrPrintf(_T("DEBUG: Cannot allocate memory for ptrStartNode!\n")); -#endif + WARN("DEBUG: Cannot allocate memory for ptrStartNode!\n"); return 1; /* Error cannot allocate memory for 1st object */ } ptrNextNode = ptrStartNode; @@ -1610,9 +1608,7 @@ ptrNextNode->ptrNext = cmd_alloc(sizeof(DIRFINDLISTNODE)); if (ptrNextNode->ptrNext == NULL) { -#ifdef _DEBUG - ConErrPrintf(_T("DEBUG: Cannot allocate memory for ptrNextNode->ptrNext!\n")); -#endif + WARN("DEBUG: Cannot allocate memory for ptrNextNode->ptrNext!\n"); while (ptrStartNode) { ptrNextNode = ptrStartNode->ptrNext; @@ -1670,9 +1666,7 @@ ptrFileArray = cmd_alloc(sizeof(LPWIN32_FIND_DATA) * dwCount); if (ptrFileArray == NULL) { -#ifdef _DEBUG - ConErrPrintf(_T("DEBUG: Cannot allocate memory for ptrFileArray!\n")); -#endif + WARN("DEBUG: Cannot allocate memory for ptrFileArray!\n"); while (ptrStartNode) { ptrNextNode = ptrStartNode->ptrNext; @@ -1869,27 +1863,25 @@ /* <Debug :> Uncomment this to show the final state of switch flags*/ - #ifdef _DEBUG - { - int i; - ConOutPrintf(_T("Attributes mask/value %x/%x\n"),stFlags.stAttribs.dwAttribMask,stFlags.stAttribs.dwAttribVal ); - ConOutPrintf(_T("(B) Bare format : %i\n"), stFlags.bBareFormat ); - ConOutPrintf(_T("(C) Thousand : %i\n"), stFlags.bTSeperator ); - ConOutPrintf(_T("(W) Wide list : %i\n"), stFlags.bWideList ); - ConOutPrintf(_T("(D) Wide list sort by column : %i\n"), stFlags.bWideListColSort ); - ConOutPrintf(_T("(L) Lowercase : %i\n"), stFlags.bLowerCase ); - ConOutPrintf(_T("(N) New : %i\n"), stFlags.bNewLongList ); - ConOutPrintf(_T("(O) Order : %i\n"), stFlags.stOrderBy.sCriteriaCount ); - for (i =0;i<stFlags.stOrderBy.sCriteriaCount;i++) - ConOutPrintf(_T(" Order Criteria [%i]: %i (Reversed: %i)\n"),i, stFlags.stOrderBy.eCriteria[i], stFlags.stOrderBy.bCriteriaRev[i] ); - ConOutPrintf(_T("(P) Pause : %i\n"), stFlags.bPause ); - ConOutPrintf(_T("(Q) Owner : %i\n"), stFlags.bUser ); - ConOutPrintf(_T("(S) Recursive : %i\n"), stFlags.bRecursive ); - ConOutPrintf(_T("(T) Time field : %i\n"), stFlags.stTimeField.eTimeField ); - ConOutPrintf(_T("(X) Short names : %i\n"), stFlags.bShortName ); - ConOutPrintf(_T("Parameter : %s\n"), params[loop] ); - } - #endif + { + int i; + TRACE("Attributes mask/value %x/%x\n",stFlags.stAttribs.dwAttribMask,stFlags.stAttribs.dwAttribVal ); + TRACE("(B) Bare format : %i\n", stFlags.bBareFormat ); + TRACE("(C) Thousand : %i\n", stFlags.bTSeperator ); + TRACE("(W) Wide list : %i\n", stFlags.bWideList ); + TRACE("(D) Wide list sort by column : %i\n", stFlags.bWideListColSort ); + TRACE("(L) Lowercase : %i\n", stFlags.bLowerCase ); + TRACE("(N) New : %i\n", stFlags.bNewLongList ); + TRACE("(O) Order : %i\n", stFlags.stOrderBy.sCriteriaCount ); + for (i =0;i<stFlags.stOrderBy.sCriteriaCount;i++) + TRACE(" Order Criteria [%i]: %i (Reversed: %i)\n",i, stFlags.stOrderBy.eCriteria[i], stFlags.stOrderBy.bCriteriaRev[i] ); + TRACE("(P) Pause : %i\n", stFlags.bPause ); + TRACE("(Q) Owner : %i\n", stFlags.bUser ); + TRACE("(S) Recursive : %i\n", stFlags.bRecursive ); + TRACE("(T) Time field : %i\n", stFlags.stTimeField.eTimeField ); + TRACE("(X) Short names : %i\n", stFlags.bShortName ); + TRACE("Parameter : %s\n", debugstr_aw(params[loop]) ); + } /* Print the drive header if the volume changed */ ChangedVolume = TRUE; Modified: trunk/reactos/base/shell/cmd/echo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/echo.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/echo.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/echo.c [iso-8859-1] Thu May 15 15:29:50 2008 @@ -34,7 +34,7 @@ TCHAR szMsg[RC_STRING_MAX_SIZE]; LPTSTR p1, p2; - TRACE ("CommandEcho '%s' : '%s'\n", cmd, param); + TRACE ("CommandEcho '%s' : '%s'\n", debugstr_aw(cmd), debugstr_aw(param)); if (_tcsicmp (cmd, _T("echo.")) == 0) { @@ -110,7 +110,7 @@ INT CommandEchos (LPTSTR cmd, LPTSTR param) { - TRACE ("CommandEchos '%s' : '%s'\n", cmd, param); + TRACE ("CommandEchos '%s' : '%s'\n", debugstr_aw(cmd), debugstr_aw(param)); if (!_tcsncmp (param, _T("/?"), 2)) { @@ -128,7 +128,7 @@ INT CommandEchoerr (LPTSTR cmd, LPTSTR param) { - TRACE ("CommandEchoerr '%s' : '%s'\n", cmd, param); + TRACE ("CommandEchoerr '%s' : '%s'\n", debugstr_aw(cmd), debugstr_aw(param)); if (!_tcsncmp (param, _T("/?"), 2)) { @@ -155,7 +155,7 @@ INT CommandEchoserr (LPTSTR cmd, LPTSTR param) { - TRACE ("CommandEchoserr '%s' : '%s'\n", cmd, param); + TRACE ("CommandEchoserr '%s' : '%s'\n", debugstr_aw(cmd), debugstr_aw(param)); if (!_tcsncmp (param, _T("/?"), 2)) { Modified: trunk/reactos/base/shell/cmd/for.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/for.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/for.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/for.c [iso-8859-1] Thu May 15 15:29:50 2008 @@ -54,7 +54,7 @@ TCHAR var; TCHAR szMsg[RC_STRING_MAX_SIZE]; - TRACE ("cmd_for (\'%s\', \'%s\'\n", cmd, param); + TRACE ("cmd_for (\'%s\', \'%s\'\n", debugstr_aw(cmd), debugstr_aw(param)); if (!_tcsncmp (param, _T("/?"), 2)) { Modified: trunk/reactos/base/shell/cmd/goto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/goto.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/goto.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/goto.c [iso-8859-1] Thu May 15 15:29:50 2008 @@ -42,7 +42,7 @@ LPTSTR tmp, tmp2; LONG lNewPosHigh = 0; - TRACE ("cmd_goto (\'%s\', \'%s\'\n", cmd, param); + TRACE ("cmd_goto (\'%s\', \'%s\'\n", debugstr_aw(cmd), debugstr_aw(param)); if (!_tcsncmp (param, _T("/?"), 2)) { Modified: trunk/reactos/base/shell/cmd/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/if.c?rev=33… ============================================================================== --- trunk/reactos/base/shell/cmd/if.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/if.c [iso-8859-1] Thu May 15 15:29:50 2008 @@ -41,7 +41,7 @@ INT x_flag = 0; /* when set cause 'then' clause to be executed */ LPTSTR pp; - TRACE ("cmd_if: (\'%s\', \'%s\')\n", cmd, param); + TRACE ("cmd_if: (\'%s\', \'%s\')\n", debugstr_aw(cmd), debugstr_aw(param)); if (!_tcsncmp (param, _T("/?"), 2)) { Modified: trunk/reactos/base/shell/cmd/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/move.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/move.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/move.c [iso-8859-1] Thu May 15 15:29:50 2008 @@ -191,7 +191,7 @@ /* get destination */ GetFullPathName (arg[argc - 1], MAX_PATH, szDestPath, NULL); - TRACE ("Destination: %s\n", szDestPath); + TRACE ("Destination: %s\n", debugstr_aw(szDestPath)); /* get source folder */ GetDirectory(arg[argc - 2], szSrcDirPath, 1); @@ -202,7 +202,7 @@ GetFullPathName(arg[argc - 2], MAX_PATH, szSrcPath, &pszFile); if (_tcscmp(szSrcDirPath,szSrcPath) == 0) szSrcDirPath[pszFile - szSrcPath] = _T('\0'); - TRACE ("Source Folder: %s\n", szSrcDirPath); + TRACE ("Source Folder: %s\n", debugstr_aw(szSrcDirPath)); hFile = FindFirstFile (arg[argc - 2], &findBuffer); if (hFile == INVALID_HANDLE_VALUE) @@ -235,7 +235,7 @@ if(szSrcPath[_tcslen(szSrcPath) - 1] != _T('\\')) _tcscat (szSrcPath, _T("\\")); _tcscat(szSrcPath,findBuffer.cFileName); - TRACE ("Source Path: %s\n", szSrcPath); + TRACE ("Source Path: %s\n", debugstr_aw(szSrcPath)); /* check if there can be found files as files have first priority */ if (IsExistingFile(szSrcPath)) dwMoveStatusFlags |= MOVE_SOURCE_IS_FILE; else dwMoveStatusFlags |= MOVE_SOURCE_IS_DIR; @@ -258,7 +258,7 @@ } FindClose(hFile); - TRACE ("Do we have only one file: %s\n", OnlyOneFile ? _T("TRUE") : _T("FALSE")); + TRACE ("Do we have only one file: %s\n", OnlyOneFile ? "TRUE" : "FALSE"); /* we have to start again to be sure we don't miss any files or folders*/ hFile = FindFirstFile (arg[argc - 2], &findBuffer); @@ -293,7 +293,7 @@ /* move it */ do { - TRACE ("Found file/directory: %s\n", findBuffer.cFileName); + TRACE ("Found file/directory: %s\n", debugstr_aw(findBuffer.cFileName)); nOverwrite = 1; dwMoveFlags = 0; dwMoveStatusFlags &= ~MOVE_DEST_IS_FILE & @@ -315,7 +315,7 @@ dwMoveStatusFlags |= MOVE_SRC_CURRENT_IS_DIR; /* source is file but at the current round we found a directory */ continue; } - TRACE ("Source is dir: %s\n", szSrcPath); + TRACE ("Source is dir: %s\n", debugstr_aw(szSrcPath)); dwMoveFlags = MOVEFILE_REPLACE_EXISTING | MOVEFILE_WRITE_THROUGH | MOVEFILE_COPY_ALLOWED; } @@ -324,7 +324,7 @@ if (IsExistingDirectory(szDestPath)) { /* destination is existing directory */ - TRACE ("Destination is directory: %s\n", szDestPath); + TRACE ("Destination is directory: %s\n", debugstr_aw(szDestPath)); dwMoveStatusFlags |= MOVE_DEST_IS_DIR; @@ -344,7 +344,7 @@ if (IsExistingFile(szDestPath)) { /* destination is a file */ - TRACE ("Destination is file: %s\n", szDestPath); + TRACE ("Destination is file: %s\n", debugstr_aw(szDestPath)); dwMoveStatusFlags |= MOVE_DEST_IS_FILE | MOVE_DEST_EXISTS; _tcscpy (szFullDestPath, szDestPath); Modified: trunk/reactos/base/shell/cmd/pause.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/pause.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/pause.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/pause.c [iso-8859-1] Thu May 15 15:29:50 2008 @@ -37,7 +37,7 @@ INT cmd_pause (LPTSTR cmd, LPTSTR param) { - TRACE ("cmd_pause: \'%s\' : \'%s\')\n", cmd, param); + TRACE ("cmd_pause: \'%s\' : \'%s\')\n", debugstr_aw(cmd), debugstr_aw(param)); if (!_tcsncmp (param, _T("/?"), 2)) { Modified: trunk/reactos/base/shell/cmd/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/precomp.h?r… ============================================================================== --- trunk/reactos/base/shell/cmd/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/precomp.h [iso-8859-1] Thu May 15 15:29:50 2008 @@ -38,5 +38,10 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(cmd); +#ifdef UNICODE +#define debugstr_aw debugstr_w +#else +#define debugstr_aw debugstr_a +#endif #endif /* __CMD_PRECOMP_H */ Modified: trunk/reactos/base/shell/cmd/ren.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ren.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/ren.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/ren.c [iso-8859-1] Thu May 15 15:29:50 2008 @@ -148,10 +148,8 @@ srcPattern = arg[i]; -#ifdef _DEBUG - ConErrPrintf(_T("\n\nSourcePattern: %s\n"), srcPattern); - ConErrPrintf(_T("DestinationPattern: %s\n"), dstPattern); -#endif + TRACE("\n\nSourcePattern: %s\n", debugstr_aw(srcPattern)); + TRACE("DestinationPattern: %s\n", debugstr_aw(dstPattern)); hFile = FindFirstFile(srcPattern, &f); if (hFile == INVALID_HANDLE_VALUE) @@ -179,9 +177,7 @@ && !(dwFlags & REN_SUBDIR)) continue; -#ifdef _DEBUG - ConErrPrintf(_T("Found source name: %s\n"), f.cFileName); -#endif + TRACE("Found source name: %s\n", debugstr_aw(f.cFileName)); /* build destination file name */ p = f.cFileName; @@ -220,9 +216,7 @@ } *r = 0; -#ifdef _DEBUG - ConErrPrintf(_T("DestinationFile: %s\n"), dstFile); -#endif + TRACE("DestinationFile: %s\n", debugstr_aw(dstFile)); if (!(dwFlags & REN_QUIET) && !(dwFlags & REN_TOTAL)) ConOutPrintf(_T("%s -> %s\n"), f.cFileName, dstFile); Modified: trunk/reactos/base/shell/cmd/shift.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/shift.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/shift.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/shift.c [iso-8859-1] Thu May 15 15:29:50 2008 @@ -39,7 +39,7 @@ INT cmd_shift (LPTSTR cmd, LPTSTR param) { - TRACE ("cmd_shift: (\'%s\', \'%s\')\n", cmd, param); + TRACE ("cmd_shift: (\'%s\', \'%s\')\n", debugstr_aw(cmd), debugstr_aw(param)); if (!_tcsncmp (param, _T("/?"), 2)) { Modified: trunk/reactos/base/shell/cmd/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/start.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/start.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/start.c [iso-8859-1] Thu May 15 15:29:50 2008 @@ -253,10 +253,10 @@ szFullCmdLine[_tcslen(szFullCmdLine)] = _T('\"'); } - TRACE ("[BATCH: %s %s]\n", szFullName, rest); - - - TRACE ("[EXEC: %s %s]\n", szFullName, rest); + TRACE ("[BATCH: %s %s]\n", debugstr_aw(szFullName), debugstr_aw(rest)); + + + TRACE ("[EXEC: %s %s]\n", debugstr_aw(szFullName), debugstr_aw(rest)); /* build command line for CreateProcess() */ if (bBat == FALSE) { Modified: trunk/reactos/base/shell/cmd/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/time.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/time.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/time.c [iso-8859-1] Thu May 15 15:29:50 2008 @@ -177,7 +177,7 @@ ConInString (s, 40); - TRACE ("\'%s\'\n", s); + TRACE ("\'%s\'\n", debugstr_aw(s)); while (*s && s[_tcslen (s) - 1] < _T(' ')) s[_tcslen(s) - 1] = _T('\0'); Modified: trunk/reactos/base/shell/cmd/where.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/where.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/where.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/where.c [iso-8859-1] Thu May 15 15:29:50 2008 @@ -92,7 +92,8 @@ /* initialize full name buffer */ *pFullName = _T('\0'); - TRACE ("SearchForExecutableSingle: \'%s\' with ext: \'%s\'\n", pFileName, pExtension); + TRACE ("SearchForExecutableSingle: \'%s\' with ext: \'%s\'\n", + debugstr_aw(pFileName), debugstr_aw(pExtension)); /* Check if valid directly on specified path */ if (_tcschr (pFileName, _T('\\')) != NULL) @@ -114,7 +115,7 @@ if (IsExistingFile (szPathBuffer)) { - TRACE ("Found: \'%s\'\n", szPathBuffer); + TRACE ("Found: \'%s\'\n", debugstr_aw(szPathBuffer)); _tcscpy (pFullName, szPathBuffer); return TRUE; } @@ -135,7 +136,7 @@ if (IsExistingFile (szPathBuffer)) { - TRACE ("Found: \'%s\'\n", szPathBuffer); + TRACE ("Found: \'%s\'\n", debugstr_aw(szPathBuffer)); _tcscpy (pFullName, szPathBuffer); return TRUE; } @@ -183,7 +184,7 @@ if (IsExistingFile (szPathBuffer)) { - TRACE ("Found: \'%s\'\n", szPathBuffer); + TRACE ("Found: \'%s\'\n", debugstr_aw(szPathBuffer)); cmd_free (pszBuffer); _tcscpy (pFullName, szPathBuffer); return TRUE; @@ -202,7 +203,7 @@ LPTSTR pCh; LPTSTR pExt; DWORD dwBuffer; - TRACE ("SearchForExecutable: \'%s\'\n", pFileName); + TRACE ("SearchForExecutable: \'%s\'\n", debugstr_aw(pFileName)); /* load environment varable PATHEXT */ pszBuffer = (LPTSTR)cmd_alloc (ENV_BUFFER_SIZE * sizeof(TCHAR)); dwBuffer = GetEnvironmentVariable (_T("PATHEXT"), pszBuffer, ENV_BUFFER_SIZE); @@ -216,7 +217,7 @@ _tcscpy(pszBuffer, pszDefaultPathExt); } - TRACE ("SearchForExecutable(): Loaded PATHEXT: %s\n", pszBuffer); + TRACE ("SearchForExecutable(): Loaded PATHEXT: %s\n", debugstr_aw(pszBuffer)); pExt = _tcsrchr(pFileName, _T('.')); if (pExt != NULL) Modified: trunk/reactos/base/shell/cmd/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/window.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/window.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/window.c [iso-8859-1] Thu May 15 15:29:50 2008 @@ -158,9 +158,7 @@ if (iAction & A_CLOSE) { -#ifdef _DEBUG - ConErrPrintf(_T("!!!FIXME: CLOSE Not implemented!!!\n")); -#endif + FIXME("!!!FIXME: CLOSE Not implemented!!!\n"); } wp.length = sizeof(WINDOWPLACEMENT);

16 years, 4 months

[gbrunmar] 33535: Oops, didn't see the commented section.

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Thu May 15 15:13:40 2008 New Revision: 33535 URL: http://svn.reactos.org/svn/reactos?rev=33535&view=rev Log: Oops, didn't see the commented section. Modified: trunk/reactos/dll/win32/user32/controls/listbox.c Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] Thu May 15 15:13:40 2008 @@ -3448,9 +3448,9 @@ break; default: - /*if ((msg >= WM_USER) && (msg < 0xc000)) + if ((msg >= WM_USER) && (msg < 0xc000)) WARN("[%p]: unknown msg %04x wp %08lx lp %08lx\n", - hwnd, msg, wParam, lParam );*/ + hwnd, msg, wParam, lParam ); break; }

16 years, 4 months

[gbrunmar] 33534: Synced listbox LB_SETCURSEL behaviour with Wine, to pass a couple of more winetests.

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Thu May 15 15:11:26 2008 New Revision: 33534 URL: http://svn.reactos.org/svn/reactos?rev=33534&view=rev Log: Synced listbox LB_SETCURSEL behaviour with Wine, to pass a couple of more winetests. Modified: trunk/reactos/dll/win32/user32/controls/listbox.c Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] Thu May 15 15:11:26 2008 @@ -3101,10 +3101,10 @@ #endif case LB_SETCURSEL: if (IS_MULTISELECT(descr)) return LB_ERR; - LISTBOX_SetCaretIndex( descr, wParam, TRUE ); + LISTBOX_SetCaretIndex( descr, wParam, FALSE ); ret = LISTBOX_SetSelection( descr, wParam, TRUE, FALSE ); - if (lphc && ret != LB_ERR) ret = descr->selected_item; - return ret; + if (ret != LB_ERR) ret = descr->selected_item; + return ret; #ifndef __REACTOS__ case LB_GETSELCOUNT16: @@ -3448,9 +3448,10 @@ break; default: - if ((msg >= WM_USER) && (msg < 0xc000)) + /*if ((msg >= WM_USER) && (msg < 0xc000)) WARN("[%p]: unknown msg %04x wp %08lx lp %08lx\n", - hwnd, msg, wParam, lParam ); + hwnd, msg, wParam, lParam );*/ + break; } return unicode ? DefWindowProcW( hwnd, msg, wParam, lParam ) :

16 years, 4 months

[hpoussin] 33533: cmd: replace static traces by dynamic ones

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu May 15 15:02:05 2008 New Revision: 33533 URL: http://svn.reactos.org/svn/reactos?rev=33533&view=rev Log: cmd: replace static traces by dynamic ones Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/call.c trunk/reactos/base/shell/cmd/choice.c trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/cmd.rbuild trunk/reactos/base/shell/cmd/console.c trunk/reactos/base/shell/cmd/copy.c trunk/reactos/base/shell/cmd/date.c trunk/reactos/base/shell/cmd/echo.c trunk/reactos/base/shell/cmd/for.c trunk/reactos/base/shell/cmd/goto.c trunk/reactos/base/shell/cmd/history.c trunk/reactos/base/shell/cmd/if.c trunk/reactos/base/shell/cmd/move.c trunk/reactos/base/shell/cmd/msgbox.c trunk/reactos/base/shell/cmd/pause.c trunk/reactos/base/shell/cmd/precomp.h trunk/reactos/base/shell/cmd/shift.c trunk/reactos/base/shell/cmd/start.c trunk/reactos/base/shell/cmd/time.c trunk/reactos/base/shell/cmd/timer.c trunk/reactos/base/shell/cmd/where.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] Thu May 15 15:02:05 2008 @@ -85,9 +85,7 @@ { LPTSTR pp; -#ifdef _DEBUG - DebugPrintf (_T("FindArg: (%d)\n"), n); -#endif + TRACE ("FindArg: (%d)\n", n); if (bc == NULL) return NULL; @@ -172,9 +170,7 @@ VOID ExitBatch (LPTSTR msg) { -#ifdef _DEBUG - DebugPrintf (_T("ExitBatch: (\'%s\')\n"), msg); -#endif + TRACE ("ExitBatch: (\'%s\')\n", msg); if (bc != NULL) { @@ -226,10 +222,8 @@ OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); -#ifdef _DEBUG - DebugPrintf (_T("Batch: (\'%s\', \'%s\', \'%s\') hFile = %x\n"), + TRACE ("Batch: (\'%s\', \'%s\', \'%s\') hFile = %x\n", fullname, firstword, param, hFile); -#endif if (hFile == INVALID_HANDLE_VALUE) { @@ -298,9 +292,7 @@ return FALSE; } -#ifdef _DEBUG - DebugPrintf (_T("Batch: returns TRUE\n")); -#endif + TRACE ("Batch: returns TRUE\n"); return TRUE; } @@ -339,9 +331,7 @@ if (bc == NULL) return NULL; -#ifdef _DEBUG - DebugPrintf (_T("ReadBatchLine ()\n")); -#endif + TRACE ("ReadBatchLine ()\n"); while (1) { @@ -435,9 +425,7 @@ if (!FileGetString (bc->hBatchFile, textline, sizeof (textline) / sizeof (textline[0]))) { -#ifdef _DEBUG - DebugPrintf (_T("ReadBatchLine(): Reached EOF!\n")); -#endif + TRACE ("ReadBatchLine(): Reached EOF!\n"); /* End of file.... */ ExitBatch (NULL); @@ -446,9 +434,7 @@ continue; } -#ifdef _DEBUG - DebugPrintf (_T("ReadBatchLine(): textline: \'%s\'\n"), textline); -#endif + TRACE ("ReadBatchLine(): textline: \'%s\'\n", textline); /* Strip leading spaces and trailing space/control chars */ for (first = textline; _istspace (*first); first++) Modified: trunk/reactos/base/shell/cmd/call.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/call.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/call.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/call.c [iso-8859-1] Thu May 15 15:02:05 2008 @@ -44,9 +44,7 @@ { LPBATCH_CONTEXT n = NULL; -#ifdef _DEBUG - DebugPrintf (_T("cmd_call: (\'%s\',\'%s\')\n"), cmd, param); -#endif + TRACE ("cmd_call: (\'%s\',\'%s\')\n", cmd, param); if (!_tcsncmp (param, _T("/?"), 2)) { ConOutResPaging(TRUE,STRING_CALL_HELP); Modified: trunk/reactos/base/shell/cmd/choice.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/choice.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/choice.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/choice.c [iso-8859-1] Thu May 15 15:02:05 2008 @@ -260,9 +260,7 @@ } freep (arg); -#ifdef _DEBUG - DebugPrintf (_T("ErrorLevel: %d\n"), nErrorLevel); -#endif /* _DEBUG */ + TRACE ("ErrorLevel: %d\n", nErrorLevel); return 0; } @@ -275,25 +273,19 @@ switch (GCret) { case GC_TIMEOUT: -#ifdef _DEBUG - DebugPrintf (_T("GC_TIMEOUT\n")); - DebugPrintf (_T("elapsed %d msecs\n"), GetTickCount () - clk); -#endif /* _DEBUG */ + TRACE ("GC_TIMEOUT\n"); + TRACE ("elapsed %d msecs\n", GetTickCount () - clk); break; case GC_NOKEY: -#ifdef _DEBUG - DebugPrintf(_T("GC_NOKEY\n")); - DebugPrintf(_T("elapsed %d msecs\n"), GetTickCount () - clk); -#endif /* _DEBUG */ + TRACE ("GC_NOKEY\n"); + TRACE ("elapsed %d msecs\n", GetTickCount () - clk); goto loop; case GC_KEYREAD: -#ifdef _DEBUG - DebugPrintf(_T("GC_KEYREAD\n")); - DebugPrintf(_T("elapsed %d msecs\n"), GetTickCount () - clk); - DebugPrintf(_T("read %c"), Ch); -#endif /* _DEBUG */ + TRACE ("GC_KEYREAD\n"); + TRACE ("elapsed %d msecs\n", GetTickCount () - clk); + TRACE ("read %c", Ch); if ((val=IsKeyInString(lpOptions,Ch,bCaseSensitive))==-1) { Beep (440, 50); @@ -303,10 +295,8 @@ break; } -#ifdef _DEBUG - DebugPrintf(_T("exiting wait loop after %d msecs\n"), + TRACE ("exiting wait loop after %d msecs\n", GetTickCount () - clk); -#endif /* _DEBUG */ val = IsKeyInString (lpOptions, cDefault, bCaseSensitive); ConOutPrintf (_T("%c\n"), lpOptions[val]); @@ -315,9 +305,7 @@ freep (arg); -#ifdef _DEBUG - DebugPrintf (_T("ErrorLevel: %d\n"), nErrorLevel); -#endif /* _DEBUG */ + TRACE ("ErrorLevel: %d\n", nErrorLevel); return 0; } Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Thu May 15 15:02:05 2008 @@ -243,9 +243,7 @@ &Info, sizeof(PROCESS_BASIC_INFORMATION), NULL); if (! NT_SUCCESS(Status)) { -#ifdef _DEBUG - DebugPrintf (_T("NtQueryInformationProcess failed with status %08x\n"), Status); -#endif + WARN ("NtQueryInformationProcess failed with status %08x\n", Status); return TRUE; } Status = NtReadVirtualMemoryPtr ( @@ -253,9 +251,7 @@ sizeof(PEB), &BytesRead); if (! NT_SUCCESS(Status) || sizeof(PEB) != BytesRead) { -#ifdef _DEBUG - DebugPrintf (_T("Couldn't read virt mem status %08x bytes read %lu\n"), Status, BytesRead); -#endif + WARN ("Couldn't read virt mem status %08x bytes read %lu\n", Status, BytesRead); return TRUE; } @@ -287,37 +283,27 @@ MYEX hShExt; HINSTANCE ret; -#ifdef _DEBUG - DebugPrintf (_T("RunFile(%s)\n"), filename); -#endif + TRACE ("RunFile(%s)\n", filename); hShell32 = LoadLibrary(_T("SHELL32.DLL")); if (!hShell32) { -#ifdef _DEBUG - DebugPrintf (_T("RunFile: couldn't load SHELL32.DLL!\n")); -#endif + WARN ("RunFile: couldn't load SHELL32.DLL!\n"); return FALSE; } hShExt = (MYEX)(FARPROC)GetProcAddress(hShell32, SHELLEXECUTETEXT); if (!hShExt) { -#ifdef _DEBUG - DebugPrintf (_T("RunFile: couldn't find ShellExecuteA/W in SHELL32.DLL!\n")); -#endif + WARN ("RunFile: couldn't find ShellExecuteA/W in SHELL32.DLL!\n"); FreeLibrary(hShell32); return FALSE; } -#ifdef _DEBUG - DebugPrintf (_T("RunFile: ShellExecuteA/W is at %x\n"), hShExt); -#endif + TRACE ("RunFile: ShellExecuteA/W is at %x\n", hShExt); ret = (hShExt)(NULL, _T("open"), filename, NULL, NULL, SW_SHOWNORMAL); -#ifdef _DEBUG - DebugPrintf (_T("RunFile: ShellExecuteA/W returned %d\n"), (DWORD)ret); -#endif + TRACE ("RunFile: ShellExecuteA/W returned %d\n", (DWORD)ret); FreeLibrary(hShell32); return (((DWORD)ret) > 32); @@ -344,9 +330,7 @@ TCHAR szWindowTitle[MAX_PATH]; DWORD dwExitCode = 0; -#ifdef _DEBUG - DebugPrintf (_T("Execute: \'%s\' \'%s\'\n"), first, rest); -#endif + TRACE ("Execute: \'%s\' \'%s\'\n", first, rest); /* we need biger buffer that First, Rest, Full are already need rewrite some code to use cmd_realloc when it need instead @@ -481,9 +465,7 @@ dot = _tcsrchr (szFullName, _T('.')); if (dot && (!_tcsicmp (dot, _T(".bat")) || !_tcsicmp (dot, _T(".cmd")))) { -#ifdef _DEBUG - DebugPrintf (_T("[BATCH: %s %s]\n"), szFullName, rest); -#endif + TRACE ("[BATCH: %s %s]\n", szFullName, rest); Batch (szFullName, first, rest); } else @@ -492,9 +474,7 @@ PROCESS_INFORMATION prci; STARTUPINFO stui; -#ifdef _DEBUG - DebugPrintf (_T("[EXEC: %s %s]\n"), full, rest); -#endif + TRACE ("[EXEC: %s %s]\n", full, rest); /* build command line for CreateProcess() */ /* fill startup info */ @@ -542,15 +522,11 @@ } else { -#ifdef _DEBUG - DebugPrintf (_T("[ShellExecute: %s]\n"), full); -#endif + TRACE ("[ShellExecute: %s]\n", full); // See if we can run this with ShellExecute() ie myfile.xls if (!RunFile(full)) { -#ifdef _DEBUG - DebugPrintf (_T("[ShellExecute failed!: %s]\n"), full); -#endif + TRACE ("[ShellExecute failed!: %s]\n", full); error_bad_command (); nErrorLevel = 1; } @@ -596,9 +572,7 @@ INT cl; LPCOMMAND cmdptr; -#ifdef _DEBUG - DebugPrintf (_T("DoCommand: (\'%s\')\n"), line); -#endif /* DEBUG */ + TRACE ("DoCommand: (\'%s\')\n", line); com = cmd_alloc( (_tcslen(line) +512)*sizeof(TCHAR) ); if (com == NULL) @@ -733,9 +707,7 @@ _tcscpy (cmdline, cmd); s = &cmdline[0]; -#ifdef _DEBUG - DebugPrintf (_T("ParseCommandLine: (\'%s\')\n"), s); -#endif /* DEBUG */ + TRACE ("ParseCommandLine: (\'%s\')\n", s); #ifdef FEATURE_ALIASES /* expand all aliases */ @@ -821,9 +793,7 @@ ConErrPrintf(szMsg, in); return; } -#ifdef _DEBUG - DebugPrintf (_T("Input redirected from: %s\n"), in); -#endif + TRACE ("Input redirected from: %s\n", in); } /* Now do all but the last pipe command */ @@ -943,9 +913,7 @@ if (GetFileType (hFile) == FILE_TYPE_DISK) SetFilePointer (hFile, 0, &lHighPos, FILE_END); } -#ifdef _DEBUG - DebugPrintf (_T("Output redirected to: %s\n"), out); -#endif + TRACE ("Output redirected to: %s\n", out); } else if (hOldConOut != INVALID_HANDLE_VALUE) { @@ -966,9 +934,7 @@ if (!_tcscmp (err, out)) { -#ifdef _DEBUG - DebugPrintf (_T("Stdout and stderr will use the same file!!\n")); -#endif + TRACE ("Stdout and stderr will use the same file!!\n"); DuplicateHandle (GetCurrentProcess (), GetStdHandle (STD_OUTPUT_HANDLE), GetCurrentProcess (), @@ -1005,9 +971,7 @@ if (GetFileType (hFile) == FILE_TYPE_DISK) SetFilePointer (hFile, 0, &lHighPos, FILE_END); } -#ifdef _DEBUG - DebugPrintf (_T("Error redirected to: %s\n"), err); -#endif + TRACE ("Error redirected to: %s\n", err); } else if (hOldConErr != INVALID_HANDLE_VALUE) { @@ -1053,9 +1017,7 @@ } else { -#ifdef _DEBUG - DebugPrintf (_T("Can't restore STDIN! Is invalid!!\n"), out); -#endif + WARN ("Can't restore STDIN! Is invalid!!\n", out); } #endif /* buggy implementation */ @@ -1066,9 +1028,7 @@ SetStdHandle (STD_INPUT_HANDLE, hOldConIn); if (hIn == INVALID_HANDLE_VALUE) { -#ifdef _DEBUG - DebugPrintf (_T("Previous STDIN is invalid!!\n")); -#endif + WARN ("Previous STDIN is invalid!!\n"); } else { @@ -1083,9 +1043,7 @@ } else { -#ifdef _DEBUG - DebugPrintf (_T("hFile[0] and hIn dont match!!!\n")); -#endif + WARN ("hFile[0] and hIn dont match!!!\n"); } } } @@ -1725,14 +1683,12 @@ } -#ifdef _DEBUG - DebugPrintf (_T("[command args:\n")); + TRACE ("[command args:\n"); for (i = 0; i < argc; i++) { - DebugPrintf (_T("%d. %s\n"), i, argv[i]); - } - DebugPrintf (_T("]\n")); -#endif + TRACE ("%d. %s\n", i, argv[i]); + } + TRACE ("]\n"); InitLocale (); Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Thu May 15 15:02:05 2008 @@ -133,12 +133,6 @@ /* Prototypes for COLOR.C */ VOID SetScreenColor(WORD wArgColor, BOOL bFill); INT CommandColor (LPTSTR, LPTSTR); - - -/* Prototypes for CONSOLE.C */ -#ifdef _DEBUG -VOID DebugPrintf (LPTSTR, ...); -#endif /* _DEBUG */ VOID ConInDummy (VOID); VOID ConInDisable (VOID); Modified: trunk/reactos/base/shell/cmd/cmd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rbuild?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.rbuild [iso-8859-1] Thu May 15 15:02:05 2008 @@ -73,6 +73,7 @@ <define name="ANONYMOUSUNIONS" /> <define name="_WIN32_WINNT">0x0501</define> <library>cmd_base</library> + <library>wine</library> <library>kernel32</library> <library>advapi32</library> <library>shell32</library> Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.c [iso-8859-1] Thu May 15 15:02:05 2008 @@ -55,10 +55,8 @@ INPUT_RECORD dummy; DWORD dwRead; -#ifdef _DEBUG if (hInput == INVALID_HANDLE_VALUE) - DebugPrintf (_T("Invalid input handle!!!\n")); -#endif /* _DEBUG */ + WARN ("Invalid input handle!!!\n"); ReadConsoleInput (hInput, &dummy, 1, &dwRead); } @@ -73,10 +71,8 @@ HANDLE hInput = GetStdHandle (STD_INPUT_HANDLE); DWORD dwRead; -#ifdef _DEBUG if (hInput == INVALID_HANDLE_VALUE) - DebugPrintf (_T("Invalid input handle!!!\n")); -#endif /* _DEBUG */ + WARN ("Invalid input handle!!!\n"); do { @@ -431,24 +427,6 @@ va_end (arg_ptr); } -#ifdef _DEBUG -VOID DebugPrintf (LPTSTR szFormat, ...) -{ - va_list arg_ptr; - - va_start (arg_ptr, szFormat); - ConPrintf(szFormat, arg_ptr, STD_ERROR_HANDLE); - va_end (arg_ptr); -#if 0 - TCHAR szOut[OUTPUT_BUFFER_SIZE]; - va_start (arg_ptr, szFormat); - _vstprintf (szOut, szFormat, arg_ptr); - OutputDebugString (szOut); - va_end (arg_ptr); -#endif -} -#endif /* _DEBUG */ - VOID SetCursorXY (SHORT x, SHORT y) { COORD coPos; Modified: trunk/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/copy.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] Thu May 15 15:02:05 2008 @@ -72,9 +72,7 @@ if(CheckCtrlBreak(BREAK_INPUT)) return 0; -#ifdef _DEBUG - DebugPrintf (_T("checking mode\n")); -#endif + TRACE ("checking mode\n"); if(bTouch) { @@ -116,16 +114,12 @@ return 0; } -#ifdef _DEBUG - DebugPrintf (_T("getting time\n")); -#endif + TRACE ("getting time\n"); GetFileTime (hFileSrc, &srctime, NULL, NULL); -#ifdef _DEBUG - DebugPrintf (_T("copy: flags has %s\n"), + TRACE ("copy: flags has %s\n", lpdwFlags & COPY_ASCII ? "ASCII" : "BINARY"); -#endif /* Check to see if /D or /Z are true, if so we need a middle man to copy the file too to allow us to use CopyFileEx later */ @@ -165,22 +159,16 @@ if (!IsExistingFile (dest)) { -#ifdef _DEBUG - DebugPrintf (_T("opening/creating\n")); -#endif + TRACE ("opening/creating\n"); hFileDest = CreateFile (dest, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); } else if (!append) { -#ifdef _DEBUG - DebugPrintf (_T("SetFileAttributes (%s, FILE_ATTRIBUTE_NORMAL);\n"), dest); -#endif + TRACE ("SetFileAttributes (%s, FILE_ATTRIBUTE_NORMAL);\n", dest); SetFileAttributes (dest, FILE_ATTRIBUTE_NORMAL); -#ifdef _DEBUG - DebugPrintf (_T("DeleteFile (%s);\n"), dest); -#endif + TRACE ("DeleteFile (%s);\n", dest); DeleteFile (dest); hFileDest = CreateFile (dest, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); @@ -195,9 +183,7 @@ return 0; } -#ifdef _DEBUG - DebugPrintf (_T("opening/appending\n")); -#endif + TRACE ("opening/appending\n"); SetFileAttributes (dest, FILE_ATTRIBUTE_NORMAL); hFileDest = @@ -258,18 +244,14 @@ } while (!bEof); -#ifdef _DEBUG - DebugPrintf (_T("setting time\n")); -#endif + TRACE ("setting time\n"); SetFileTime (hFileDest, &srctime, NULL, NULL); if ((lpdwFlags & COPY_ASCII) && !bEof) { /* we're dealing with ASCII files! */ buffer[0] = 0x1A; -#ifdef _DEBUG - DebugPrintf (_T("appending ^Z\n")); -#endif + TRACE ("appending ^Z\n"); WriteFile (hFileDest, buffer, sizeof(CHAR), &dwWritten, NULL); } @@ -277,9 +259,7 @@ CloseHandle (hFileDest); CloseHandle (hFileSrc); -#ifdef _DEBUG - DebugPrintf (_T("setting mode\n")); -#endif + TRACE ("setting mode\n"); SetFileAttributes (dest, dwAttrib); /* Now finish off the copy if needed with CopyFileEx */ Modified: trunk/reactos/base/shell/cmd/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/date.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/date.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/date.c [iso-8859-1] Thu May 15 15:02:05 2008 @@ -226,9 +226,7 @@ PrintDateString (); ConInString (s, 40); -#ifdef _DEBUG - DebugPrintf (_T("\'%s\'\n"), s); -#endif + TRACE ("\'%s\'\n", s); while (*s && s[_tcslen (s) - 1] < _T(' ')) s[_tcslen (s) - 1] = _T('\0'); if (ParseDate (s)) Modified: trunk/reactos/base/shell/cmd/echo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/echo.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/echo.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/echo.c [iso-8859-1] Thu May 15 15:02:05 2008 @@ -34,9 +34,7 @@ TCHAR szMsg[RC_STRING_MAX_SIZE]; LPTSTR p1, p2; -#ifdef _DEBUG - DebugPrintf (_T("CommandEcho '%s' : '%s'\n"), cmd, param); -#endif + TRACE ("CommandEcho '%s' : '%s'\n", cmd, param); if (_tcsicmp (cmd, _T("echo.")) == 0) { @@ -112,9 +110,7 @@ INT CommandEchos (LPTSTR cmd, LPTSTR param) { -#ifdef _DEBUG - DebugPrintf (_T("CommandEchos '%s' : '%s'\n"), cmd, param); -#endif + TRACE ("CommandEchos '%s' : '%s'\n", cmd, param); if (!_tcsncmp (param, _T("/?"), 2)) { @@ -132,9 +128,7 @@ INT CommandEchoerr (LPTSTR cmd, LPTSTR param) { -#ifdef _DEBUG - DebugPrintf (_T("CommandEchoerr '%s' : '%s'\n"), cmd, param); -#endif + TRACE ("CommandEchoerr '%s' : '%s'\n", cmd, param); if (!_tcsncmp (param, _T("/?"), 2)) { @@ -161,9 +155,7 @@ INT CommandEchoserr (LPTSTR cmd, LPTSTR param) { -#ifdef _DEBUG - DebugPrintf (_T("CommandEchoserr '%s' : '%s'\n"), cmd, param); -#endif + TRACE ("CommandEchoserr '%s' : '%s'\n", cmd, param); if (!_tcsncmp (param, _T("/?"), 2)) { Modified: trunk/reactos/base/shell/cmd/for.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/for.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/for.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/for.c [iso-8859-1] Thu May 15 15:02:05 2008 @@ -54,9 +54,7 @@ TCHAR var; TCHAR szMsg[RC_STRING_MAX_SIZE]; -#ifdef _DEBUG - DebugPrintf (_T("cmd_for (\'%s\', \'%s\'\n"), cmd, param); -#endif + TRACE ("cmd_for (\'%s\', \'%s\'\n", cmd, param); if (!_tcsncmp (param, _T("/?"), 2)) { Modified: trunk/reactos/base/shell/cmd/goto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/goto.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/goto.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/goto.c [iso-8859-1] Thu May 15 15:02:05 2008 @@ -42,9 +42,7 @@ LPTSTR tmp, tmp2; LONG lNewPosHigh = 0; -#ifdef _DEBUG - DebugPrintf (_T("cmd_goto (\'%s\', \'%s\'\n"), cmd, param); -#endif + TRACE ("cmd_goto (\'%s\', \'%s\'\n", cmd, param); if (!_tcsncmp (param, _T("/?"), 2)) { Modified: trunk/reactos/base/shell/cmd/history.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/history.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/history.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/history.c [iso-8859-1] Thu May 15 15:02:05 2008 @@ -192,11 +192,9 @@ { if (item==NULL || item==Top || item==Bottom) { -#ifdef _DEBUG - DebugPrintf(_T("del in ") _T(__FILE__) _T(": retrning\n") - _T("item is 0x%08x (Bottom is0x%08x)\n"), + TRACE ("del in " __FILE__ ": returning\n" + "item is 0x%08x (Bottom is0x%08x)\n", item, Bottom); -#endif return; } Modified: trunk/reactos/base/shell/cmd/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/if.c?rev=33… ============================================================================== --- trunk/reactos/base/shell/cmd/if.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/if.c [iso-8859-1] Thu May 15 15:02:05 2008 @@ -41,9 +41,7 @@ INT x_flag = 0; /* when set cause 'then' clause to be executed */ LPTSTR pp; -#ifdef _DEBUG - DebugPrintf (_T("cmd_if: (\'%s\', \'%s\')\n"), cmd, param); -#endif + TRACE ("cmd_if: (\'%s\', \'%s\')\n", cmd, param); if (!_tcsncmp (param, _T("/?"), 2)) { Modified: trunk/reactos/base/shell/cmd/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/move.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/move.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/move.c [iso-8859-1] Thu May 15 15:02:05 2008 @@ -191,9 +191,7 @@ /* get destination */ GetFullPathName (arg[argc - 1], MAX_PATH, szDestPath, NULL); -#ifdef _DEBUG - DebugPrintf (_T("Destination: %s\n"), szDestPath); -#endif + TRACE ("Destination: %s\n", szDestPath); /* get source folder */ GetDirectory(arg[argc - 2], szSrcDirPath, 1); @@ -204,9 +202,7 @@ GetFullPathName(arg[argc - 2], MAX_PATH, szSrcPath, &pszFile); if (_tcscmp(szSrcDirPath,szSrcPath) == 0) szSrcDirPath[pszFile - szSrcPath] = _T('\0'); -#ifdef _DEBUG - DebugPrintf (_T("Source Folder: %s\n"), szSrcDirPath); -#endif + TRACE ("Source Folder: %s\n", szSrcDirPath); hFile = FindFirstFile (arg[argc - 2], &findBuffer); if (hFile == INVALID_HANDLE_VALUE) @@ -239,9 +235,7 @@ if(szSrcPath[_tcslen(szSrcPath) - 1] != _T('\\')) _tcscat (szSrcPath, _T("\\")); _tcscat(szSrcPath,findBuffer.cFileName); -#ifdef _DEBUG - DebugPrintf (_T("Source Path: %s\n"), szSrcPath); -#endif + TRACE ("Source Path: %s\n", szSrcPath); /* check if there can be found files as files have first priority */ if (IsExistingFile(szSrcPath)) dwMoveStatusFlags |= MOVE_SOURCE_IS_FILE; else dwMoveStatusFlags |= MOVE_SOURCE_IS_DIR; @@ -264,10 +258,8 @@ } FindClose(hFile); -#ifdef _DEBUG - DebugPrintf(_T("Do we have only one file: %s\n"), OnlyOneFile ? _T("TRUE") : _T("FALSE")); -#endif - + TRACE ("Do we have only one file: %s\n", OnlyOneFile ? _T("TRUE") : _T("FALSE")); + /* we have to start again to be sure we don't miss any files or folders*/ hFile = FindFirstFile (arg[argc - 2], &findBuffer); if (hFile == INVALID_HANDLE_VALUE) @@ -301,9 +293,7 @@ /* move it */ do { -#ifdef _DEBUG - DebugPrintf (_T("Found file/directory: %s\n"), findBuffer.cFileName); -#endif + TRACE ("Found file/directory: %s\n", findBuffer.cFileName); nOverwrite = 1; dwMoveFlags = 0; dwMoveStatusFlags &= ~MOVE_DEST_IS_FILE & @@ -325,9 +315,7 @@ dwMoveStatusFlags |= MOVE_SRC_CURRENT_IS_DIR; /* source is file but at the current round we found a directory */ continue; } -#ifdef _DEBUG - DebugPrintf (_T("Source is dir: %s\n"), szSrcPath); -#endif + TRACE ("Source is dir: %s\n", szSrcPath); dwMoveFlags = MOVEFILE_REPLACE_EXISTING | MOVEFILE_WRITE_THROUGH | MOVEFILE_COPY_ALLOWED; } @@ -336,9 +324,7 @@ if (IsExistingDirectory(szDestPath)) { /* destination is existing directory */ -#ifdef _DEBUG - DebugPrintf (_T("Destination is directory: %s\n"), szDestPath); -#endif + TRACE ("Destination is directory: %s\n", szDestPath); dwMoveStatusFlags |= MOVE_DEST_IS_DIR; @@ -358,9 +344,7 @@ if (IsExistingFile(szDestPath)) { /* destination is a file */ -#ifdef _DEBUG - DebugPrintf (_T("Destination is file: %s\n"), szDestPath); -#endif + TRACE ("Destination is file: %s\n", szDestPath); dwMoveStatusFlags |= MOVE_DEST_IS_FILE | MOVE_DEST_EXISTS; _tcscpy (szFullDestPath, szDestPath); @@ -369,9 +353,7 @@ } -#ifdef _DEBUG - DebugPrintf(_T("Move Status Flags: 0x%X\n"),dwMoveStatusFlags); -#endif + TRACE ("Move Status Flags: 0x%X\n",dwMoveStatusFlags); if (dwMoveStatusFlags & MOVE_SOURCE_IS_DIR && dwMoveStatusFlags & MOVE_DEST_IS_DIR && Modified: trunk/reactos/base/shell/cmd/msgbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/msgbox.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/msgbox.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/msgbox.c [iso-8859-1] Thu May 15 15:02:05 2008 @@ -130,8 +130,6 @@ prompt = param; hWnd=GetConsoleWindow (); -// DebugPrintf("FindWindow hWnd = %d\n",hWnd); -// ConErrPrintf("FindWindow hWnd = %d\n",hWnd); switch (MessageBox(hWnd, prompt, title, uType)) { Modified: trunk/reactos/base/shell/cmd/pause.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/pause.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/pause.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/pause.c [iso-8859-1] Thu May 15 15:02:05 2008 @@ -37,9 +37,7 @@ INT cmd_pause (LPTSTR cmd, LPTSTR param) { -#ifdef _DEBUG - DebugPrintf (_T("cmd_pause: \'%s\' : \'%s\')\n"), cmd, param); -#endif + TRACE ("cmd_pause: \'%s\' : \'%s\')\n", cmd, param); if (!_tcsncmp (param, _T("/?"), 2)) { Modified: trunk/reactos/base/shell/cmd/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/precomp.h?r… ============================================================================== --- trunk/reactos/base/shell/cmd/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/precomp.h [iso-8859-1] Thu May 15 15:02:05 2008 @@ -36,4 +36,7 @@ #include <reactos/buildno.h> #include <reactos/version.h> +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(cmd); + #endif /* __CMD_PRECOMP_H */ Modified: trunk/reactos/base/shell/cmd/shift.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/shift.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/shift.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/shift.c [iso-8859-1] Thu May 15 15:02:05 2008 @@ -39,9 +39,7 @@ INT cmd_shift (LPTSTR cmd, LPTSTR param) { -#ifdef _DEBUG - DebugPrintf (_T("cmd_shift: (\'%s\', \'%s\')\n"), cmd, param); -#endif + TRACE ("cmd_shift: (\'%s\', \'%s\')\n", cmd, param); if (!_tcsncmp (param, _T("/?"), 2)) { Modified: trunk/reactos/base/shell/cmd/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/start.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/start.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/start.c [iso-8859-1] Thu May 15 15:02:05 2008 @@ -253,14 +253,10 @@ szFullCmdLine[_tcslen(szFullCmdLine)] = _T('\"'); } -#ifdef _DEBUG - DebugPrintf (_T("[BATCH: %s %s]\n"), szFullName, rest); -#endif - - -#ifdef _DEBUG - DebugPrintf (_T("[EXEC: %s %s]\n"), szFullName, rest); -#endif + TRACE ("[BATCH: %s %s]\n", szFullName, rest); + + + TRACE ("[EXEC: %s %s]\n", szFullName, rest); /* build command line for CreateProcess() */ if (bBat == FALSE) { Modified: trunk/reactos/base/shell/cmd/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/time.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/time.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/time.c [iso-8859-1] Thu May 15 15:02:05 2008 @@ -177,9 +177,7 @@ ConInString (s, 40); -#ifdef _DEBUG - DebugPrintf (_T("\'%s\'\n"), s); -#endif + TRACE ("\'%s\'\n", s); while (*s && s[_tcslen (s) - 1] < _T(' ')) s[_tcslen(s) - 1] = _T('\0'); Modified: trunk/reactos/base/shell/cmd/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/timer.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/timer.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/timer.c [iso-8859-1] Thu May 15 15:02:05 2008 @@ -37,9 +37,7 @@ TCHAR szMsg[RC_STRING_MAX_SIZE]; DWORD h,m,s,ms; -#ifdef _DEBUG - DebugPrintf(_T("PrintTime(%d,%d)"),time,format); -#endif + TRACE ("PrintElapsedTime(%d,%d)",time,format); switch (format) { Modified: trunk/reactos/base/shell/cmd/where.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/where.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/where.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/where.c [iso-8859-1] Thu May 15 15:02:05 2008 @@ -92,17 +92,13 @@ /* initialize full name buffer */ *pFullName = _T('\0'); -#ifdef _DEBUG - DebugPrintf (_T("SearchForExecutableSingle: \'%s\' with ext: \'%s\'\n"), pFileName, pExtension); -#endif + TRACE ("SearchForExecutableSingle: \'%s\' with ext: \'%s\'\n", pFileName, pExtension); /* Check if valid directly on specified path */ if (_tcschr (pFileName, _T('\\')) != NULL) { LPTSTR pFilePart; -#ifdef _DEBUG - DebugPrintf (_T("Absolute or relative path is given.\n")); -#endif + TRACE ("Absolute or relative path is given.\n"); if (GetFullPathName (pFileName, CMDLINE_LENGTH, @@ -118,9 +114,7 @@ if (IsExistingFile (szPathBuffer)) { -#ifdef _DEBUG - DebugPrintf (_T("Found: \'%s\'\n"), szPathBuffer); -#endif + TRACE ("Found: \'%s\'\n", szPathBuffer); _tcscpy (pFullName, szPathBuffer); return TRUE; } @@ -141,9 +135,7 @@ if (IsExistingFile (szPathBuffer)) { -#ifdef _DEBUG - DebugPrintf (_T("Found: \'%s\'\n"), szPathBuffer); -#endif + TRACE ("Found: \'%s\'\n", szPathBuffer); _tcscpy (pFullName, szPathBuffer); return TRUE; } @@ -191,9 +183,7 @@ if (IsExistingFile (szPathBuffer)) { -#ifdef _DEBUG - DebugPrintf (_T("Found: \'%s\'\n"), szPathBuffer); -#endif + TRACE ("Found: \'%s\'\n", szPathBuffer); cmd_free (pszBuffer); _tcscpy (pFullName, szPathBuffer); return TRUE; @@ -212,9 +202,7 @@ LPTSTR pCh; LPTSTR pExt; DWORD dwBuffer; -#ifdef _DEBUG - DebugPrintf (_T("SearchForExecutable: \'%s\'\n"), pFileName); -#endif + TRACE ("SearchForExecutable: \'%s\'\n", pFileName); /* load environment varable PATHEXT */ pszBuffer = (LPTSTR)cmd_alloc (ENV_BUFFER_SIZE * sizeof(TCHAR)); dwBuffer = GetEnvironmentVariable (_T("PATHEXT"), pszBuffer, ENV_BUFFER_SIZE); @@ -228,9 +216,7 @@ _tcscpy(pszBuffer, pszDefaultPathExt); } -#ifdef _DEBUG - DebugPrintf (_T("SearchForExecutable(): Loaded PATHEXT: %s\n"), pszBuffer); -#endif + TRACE ("SearchForExecutable(): Loaded PATHEXT: %s\n", pszBuffer); pExt = _tcsrchr(pFileName, _T('.')); if (pExt != NULL)

16 years, 4 months

[gbrunmar] 33532: Patch by Kamil Hornicek ( tykef AT atlas DOT cz ): * Fixed DialogBoxParam to set correct error values and returning correct error codes

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Thu May 15 14:07:46 2008 New Revision: 33532 URL: http://svn.reactos.org/svn/reactos?rev=33532&view=rev Log: Patch by Kamil Hornicek ( tykef AT atlas DOT cz ): * Fixed DialogBoxParam to set correct error values and returning correct error codes Modified: trunk/reactos/dll/win32/user32/windows/dialog.c Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Thu May 15 14:07:46 2008 @@ -1678,8 +1678,17 @@ HRSRC hrsrc; LPCDLGTEMPLATE ptr; - if (!(hrsrc = FindResourceA( hInstance, lpTemplateName, (LPCSTR)RT_DIALOG ))) return 0; - if (!(ptr = (LPCDLGTEMPLATE)LoadResource(hInstance, hrsrc))) return 0; + if (!(hrsrc = FindResourceA( hInstance, lpTemplateName, (LPCSTR)RT_DIALOG )) || + !(ptr = (LPCDLGTEMPLATE)LoadResource(hInstance, hrsrc))) + { + SetLastError(ERROR_RESOURCE_NAME_NOT_FOUND); + return -1; + } + if (!IsWindow(hWndParent)) + { + SetLastError(ERROR_INVALID_WINDOW_HANDLE); + return 0; + } hwnd = DIALOG_CreateIndirect(hInstance, ptr, hWndParent, lpDialogFunc, dwInitParam, FALSE, TRUE); if (hwnd) return DIALOG_DoDialogBox(hwnd, hWndParent); return -1; @@ -1702,8 +1711,17 @@ HRSRC hrsrc; LPCDLGTEMPLATE ptr; - if (!(hrsrc = FindResourceW( hInstance, lpTemplateName, (LPCWSTR)RT_DIALOG ))) return 0; - if (!(ptr = (LPCDLGTEMPLATE)LoadResource(hInstance, hrsrc))) return 0; + if (!(hrsrc = FindResourceW( hInstance, lpTemplateName, (LPCWSTR)RT_DIALOG )) || + !(ptr = (LPCDLGTEMPLATE)LoadResource(hInstance, hrsrc))) + { + SetLastError(ERROR_RESOURCE_NAME_NOT_FOUND); + return -1; + } + if (!IsWindow(hWndParent)) + { + SetLastError(ERROR_INVALID_WINDOW_HANDLE); + return 0; + } hwnd = DIALOG_CreateIndirect(hInstance, ptr, hWndParent, lpDialogFunc, dwInitParam, TRUE, TRUE); if (hwnd) return DIALOG_DoDialogBox(hwnd, hWndParent); return -1;

16 years, 4 months

[mpiulachs] 33531: - Add specific module type for keyboard layouts - Added a description attribute to modules - Added a lcid attribute to modules (KeyboardLayout only)

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Thu May 15 09:46:15 2008 New Revision: 33531 URL: http://svn.reactos.org/svn/reactos?rev=33531&view=rev Log: - Add specific module type for keyboard layouts - Added a description attribute to modules - Added a lcid attribute to modules (KeyboardLayout only) Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… ============================================================================== --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp [iso-8859-1] Thu May 15 09:46:15 2008 @@ -640,7 +640,7 @@ fprintf ( OUT, "\t\t\t\t\t<Add option=\"-Wl,--entry,%s%s\" />\r\n", "_", module.GetEntryPoint(false).c_str () ); fprintf ( OUT, "\t\t\t\t\t<Add option=\"-Wl,--image-base,%s\" />\r\n", baseaddr == "" ? "0x40000" : baseaddr.c_str () ); - if ( module.type == Win32DLL ) + if ( module.type == Win32DLL) fprintf ( OUT, "\t\t\t\t\t<Add option=\"-Wl,--shared\" />\r\n" ); else if ( module.type == NativeDLL) fprintf ( OUT, "\t\t\t\t\t<Add option=\"-Wl,--shared\" />\r\n" ); Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Thu May 15 09:46:15 2008 @@ -190,6 +190,7 @@ case Win32GUI: handler = new MingwWin32GUIModuleHandler ( module ); break; + case KeyboardLayout: case KernelModeDLL: handler = new MingwKernelModeDLLModuleHandler ( module ); break; @@ -2921,7 +2922,7 @@ && module.type != Win32OCX && module.type != Win32CUI && module.type != Win32GUI - && module.type != Win32SCR ) + && module.type != Win32SCR) { // no implicit libraries return; Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp [iso-8859-1] Thu May 15 09:46:15 2008 @@ -356,7 +356,8 @@ if (getenv ( "BASEDIR" ) != NULL && (module.type == Kernel || module.type == KernelModeDLL || - module.type == KernelModeDriver)) + module.type == KernelModeDriver || + module.type == KeyboardLayout)) { string WdkBase, SdkPath, CrtPath, DdkPath; WdkBase = getenv ( "BASEDIR" ); @@ -514,7 +515,8 @@ if (getenv ( "BASEDIR" ) != NULL && (module.type == Kernel || module.type == KernelModeDLL || - module.type == KernelModeDriver)) + module.type == KernelModeDriver || + module.type == KeyboardLayout)) { string WdkBase, CrtPath, DdkPath; WdkBase = getenv ( "BASEDIR" ); Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/bootstrap.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/bootstrap.cpp [iso-8859-1] Thu May 15 09:46:15 2008 @@ -43,6 +43,7 @@ { case Kernel: case KernelModeDLL: + case KeyboardLayout: case NativeDLL: case NativeCUI: case Win32DLL: Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Thu May 15 09:46:15 2008 @@ -465,6 +465,20 @@ buildtype = "BOOTPROG"; } } + + att = moduleNode.GetAttribute ( "description", false ); + if (att != NULL ) + { + description = project.ResolveProperties(att->value); + } + else + description = ""; + + att = moduleNode.GetAttribute ( "lcid", false ); + if (type == KeyboardLayout && att != NULL ) + lcid = att->value; + else + lcid = ""; SetImportLibrary ( NULL ); } @@ -899,6 +913,8 @@ return NativeDLL; if ( attribute.value == "nativecui" ) return NativeCUI; + if ( attribute.value == "keyboardlayout" ) + return KeyboardLayout; if ( attribute.value == "win32dll" ) return Win32DLL; if ( attribute.value == "win32ocx" ) @@ -953,6 +969,7 @@ { case Kernel: case KernelModeDLL: + case KeyboardLayout: case NativeDLL: case Win32DLL: case Win32OCX: @@ -1015,6 +1032,7 @@ case KernelModeDLL: case NativeDLL: + case KeyboardLayout: case Win32DLL: return ".dll"; case Win32OCX: @@ -1057,6 +1075,7 @@ { case Kernel: return "KiSystemStartup"; + case KeyboardLayout: case KernelModeDLL: case KernelModeDriver: return "DriverEntry@8"; @@ -1124,6 +1143,7 @@ case Win32SCR: case Win32GUI: return "0x00400000"; + case KeyboardLayout: case KernelModeDLL: case KernelModeDriver: return "0x00010000"; @@ -1169,6 +1189,7 @@ case Kernel: case KernelModeDLL: case NativeDLL: + case KeyboardLayout: case Win32DLL: case Win32OCX: case KernelModeDriver: Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] Thu May 15 09:46:15 2008 @@ -303,7 +303,8 @@ RpcProxy, HostStaticLibrary, TypeDontCare, - Cabinet + Cabinet, + KeyboardLayout }; enum HostType @@ -375,6 +376,8 @@ FileLocation *output; // "path/foo.exe" FileLocation *dependency; // "path/foo.exe" or "path/libfoo.a" FileLocation *install; + std::string description; + std::string lcid; Module ( const Project& project, const XMLElement& moduleNode,

16 years, 4 months

[cfinck] 33530: - Rename the LICINFO structure to LIC_CONTEXT as LICINFO is already used in one of the official MS PSDK headers - Replace IsUserAdmin (Wine API) with IsUserAnAdmin (shell32 API) When you now add the PROCESSOR_POWER_INFORMATION structure to "precomp.h" (which was "accidentally omitted from WinNT.h" according to MSDN..), sysdm.cpl can be compiled using MSVC and the MS PSDK headers.

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu May 15 09:33:33 2008 New Revision: 33530 URL: http://svn.reactos.org/svn/reactos?rev=33530&view=rev Log: - Rename the LICINFO structure to LIC_CONTEXT as LICINFO is already used in one of the official MS PSDK headers - Replace IsUserAdmin (Wine API) with IsUserAnAdmin (shell32 API) When you now add the PROCESSOR_POWER_INFORMATION structure to "precomp.h" (which was "accidentally omitted from WinNT.h" according to MSDN..), sysdm.cpl can be compiled using MSVC and the MS PSDK headers. Modified: trunk/reactos/dll/cpl/sysdm/licence.c trunk/reactos/dll/cpl/sysdm/userprofile.c Modified: trunk/reactos/dll/cpl/sysdm/licence.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/licence.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/licence.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/licence.c [iso-8859-1] Thu May 15 09:33:33 2008 @@ -9,14 +9,14 @@ #include "precomp.h" -typedef struct _LICINFO +typedef struct _LIC_CONTEXT { HICON hIcon; -} LICINFO, *PLICINFO; +} LIC_CONTEXT, *PLIC_CONTEXT; static BOOL -OnInitDialog(HWND hDlg, PLICINFO pLicInfo) +OnInitDialog(HWND hDlg, PLIC_CONTEXT pLicInfo) { HRSRC hResInfo; HGLOBAL hResMem; @@ -65,16 +65,16 @@ WPARAM wParam, LPARAM lParam) { - PLICINFO pLicInfo; + PLIC_CONTEXT pLicInfo; UNREFERENCED_PARAMETER(lParam); - pLicInfo = (PLICINFO)GetWindowLongPtr(hDlg, DWLP_USER); + pLicInfo = (PLIC_CONTEXT)GetWindowLongPtr(hDlg, DWLP_USER); switch (uMsg) { case WM_INITDIALOG: - pLicInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LICINFO)); + pLicInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LIC_CONTEXT)); if (pLicInfo == NULL) { EndDialog(hDlg, 0); Modified: trunk/reactos/dll/cpl/sysdm/userprofile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/userprofile.… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/userprofile.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/userprofile.c [iso-8859-1] Thu May 15 09:33:33 2008 @@ -121,7 +121,7 @@ AddUserProfiles(GetDlgItem(hwndDlg, IDC_USERPROFILE_LIST)); /* Disable the "Delete" and "Copy To" buttons if the user is not an admin */ - if (!IsUserAdmin()) + if (!IsUserAnAdmin()) { EnableWindow(GetDlgItem(hwndDlg, IDC_USERPROFILE_DELETE), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_USERPROFILE_COPY), FALSE);

16 years, 4 months

← Newer
1
...
23
24
25
26
27
28
29
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2008