Ros-diffs March 2012

ros-diffs@reactos.org

22 participants
351 discussions

[khornicek] 55969: [TRANSLATION] Dll/cpl UTF-8 conversion patch by Elton Chung. See issue #6333 for more details.
by khornicek＠svn.reactos.org 03 Mar '12

03 Mar '12

Author: khornicek Date: Sat Mar 3 19:29:06 2012 New Revision: 55969 URL: http://svn.reactos.org/svn/reactos?rev=55969&view=rev Log: [TRANSLATION] Dll/cpl UTF-8 conversion patch by Elton Chung. See issue #6333 for more details. Added: trunk/reactos/dll/win32/netshell/lang/zh-TW.rc (with props) Modified: trunk/reactos/dll/cpl/telephon/lang/bg-BG.rc trunk/reactos/dll/cpl/telephon/lang/cs-CZ.rc trunk/reactos/dll/cpl/telephon/lang/de-DE.rc trunk/reactos/dll/cpl/telephon/lang/el-GR.rc trunk/reactos/dll/cpl/telephon/lang/es-ES.rc trunk/reactos/dll/cpl/telephon/lang/fr-FR.rc trunk/reactos/dll/cpl/telephon/lang/ja-JP.rc trunk/reactos/dll/cpl/telephon/lang/no-NO.rc trunk/reactos/dll/cpl/telephon/lang/sk-SK.rc trunk/reactos/dll/cpl/telephon/rsrc.rc trunk/reactos/dll/win32/aclui/lang/bg-BG.rc trunk/reactos/dll/win32/aclui/lang/de-DE.rc trunk/reactos/dll/win32/aclui/lang/el-GR.rc trunk/reactos/dll/win32/aclui/lang/es-ES.rc trunk/reactos/dll/win32/aclui/lang/fr-FR.rc trunk/reactos/dll/win32/aclui/lang/hu-HU.rc trunk/reactos/dll/win32/aclui/lang/ja-JP.rc trunk/reactos/dll/win32/aclui/lang/lt-LT.rc trunk/reactos/dll/win32/aclui/lang/no-NO.rc trunk/reactos/dll/win32/aclui/lang/sv-SE.rc trunk/reactos/dll/win32/aclui/lang/th-TH.rc trunk/reactos/dll/win32/aclui/rsrc.rc trunk/reactos/dll/win32/browseui/browseui.rc trunk/reactos/dll/win32/browseui/lang/es-ES.rc trunk/reactos/dll/win32/devmgr/devmgr.rc trunk/reactos/dll/win32/devmgr/lang/bg-BG.rc trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc trunk/reactos/dll/win32/devmgr/lang/de-DE.rc trunk/reactos/dll/win32/devmgr/lang/el-GR.rc trunk/reactos/dll/win32/devmgr/lang/es-ES.rc trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc trunk/reactos/dll/win32/devmgr/lang/hu-HU.rc trunk/reactos/dll/win32/devmgr/lang/it-IT.rc trunk/reactos/dll/win32/devmgr/lang/no-NO.rc trunk/reactos/dll/win32/devmgr/lang/pt-BR.rc trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc trunk/reactos/dll/win32/kernel32/kernel32.rc trunk/reactos/dll/win32/kernel32/winnls/lang/de-DE.rc trunk/reactos/dll/win32/kernel32/winnls/lang/es-ES.rc trunk/reactos/dll/win32/modemui/lang/de-DE.rc trunk/reactos/dll/win32/modemui/lang/es-ES.rc trunk/reactos/dll/win32/modemui/lang/no-NO.rc trunk/reactos/dll/win32/modemui/modemui.rc trunk/reactos/dll/win32/msgina/lang/bg-BG.rc trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc trunk/reactos/dll/win32/msgina/lang/de-DE.rc trunk/reactos/dll/win32/msgina/lang/es-ES.rc trunk/reactos/dll/win32/msgina/lang/fr-FR.rc trunk/reactos/dll/win32/msgina/lang/it-IT.rc trunk/reactos/dll/win32/msgina/lang/ja-JP.rc trunk/reactos/dll/win32/msgina/lang/no-NO.rc trunk/reactos/dll/win32/msgina/lang/sk-SK.rc trunk/reactos/dll/win32/msgina/msgina.rc trunk/reactos/dll/win32/msports/lang/de-DE.rc trunk/reactos/dll/win32/msports/msports.rc trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc trunk/reactos/dll/win32/netcfgx/netcfgx.rc trunk/reactos/dll/win32/netid/lang/bg-BG.rc trunk/reactos/dll/win32/netid/lang/cs-CZ.rc trunk/reactos/dll/win32/netid/lang/de-DE.rc trunk/reactos/dll/win32/netid/lang/el-GR.rc trunk/reactos/dll/win32/netid/lang/es-ES.rc trunk/reactos/dll/win32/netid/lang/fr-FR.rc trunk/reactos/dll/win32/netid/lang/it-IT.rc trunk/reactos/dll/win32/netid/lang/ja-JP.rc trunk/reactos/dll/win32/netid/lang/no-NO.rc trunk/reactos/dll/win32/netid/lang/sk-SK.rc trunk/reactos/dll/win32/netid/rsrc.rc trunk/reactos/dll/win32/netshell/lang/bg-BG.rc trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc trunk/reactos/dll/win32/netshell/lang/da-DK.rc trunk/reactos/dll/win32/netshell/lang/de-DE.rc trunk/reactos/dll/win32/netshell/lang/el-GR.rc trunk/reactos/dll/win32/netshell/lang/es-ES.rc trunk/reactos/dll/win32/netshell/lang/fr-FR.rc trunk/reactos/dll/win32/netshell/lang/hu-HU.rc trunk/reactos/dll/win32/netshell/lang/id-ID.rc trunk/reactos/dll/win32/netshell/lang/it-IT.rc trunk/reactos/dll/win32/netshell/lang/ja-JP.rc trunk/reactos/dll/win32/netshell/lang/no-NO.rc trunk/reactos/dll/win32/netshell/lang/pl-PL.rc trunk/reactos/dll/win32/netshell/lang/ru-RU.rc trunk/reactos/dll/win32/netshell/lang/sk-SK.rc trunk/reactos/dll/win32/netshell/lang/sv-SE.rc trunk/reactos/dll/win32/netshell/lang/uk-UA.rc trunk/reactos/dll/win32/netshell/lang/zh-CN.rc trunk/reactos/dll/win32/netshell/netshell.rc trunk/reactos/dll/win32/newdev/lang/bg-BG.rc trunk/reactos/dll/win32/newdev/lang/cs-CZ.rc trunk/reactos/dll/win32/newdev/lang/de-DE.rc trunk/reactos/dll/win32/newdev/lang/el-GR.rc trunk/reactos/dll/win32/newdev/lang/es-ES.rc trunk/reactos/dll/win32/newdev/lang/fr-FR.rc trunk/reactos/dll/win32/newdev/lang/hu-HU.rc trunk/reactos/dll/win32/newdev/lang/it-IT.rc trunk/reactos/dll/win32/newdev/lang/ja-JP.rc trunk/reactos/dll/win32/newdev/lang/nl-NL.rc trunk/reactos/dll/win32/newdev/lang/no-NO.rc trunk/reactos/dll/win32/newdev/lang/sk-SK.rc trunk/reactos/dll/win32/newdev/lang/th-TH.rc trunk/reactos/dll/win32/newdev/rsrc.rc trunk/reactos/dll/win32/rasdlg/lang/de-DE.rc trunk/reactos/dll/win32/rasdlg/lang/no-NO.rc trunk/reactos/dll/win32/rasdlg/rasdlg.rc trunk/reactos/dll/win32/serialui/lang/bg-BG.rc trunk/reactos/dll/win32/serialui/lang/cs-CZ.rc trunk/reactos/dll/win32/serialui/lang/de-DE.rc trunk/reactos/dll/win32/serialui/lang/es-ES.rc trunk/reactos/dll/win32/serialui/lang/fr-FR.rc trunk/reactos/dll/win32/serialui/lang/it-IT.rc trunk/reactos/dll/win32/serialui/lang/no-NO.rc trunk/reactos/dll/win32/serialui/serialui.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shimgvw/lang/bg-BG.rc trunk/reactos/dll/win32/shimgvw/lang/cs-CZ.rc trunk/reactos/dll/win32/shimgvw/lang/de-DE.rc trunk/reactos/dll/win32/shimgvw/lang/es-ES.rc trunk/reactos/dll/win32/shimgvw/lang/fr-FR.rc trunk/reactos/dll/win32/shimgvw/lang/lt-LT.rc trunk/reactos/dll/win32/shimgvw/lang/no-NO.rc trunk/reactos/dll/win32/shimgvw/lang/sk-SK.rc trunk/reactos/dll/win32/shimgvw/rsrc.rc trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/el-GR.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/et-EE.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc trunk/reactos/dll/win32/syssetup/lang/no-NO.rc trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc trunk/reactos/dll/win32/syssetup/syssetup.rc trunk/reactos/dll/win32/tapiui/lang/de-DE.rc trunk/reactos/dll/win32/tapiui/lang/no-NO.rc trunk/reactos/dll/win32/tapiui/lang/ro-RO.rc trunk/reactos/dll/win32/tapiui/tapiui.rc trunk/reactos/dll/win32/userenv/lang/bg-BG.rc trunk/reactos/dll/win32/userenv/lang/cs-CZ.rc trunk/reactos/dll/win32/userenv/lang/da-DK.rc trunk/reactos/dll/win32/userenv/lang/de-DE.rc trunk/reactos/dll/win32/userenv/lang/es-ES.rc trunk/reactos/dll/win32/userenv/lang/fi-FI.rc trunk/reactos/dll/win32/userenv/lang/fr-FR.rc trunk/reactos/dll/win32/userenv/lang/hu-HU.rc trunk/reactos/dll/win32/userenv/lang/it-IT.rc trunk/reactos/dll/win32/userenv/lang/ja-JP.rc trunk/reactos/dll/win32/userenv/lang/lt-LT.rc trunk/reactos/dll/win32/userenv/lang/nl-NL.rc trunk/reactos/dll/win32/userenv/lang/no-NO.rc trunk/reactos/dll/win32/userenv/lang/pt-BR.rc trunk/reactos/dll/win32/userenv/lang/sk-SK.rc trunk/reactos/dll/win32/userenv/lang/sv-SE.rc trunk/reactos/dll/win32/userenv/lang/th-TH.rc trunk/reactos/dll/win32/userenv/userenv.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/telephon/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/bg-B… Modified: trunk/reactos/dll/cpl/telephon/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/cs-C… Modified: trunk/reactos/dll/cpl/telephon/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/de-D… Modified: trunk/reactos/dll/cpl/telephon/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/el-G… Modified: trunk/reactos/dll/cpl/telephon/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/es-E… Modified: trunk/reactos/dll/cpl/telephon/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/fr-F… Modified: trunk/reactos/dll/cpl/telephon/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/ja-J… Modified: trunk/reactos/dll/cpl/telephon/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/no-N… Modified: trunk/reactos/dll/cpl/telephon/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/sk-S… Modified: trunk/reactos/dll/cpl/telephon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/rsrc.rc?r… Modified: trunk/reactos/dll/win32/aclui/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/bg-BG… Modified: trunk/reactos/dll/win32/aclui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/de-DE… Modified: trunk/reactos/dll/win32/aclui/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/el-GR… Modified: trunk/reactos/dll/win32/aclui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/es-ES… Modified: trunk/reactos/dll/win32/aclui/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/fr-FR… Modified: trunk/reactos/dll/win32/aclui/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/hu-HU… Modified: trunk/reactos/dll/win32/aclui/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/ja-JP… Modified: trunk/reactos/dll/win32/aclui/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/lt-LT… Modified: trunk/reactos/dll/win32/aclui/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/no-NO… Modified: trunk/reactos/dll/win32/aclui/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/sv-SE… Modified: trunk/reactos/dll/win32/aclui/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/th-TH… Modified: trunk/reactos/dll/win32/aclui/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/rsrc.rc?re… Modified: trunk/reactos/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… Modified: trunk/reactos/dll/win32/browseui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/es… Modified: trunk/reactos/dll/win32/devmgr/devmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgr.rc… Modified: trunk/reactos/dll/win32/devmgr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/bg-B… Modified: trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/cs-C… Modified: trunk/reactos/dll/win32/devmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/de-D… Modified: trunk/reactos/dll/win32/devmgr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/el-G… Modified: trunk/reactos/dll/win32/devmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/es-E… Modified: trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/fr-F… Modified: trunk/reactos/dll/win32/devmgr/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/hu-H… Modified: trunk/reactos/dll/win32/devmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/it-I… Modified: trunk/reactos/dll/win32/devmgr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/no-N… Modified: trunk/reactos/dll/win32/devmgr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/pt-B… Modified: trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/sk-S… Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/modemui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/lang/de-… Modified: trunk/reactos/dll/win32/modemui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/lang/es-… Modified: trunk/reactos/dll/win32/modemui/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/lang/no-… Modified: trunk/reactos/dll/win32/modemui/modemui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/modemui.… Modified: trunk/reactos/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/bg-B… Modified: trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/cs-C… Modified: trunk/reactos/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/de-D… Modified: trunk/reactos/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/es-E… Modified: trunk/reactos/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/fr-F… Modified: trunk/reactos/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/it-I… Modified: trunk/reactos/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ja-J… Modified: trunk/reactos/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/no-N… Modified: trunk/reactos/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sk-S… Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc… Modified: trunk/reactos/dll/win32/msports/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/de-… Modified: trunk/reactos/dll/win32/msports/msports.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… Modified: trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/bg-… Modified: trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/cs-… Modified: trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/da-… Modified: trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/de-… Modified: trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/el-… Modified: trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/es-… Modified: trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/fr-… Modified: trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/hu-… Modified: trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/it-… Modified: trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ja-… Modified: trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/nl-… Modified: trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/no-… Modified: trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/sk-… Modified: trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/sv-… Modified: trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/zh-… Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… Modified: trunk/reactos/dll/win32/netid/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/bg-BG… Modified: trunk/reactos/dll/win32/netid/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/cs-CZ… Modified: trunk/reactos/dll/win32/netid/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/de-DE… Modified: trunk/reactos/dll/win32/netid/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/el-GR… Modified: trunk/reactos/dll/win32/netid/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/es-ES… Modified: trunk/reactos/dll/win32/netid/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/fr-FR… Modified: trunk/reactos/dll/win32/netid/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/it-IT… Modified: trunk/reactos/dll/win32/netid/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/ja-JP… Modified: trunk/reactos/dll/win32/netid/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/no-NO… Modified: trunk/reactos/dll/win32/netid/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/sk-SK… Modified: trunk/reactos/dll/win32/netid/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/rsrc.rc?re… Modified: trunk/reactos/dll/win32/netshell/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/bg… Modified: trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/cs… Modified: trunk/reactos/dll/win32/netshell/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/da… Modified: trunk/reactos/dll/win32/netshell/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/de… Modified: trunk/reactos/dll/win32/netshell/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/el… Modified: trunk/reactos/dll/win32/netshell/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/es… Modified: trunk/reactos/dll/win32/netshell/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/fr… Modified: trunk/reactos/dll/win32/netshell/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/hu… Modified: trunk/reactos/dll/win32/netshell/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/id… Modified: trunk/reactos/dll/win32/netshell/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/it… Modified: trunk/reactos/dll/win32/netshell/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/ja… Modified: trunk/reactos/dll/win32/netshell/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/no… Modified: trunk/reactos/dll/win32/netshell/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/pl… Modified: trunk/reactos/dll/win32/netshell/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/ru… Modified: trunk/reactos/dll/win32/netshell/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/sk… Modified: trunk/reactos/dll/win32/netshell/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/sv… Modified: trunk/reactos/dll/win32/netshell/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/uk… Modified: trunk/reactos/dll/win32/netshell/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/zh… Added: trunk/reactos/dll/win32/netshell/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/zh… Modified: trunk/reactos/dll/win32/netshell/netshell.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… Modified: trunk/reactos/dll/win32/newdev/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/bg-B… Modified: trunk/reactos/dll/win32/newdev/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/cs-C… Modified: trunk/reactos/dll/win32/newdev/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/de-D… Modified: trunk/reactos/dll/win32/newdev/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/el-G… Modified: trunk/reactos/dll/win32/newdev/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/es-E… Modified: trunk/reactos/dll/win32/newdev/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/fr-F… Modified: trunk/reactos/dll/win32/newdev/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/hu-H… Modified: trunk/reactos/dll/win32/newdev/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/it-I… Modified: trunk/reactos/dll/win32/newdev/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ja-J… Modified: trunk/reactos/dll/win32/newdev/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/nl-N… Modified: trunk/reactos/dll/win32/newdev/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/no-N… Modified: trunk/reactos/dll/win32/newdev/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/sk-S… Modified: trunk/reactos/dll/win32/newdev/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/th-T… Modified: trunk/reactos/dll/win32/newdev/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/rsrc.rc?r… Modified: trunk/reactos/dll/win32/rasdlg/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/de-D… Modified: trunk/reactos/dll/win32/rasdlg/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/no-N… Modified: trunk/reactos/dll/win32/rasdlg/rasdlg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/rasdlg.rc… Modified: trunk/reactos/dll/win32/serialui/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/bg… Modified: trunk/reactos/dll/win32/serialui/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/cs… Modified: trunk/reactos/dll/win32/serialui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/de… Modified: trunk/reactos/dll/win32/serialui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/es… Modified: trunk/reactos/dll/win32/serialui/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/fr… Modified: trunk/reactos/dll/win32/serialui/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/it… Modified: trunk/reactos/dll/win32/serialui/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/no… Modified: trunk/reactos/dll/win32/serialui/serialui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/serialu… Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shimgvw/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/bg-… Modified: trunk/reactos/dll/win32/shimgvw/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/cs-… Modified: trunk/reactos/dll/win32/shimgvw/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/de-… Modified: trunk/reactos/dll/win32/shimgvw/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/es-… Modified: trunk/reactos/dll/win32/shimgvw/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/fr-… Modified: trunk/reactos/dll/win32/shimgvw/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/lt-… Modified: trunk/reactos/dll/win32/shimgvw/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/no-… Modified: trunk/reactos/dll/win32/shimgvw/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/sk-… Modified: trunk/reactos/dll/win32/shimgvw/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/rsrc.rc?… Modified: trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/bg… Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs… Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… Modified: trunk/reactos/dll/win32/syssetup/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/el… Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… Modified: trunk/reactos/dll/win32/syssetup/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/et… Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… Modified: trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/hu… Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… Modified: trunk/reactos/dll/win32/syssetup/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/no… Modified: trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pt… Modified: trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sk… Modified: trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh… Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… Modified: trunk/reactos/dll/win32/tapiui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/de-D… Modified: trunk/reactos/dll/win32/tapiui/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/no-N… Modified: trunk/reactos/dll/win32/tapiui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/ro-R… Modified: trunk/reactos/dll/win32/tapiui/tapiui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/tapiui.rc… Modified: trunk/reactos/dll/win32/userenv/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/bg-… Modified: trunk/reactos/dll/win32/userenv/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/cs-… Modified: trunk/reactos/dll/win32/userenv/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/da-… Modified: trunk/reactos/dll/win32/userenv/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/de-… Modified: trunk/reactos/dll/win32/userenv/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/es-… Modified: trunk/reactos/dll/win32/userenv/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/fi-… Modified: trunk/reactos/dll/win32/userenv/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/fr-… Modified: trunk/reactos/dll/win32/userenv/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/hu-… Modified: trunk/reactos/dll/win32/userenv/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/it-… Modified: trunk/reactos/dll/win32/userenv/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/ja-… Modified: trunk/reactos/dll/win32/userenv/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/lt-… Modified: trunk/reactos/dll/win32/userenv/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/nl-… Modified: trunk/reactos/dll/win32/userenv/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/no-… Modified: trunk/reactos/dll/win32/userenv/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/pt-… Modified: trunk/reactos/dll/win32/userenv/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/sk-… Modified: trunk/reactos/dll/win32/userenv/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/sv-… Modified: trunk/reactos/dll/win32/userenv/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/th-… Modified: trunk/reactos/dll/win32/userenv/userenv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/userenv.…

1 0

[janderwald] 55968: [USBCCGP] - Handle IRP_MN_QUERY_INTERFACE
by janderwald＠svn.reactos.org 03 Mar '12

03 Mar '12

Author: janderwald Date: Sat Mar 3 18:37:23 2012 New Revision: 55968 URL: http://svn.reactos.org/svn/reactos?rev=55968&view=rev Log: [USBCCGP] - Handle IRP_MN_QUERY_INTERFACE Modified: trunk/reactos/drivers/usb/usbccgp/pdo.c Modified: trunk/reactos/drivers/usb/usbccgp/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/pdo.c [iso-8859-1] Sat Mar 3 18:37:23 2012 @@ -413,6 +413,14 @@ DPRINT("[USBCCGP] PDO IRP_MN_START\n"); Status = STATUS_SUCCESS; break; + } + case IRP_MN_QUERY_INTERFACE: + { + // + // forward to lower device object + // + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(PDODeviceExtension->NextDeviceObject, Irp); } default: {

1 0

[janderwald] 55967: [LIBUSB] - Fix infinite loop
by janderwald＠svn.reactos.org 03 Mar '12

03 Mar '12

Author: janderwald Date: Sat Mar 3 15:16:43 2012 New Revision: 55967 URL: http://svn.reactos.org/svn/reactos?rev=55967&view=rev Log: [LIBUSB] - Fix infinite loop Modified: trunk/reactos/lib/drivers/libusb/usb_device.cpp Modified: trunk/reactos/lib/drivers/libusb/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/usb_dev… ============================================================================== --- trunk/reactos/lib/drivers/libusb/usb_device.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/usb_device.cpp [iso-8859-1] Sat Mar 3 15:16:43 2012 @@ -1164,6 +1164,9 @@ Found = TRUE; break; } + + // next entry + Entry = Entry->Flink; } if (!Found)

1 0

[janderwald] 55966: [USBCCG] - Remove hacks - Include alternate interface descriptors in the configuration descriptor
by janderwald＠svn.reactos.org 03 Mar '12

03 Mar '12

Author: janderwald Date: Sat Mar 3 15:08:28 2012 New Revision: 55966 URL: http://svn.reactos.org/svn/reactos?rev=55966&view=rev Log: [USBCCG] - Remove hacks - Include alternate interface descriptors in the configuration descriptor Modified: trunk/reactos/drivers/usb/usbccgp/descriptor.c trunk/reactos/drivers/usb/usbccgp/function.c trunk/reactos/drivers/usb/usbccgp/pdo.c Modified: trunk/reactos/drivers/usb/usbccgp/descriptor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/descri… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/descriptor.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/descriptor.c [iso-8859-1] Sat Mar 3 15:08:28 2012 @@ -220,76 +220,32 @@ return Status; } -ULONG -CountInterfaceDescriptors( - IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor) -{ - PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; - PVOID CurrentPosition; - ULONG Count = 0; - - // - // enumerate all interfaces - // - CurrentPosition = ConfigurationDescriptor; - do - { - // - // find next descriptor - // - InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(ConfigurationDescriptor, CurrentPosition, -1, -1, -1, -1, -1); - if (!InterfaceDescriptor) - break; - - // - // advance to next descriptor - // - CurrentPosition = (PVOID)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength); - - // - // increment descriptor count - // - Count++; - - }while(TRUE); - - // - // done - // - return Count; -} - NTSTATUS AllocateInterfaceDescriptorsArray( IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, OUT PUSB_INTERFACE_DESCRIPTOR **OutArray) { PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; - PVOID CurrentPosition; ULONG Count = 0; PUSB_INTERFACE_DESCRIPTOR *Array; - Count = CountInterfaceDescriptors(ConfigurationDescriptor); - ASSERT(Count); - // // allocate array // - Array = AllocateItem(NonPagedPool, sizeof(PUSB_INTERFACE_DESCRIPTOR) * Count); + Array = AllocateItem(NonPagedPool, sizeof(PUSB_INTERFACE_DESCRIPTOR) * ConfigurationDescriptor->bNumInterfaces); if (!Array) return STATUS_INSUFFICIENT_RESOURCES; // // enumerate all interfaces // - CurrentPosition = ConfigurationDescriptor; Count = 0; do { // // find next descriptor // - InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(ConfigurationDescriptor, CurrentPosition, -1, -1, -1, -1, -1); + InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(ConfigurationDescriptor, ConfigurationDescriptor, Count, 0, -1, -1, -1); if (!InterfaceDescriptor) break; @@ -298,11 +254,6 @@ // Array[Count] = InterfaceDescriptor; Count++; - - // - // advance to next descriptor - // - CurrentPosition = (PVOID)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength); }while(TRUE); Modified: trunk/reactos/drivers/usb/usbccgp/function.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/functi… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/function.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/function.c [iso-8859-1] Sat Mar 3 15:08:28 2012 @@ -711,7 +711,6 @@ PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor, FirstDescriptor = NULL; PFDO_DEVICE_EXTENSION FDODeviceExtension; NTSTATUS Status = STATUS_SUCCESS; - PVOID StartPosition; // // get device extension @@ -723,21 +722,15 @@ // // first check if all interfaces belong to the same audio class // - StartPosition = FDODeviceExtension->ConfigurationDescriptor; - for(Index = 0; Index < CountInterfaceDescriptors(FDODeviceExtension->ConfigurationDescriptor); Index++) + for(Index = 0; Index < FDODeviceExtension->ConfigurationDescriptor->bNumInterfaces; Index++) { // // get interface descriptor // - InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(FDODeviceExtension->ConfigurationDescriptor, StartPosition, -1, -1, -1, -1, -1); + InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(FDODeviceExtension->ConfigurationDescriptor, FDODeviceExtension->ConfigurationDescriptor, Index, 0, -1, -1, -1); DPRINT1("Index %lu Descriptor %p\n", Index, InterfaceDescriptor); ASSERT(InterfaceDescriptor); - // - // move to next descriptor - // - StartPosition = (PVOID)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength); - if (InterfaceDescriptor->bInterfaceClass != 0x1) { // @@ -816,7 +809,7 @@ // // number of interfaces // - FDODeviceExtension->FunctionDescriptor[0].NumberOfInterfaces = CountInterfaceDescriptors(FDODeviceExtension->ConfigurationDescriptor); + FDODeviceExtension->FunctionDescriptor[0].NumberOfInterfaces = FDODeviceExtension->ConfigurationDescriptor->bNumInterfaces; // // store function count Modified: trunk/reactos/drivers/usb/usbccgp/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/pdo.c [iso-8859-1] Sat Mar 3 15:08:28 2012 @@ -460,6 +460,7 @@ PURB Urb; PVOID Buffer; PUCHAR BufferPtr; + UCHAR InterfaceNumber; // // get current stack location @@ -489,6 +490,7 @@ // get current interface descriptor // InterfaceDescriptor = PDODeviceExtension->FunctionDescriptor->InterfaceDescriptorList[Index]; + InterfaceNumber = InterfaceDescriptor->bInterfaceNumber; // // add to size and move to next descriptor @@ -513,10 +515,17 @@ { if (InterfaceDescriptor->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE) { + if (InterfaceNumber != InterfaceDescriptor->bInterfaceNumber) + { + // + // reached next descriptor + // + break; + } + // - // reached next descriptor + // include alternate descriptor // - break; } // @@ -557,6 +566,7 @@ // get current interface descriptor // InterfaceDescriptor = PDODeviceExtension->FunctionDescriptor->InterfaceDescriptorList[Index]; + InterfaceNumber = InterfaceDescriptor->bInterfaceNumber; // // copy descriptor and move to next descriptor @@ -582,10 +592,18 @@ { if (InterfaceDescriptor->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE) { + if (InterfaceNumber != InterfaceDescriptor->bInterfaceNumber) + { + // + // reached next descriptor + // + break; + } + // - // reached next descriptor + // include alternate descriptor // - break; + DPRINT("InterfaceDescriptor %p Alternate %x InterfaceNumber %x\n", InterfaceDescriptor, InterfaceDescriptor->bAlternateSetting, InterfaceDescriptor->bInterfaceNumber); } // @@ -645,7 +663,7 @@ PPDO_DEVICE_EXTENSION PDODeviceExtension; PURB Urb, NewUrb; PUSBD_INTERFACE_INFORMATION InterfaceInformation; - ULONG InterfaceInformationCount, Index, InterfaceIndex; + ULONG InterfaceIndex, Length; PUSBD_INTERFACE_LIST_ENTRY Entry; ULONG NeedSelect, FoundInterface; NTSTATUS Status; @@ -677,28 +695,25 @@ return STATUS_SUCCESS; } - // - // count interface information - // - InterfaceInformationCount = 0; + // sanity checks + //C_ASSERT(sizeof(struct _URB_HEADER) == 16); + //C_ASSERT(FIELD_OFFSET(struct _URB_SELECT_CONFIGURATION, Interface.Length) == 24); + //C_ASSERT(sizeof(USBD_INTERFACE_INFORMATION) == 36); + //C_ASSERT(sizeof(struct _URB_SELECT_CONFIGURATION) == 0x3C); + + // available buffer length + Length = Urb->UrbSelectConfiguration.Hdr.Length - FIELD_OFFSET(struct _URB_SELECT_CONFIGURATION, Interface.Length); + + // + // check all interfaces + // InterfaceInformation = &Urb->UrbSelectConfiguration.Interface; + + Entry = NULL; do { - InterfaceInformationCount++; - InterfaceInformation = (PUSBD_INTERFACE_INFORMATION)((ULONG_PTR)InterfaceInformation + InterfaceInformation->Length); - }while((ULONG_PTR)InterfaceInformation < (ULONG_PTR)Urb + Urb->UrbSelectConfiguration.Hdr.Length); - - // - // check all interfaces - // - InterfaceInformation = &Urb->UrbSelectConfiguration.Interface; - Index = 0; - Entry = NULL; - DPRINT("Count %x\n", InterfaceInformationCount); - do - { - DPRINT1("[USBCCGP] SelectConfiguration Function %x InterfaceNumber %x Alternative %x\n", PDODeviceExtension->FunctionDescriptor->FunctionNumber, InterfaceInformation->InterfaceNumber, InterfaceInformation->AlternateSetting); - + DPRINT1("[USBCCGP] SelectConfiguration Function %x InterfaceNumber %x Alternative %x Length %lu InterfaceInformation->Length %lu\n", PDODeviceExtension->FunctionDescriptor->FunctionNumber, InterfaceInformation->InterfaceNumber, InterfaceInformation->AlternateSetting, Length, InterfaceInformation->Length); + ASSERT(InterfaceInformation->Length); // // search for the interface in the local interface list // @@ -778,7 +793,19 @@ // // interface is already selected // - RtlCopyMemory(InterfaceInformation, Entry->Interface, min(InterfaceInformation->Length, Entry->Interface->Length)); + ASSERT(Length >= Entry->Interface->Length); + RtlCopyMemory(InterfaceInformation, Entry->Interface, Entry->Interface->Length); + + // + // adjust remaining buffer size + // + ASSERT(Entry->Interface->Length); + Length -= Entry->Interface->Length; + + // + // move to next output interface information + // + InterfaceInformation = (PUSBD_INTERFACE_INFORMATION)((ULONG_PTR)InterfaceInformation + Entry->Interface->Length); } else { @@ -811,23 +838,37 @@ Status = USBCCGP_SyncUrbRequest(PDODeviceExtension->NextDeviceObject, NewUrb); DPRINT1("SelectInterface Status %x\n", Status); - // - // did it succeeed - // - if (NT_SUCCESS(Status)) - { - // - // update configuration info - // - ASSERT(Entry->Interface->Length == NewUrb->UrbSelectInterface.Interface.Length); - ASSERT(InterfaceInformation->Length == NewUrb->UrbSelectInterface.Interface.Length); - RtlCopyMemory(Entry->Interface, &NewUrb->UrbSelectInterface.Interface, NewUrb->UrbSelectInterface.Interface.Length); - - // - // update provided interface information - // - RtlCopyMemory(InterfaceInformation, Entry->Interface, Entry->Interface->Length); - } + if (!NT_SUCCESS(Status)) + { + // + // failed + // + break; + } + + // + // update configuration info + // + ASSERT(Entry->Interface->Length >= NewUrb->UrbSelectInterface.Interface.Length); + ASSERT(Length >= NewUrb->UrbSelectInterface.Interface.Length); + RtlCopyMemory(Entry->Interface, &NewUrb->UrbSelectInterface.Interface, NewUrb->UrbSelectInterface.Interface.Length); + + // + // update provided interface information + // + ASSERT(Length >= Entry->Interface->Length); + RtlCopyMemory(InterfaceInformation, Entry->Interface, Entry->Interface->Length); + + // + // decrement remaining buffer size + // + ASSERT(Entry->Interface->Length); + Length -= Entry->Interface->Length; + + // + // adjust output buffer offset + // + InterfaceInformation = (PUSBD_INTERFACE_INFORMATION)((ULONG_PTR)InterfaceInformation + Entry->Interface->Length); // // free urb @@ -835,12 +876,7 @@ FreeItem(NewUrb); } - // - // move to next information - // - InterfaceInformation = (PUSBD_INTERFACE_INFORMATION)((ULONG_PTR)InterfaceInformation + InterfaceInformation->Length); - Index++; - }while(Index < InterfaceInformationCount); + }while(Length); // // store configuration handle

1 0

[janderwald] 55965: [USBD] - Rewrite broken USBD_CreateConfigurationRequestEx - It did not calculate the required urb size correctly - It did not store the correct number of provided interfaces - L...
by janderwald＠svn.reactos.org 03 Mar '12

03 Mar '12

Author: janderwald Date: Sat Mar 3 14:41:12 2012 New Revision: 55965 URL: http://svn.reactos.org/svn/reactos?rev=55965&view=rev Log: [USBD] - Rewrite broken USBD_CreateConfigurationRequestEx - It did not calculate the required urb size correctly - It did not store the correct number of provided interfaces - Length of each interface information was wrong Modified: trunk/reactos/drivers/usb/usbd/usbd.c Modified: trunk/reactos/drivers/usb/usbd/usbd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbd/usbd.c?re… ============================================================================== --- trunk/reactos/drivers/usb/usbd/usbd.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbd/usbd.c [iso-8859-1] Sat Mar 3 14:41:12 2012 @@ -32,17 +32,15 @@ * USBD_GetPdoRegistryParameters (implemented) */ +#define _USBD_ +#define NDEBUG #include <ntddk.h> #include <usbdi.h> -#define NDEBUG +#include <usbdlib.h> #include <debug.h> #ifndef PLUGPLAY_REGKEY_DRIVER #define PLUGPLAY_REGKEY_DRIVER 2 #endif -typedef struct _USBD_INTERFACE_LIST_ENTRY { - PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; - PUSBD_INTERFACE_INFORMATION Interface; -} USBD_INTERFACE_LIST_ENTRY, *PUSBD_INTERFACE_LIST_ENTRY; NTSTATUS NTAPI DriverEntry(PDRIVER_OBJECT DriverObject, @@ -335,39 +333,61 @@ { PURB Urb; ULONG UrbSize = 0; - ULONG InterfaceCount; + ULONG InterfaceCount = 0, PipeCount = 0; ULONG InterfaceNumber, EndPointNumber; PUSBD_INTERFACE_INFORMATION InterfaceInfo; - for (InterfaceCount = 0; - InterfaceList[InterfaceCount].InterfaceDescriptor != NULL; - InterfaceCount++) - { - UrbSize += sizeof(USBD_INTERFACE_INFORMATION); - UrbSize += (InterfaceList[InterfaceCount].InterfaceDescriptor->bNumEndpoints - 1) * sizeof(USBD_PIPE_INFORMATION); - } - - UrbSize += sizeof(URB) + sizeof(USBD_INTERFACE_INFORMATION); - + while(InterfaceList[InterfaceCount].InterfaceDescriptor) + { + // pipe count + PipeCount += InterfaceList[InterfaceCount].InterfaceDescriptor->bNumEndpoints; + + // interface count + InterfaceCount++; + } + + // size of urb + UrbSize = GET_SELECT_CONFIGURATION_REQUEST_SIZE(InterfaceCount, PipeCount); + + // allocate urb Urb = ExAllocatePool(NonPagedPool, UrbSize); + if (!Urb) + { + // no memory + return NULL; + } + + // zero urb RtlZeroMemory(Urb, UrbSize); + + // init urb header Urb->UrbSelectConfiguration.Hdr.Function = URB_FUNCTION_SELECT_CONFIGURATION; - Urb->UrbSelectConfiguration.Hdr.Length = sizeof(Urb->UrbSelectConfiguration); + Urb->UrbSelectConfiguration.Hdr.Length = UrbSize; Urb->UrbSelectConfiguration.ConfigurationDescriptor = ConfigurationDescriptor; + // init interface information InterfaceInfo = &Urb->UrbSelectConfiguration.Interface; for (InterfaceNumber = 0; InterfaceNumber < InterfaceCount; InterfaceNumber++) { + // init interface info InterfaceList[InterfaceNumber].Interface = InterfaceInfo; - InterfaceInfo->Length = sizeof(USBD_INTERFACE_INFORMATION) + - ((InterfaceList[InterfaceNumber].InterfaceDescriptor->bNumEndpoints - 1) * sizeof(USBD_PIPE_INFORMATION)); InterfaceInfo->InterfaceNumber = InterfaceList[InterfaceNumber].InterfaceDescriptor->bInterfaceNumber; InterfaceInfo->AlternateSetting = InterfaceList[InterfaceNumber].InterfaceDescriptor->bAlternateSetting; InterfaceInfo->NumberOfPipes = InterfaceList[InterfaceNumber].InterfaceDescriptor->bNumEndpoints; + + // store length + InterfaceInfo->Length = GET_USBD_INTERFACE_SIZE(InterfaceList[InterfaceNumber].InterfaceDescriptor->bNumEndpoints); + + // sanity check + //C_ASSERT(FIELD_OFFSET(USBD_INTERFACE_INFORMATION, Pipes) == 16); + for (EndPointNumber = 0; EndPointNumber < InterfaceInfo->NumberOfPipes; EndPointNumber++) { + // init max transfer size InterfaceInfo->Pipes[EndPointNumber].MaximumTransferSize = PAGE_SIZE; } + + // next interface info InterfaceInfo = (PUSBD_INTERFACE_INFORMATION) ((ULONG_PTR)InterfaceInfo + InterfaceInfo->Length); }

1 0

[janderwald] 55964: [USBHUB] - Handle retrieving string descriptors failure
by janderwald＠svn.reactos.org 03 Mar '12

03 Mar '12

Author: janderwald Date: Sat Mar 3 11:38:37 2012 New Revision: 55964 URL: http://svn.reactos.org/svn/reactos?rev=55964&view=rev Log: [USBHUB] - Handle retrieving string descriptors failure Modified: trunk/reactos/drivers/usb/usbhub/fdo.c trunk/reactos/drivers/usb/usbhub/pdo.c Modified: trunk/reactos/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/fdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] Sat Mar 3 11:38:37 2012 @@ -997,7 +997,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("USBHUB: GetUsbStringDescriptor failed with status %x\n", Status); - RtlInitUnicodeString(&UsbChildExtension->usTextDescription, L""); + RtlInitUnicodeString(&UsbChildExtension->usTextDescription, L"USB Device"); // FIXME NON-NLS } else { @@ -1048,7 +1048,7 @@ DPRINT("usDeviceId %wZ\n", &UsbChildExtension->usInstanceId); } - return Status; + return STATUS_SUCCESS; } NTSTATUS Modified: trunk/reactos/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/pdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] Sat Mar 3 11:38:37 2012 @@ -533,8 +533,8 @@ if (SourceString) { - ReturnString = ExAllocatePool(PagedPool, SourceString->Length); - RtlCopyMemory(ReturnString, SourceString->Buffer, SourceString->Length); + ReturnString = ExAllocatePool(PagedPool, SourceString->MaximumLength); + RtlCopyMemory(ReturnString, SourceString->Buffer, SourceString->MaximumLength); DPRINT1("%S\n", ReturnString); *Information = (ULONG_PTR)ReturnString; }

1 0

[cgutman] 55963: - Enable debugging for testbot
by cgutman＠svn.reactos.org 02 Mar '12

02 Mar '12

Author: cgutman Date: Fri Mar 2 20:49:53 2012 New Revision: 55963 URL: http://svn.reactos.org/svn/reactos?rev=55963&view=rev Log: - Enable debugging for testbot Modified: trunk/reactos/base/setup/usetup/filequeue.c Modified: trunk/reactos/base/setup/usetup/filequeue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/filequeu… ============================================================================== --- trunk/reactos/base/setup/usetup/filequeue.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/filequeue.c [iso-8859-1] Fri Mar 2 20:49:53 2012 @@ -382,7 +382,7 @@ } /* FIXME: Do it! */ - DPRINT("'%S' ==> '%S'\n", + DPRINT1("'%S' ==> '%S'\n", FileSrcPath, FileDstPath);

1 0

[janderwald] 55962: [NDK] - Add missing definitions
by janderwald＠svn.reactos.org 02 Mar '12

02 Mar '12

Author: janderwald Date: Fri Mar 2 20:08:51 2012 New Revision: 55962 URL: http://svn.reactos.org/svn/reactos?rev=55962&view=rev Log: [NDK] - Add missing definitions Modified: trunk/reactos/include/ndk/cmtypes.h Modified: trunk/reactos/include/ndk/cmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/cmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/cmtypes.h [iso-8859-1] Fri Mar 2 20:08:51 2012 @@ -171,12 +171,30 @@ // typedef enum _PLUGPLAY_CONTROL_CLASS { - PlugPlayControlUserResponse = 0x07, - PlugPlayControlProperty = 0x0A, - PlugPlayControlGetRelatedDevice = 0x0C, - PlugPlayControlDeviceStatus = 0x0E, + PlugPlayControlEnumerateDevice, + PlugPlayControlRegisterNewDevice, + PlugPlayControlDeregisterDevice, + PlugPlayControlInitializeDevice, + PlugPlayControlStartDevice, + PlugPlayControlUnlockDevice, + PlugPlayControlQueryAndRemoveDevice, + PlugPlayControlUserResponse, + PlugPlayControlGenerateLegacyDevice, + PlugPlayControlGetInterfaceDeviceList, + PlugPlayControlProperty, + PlugPlayControlDeviceClassAssociation, + PlugPlayControlGetRelatedDevice, + PlugPlayControlGetInterfaceDeviceAlias, + PlugPlayControlDeviceStatus, PlugPlayControlGetDeviceDepth, - PlugPlayControlResetDevice = 0x14 + PlugPlayControlQueryDeviceRelations, + PlugPlayControlTargetDeviceRelation, + PlugPlayControlQueryConflictList, + PlugPlayControlRetrieveDock, + PlugPlayControlResetDevice, + PlugPlayControlHaltDevice, + PlugPlayControlGetBlockedDriverList, + MaxPlugPlayControl } PLUGPLAY_CONTROL_CLASS; typedef enum _PLUGPLAY_BUS_CLASS

1 0

[janderwald] 55961: [USBUHCI] - Load USBUHCI during 1st stage setup
by janderwald＠svn.reactos.org 02 Mar '12

02 Mar '12

Author: janderwald Date: Fri Mar 2 18:30:46 2012 New Revision: 55961 URL: http://svn.reactos.org/svn/reactos?rev=55961&view=rev Log: [USBUHCI] - Load USBUHCI during 1st stage setup Modified: trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Fri Mar 2 18:30:46 2012 @@ -94,7 +94,7 @@ [InputDevicesSupport.Load] usbehci = usbehci.sys usbohci = usbohci.sys -;usbuhci = usbuhci.sys +usbuhci = usbuhci.sys usbhub = usbhub.sys usbccgp = usbccgp.sys hidusb = hidusb.sys

1 0

[janderwald] 55960: [USBEHCI] - Check if allocation of queue heads failed - Implement removing of completed queue head
by janderwald＠svn.reactos.org 02 Mar '12

02 Mar '12

Author: janderwald Date: Fri Mar 2 18:26:08 2012 New Revision: 55960 URL: http://svn.reactos.org/svn/reactos?rev=55960&view=rev Log: [USBEHCI] - Check if allocation of queue heads failed - Implement removing of completed queue head Modified: trunk/reactos/drivers/usb/usbehci/usb_queue.cpp Modified: trunk/reactos/drivers/usb/usbehci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_qu… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] Fri Mar 2 18:26:08 2012 @@ -71,6 +71,9 @@ // called for each completed queue head VOID QueueHeadCompletion(PQUEUE_HEAD QueueHead, NTSTATUS Status); + // called for each completed queue head + VOID QueueHeadInterruptCompletion(PQUEUE_HEAD QueueHead, NTSTATUS Status); + // called when the completion queue is cleaned up VOID QueueHeadCleanup(PQUEUE_HEAD QueueHead); @@ -80,10 +83,15 @@ // links interrupt queue head VOID LinkInterruptQueueHead(PQUEUE_HEAD QueueHead); + // interval index + UCHAR GetIntervalIndex(UCHAR Interval); + + // interrupt queue heads PQUEUE_HEAD m_InterruptQueueHeads[EHCI_INTERRUPT_ENTRIES_COUNT]; - + // contains the periodic queue heads + LIST_ENTRY m_PeriodicQueueHeads; }; //================================================================================================= @@ -151,6 +159,11 @@ InitializeListHead(&m_PendingRequestAsyncList); // + // initialize periodic queue heads + // + InitializeListHead(&m_PeriodicQueueHeads); + + // // now initialize sync schedule // Status = InitializeSyncSchedule(m_Hardware, MemManager); @@ -198,6 +211,14 @@ // allocate queue head // Status = MemManager->Allocate(sizeof(QUEUE_HEAD), (PVOID*)&QueueHead, &QueueHeadPhysAddr); + if (!NT_SUCCESS(Status)) + { + // + // failed to create queue head + // + DPRINT1("Failed to create queue head\n"); + return Status; + } // // initialize queue head @@ -347,46 +368,11 @@ return Status; } -VOID -CUSBQueue::LinkInterruptQueueHead( - PQUEUE_HEAD QueueHead) -{ - PEHCIREQUEST Request; - UCHAR Interval, IntervalIndex; - USB_DEVICE_SPEED DeviceSpeed; - PQUEUE_HEAD InterruptQueueHead; - - // get internal req - Request = PEHCIREQUEST(QueueHead->Request); - ASSERT(Request); - - // get interval - Interval = Request->GetInterval(); - - // get device speed - DeviceSpeed = Request->GetSpeed(); - if (DeviceSpeed == UsbHighSpeed) - { - // interrupt queue head can be scheduled on each possible micro frame - QueueHead->EndPointCapabilities.InterruptScheduleMask = 0xFF; - } - else - { - // As we do not yet support FSTNs to correctly reference low/full - // speed interrupt transfers, we simply put them into the 1 interval - // queue. This way we ensure that we reach them on every micro frame - // and can do the corresponding start/complete split transactions. - // ToDo: use FSTNs to correctly link non high speed interrupt transfers - Interval = 1; - - // For now we also force start splits to be in micro frame 0 and - // complete splits to be in micro frame 2, 3 and 4. - QueueHead->EndPointCapabilities.InterruptScheduleMask = 0x01; - QueueHead->EndPointCapabilities.SplitCompletionMask = 0x1C; - } - - // sanitize interrupt interval - Interval = max(1, Interval); +UCHAR +CUSBQueue::GetIntervalIndex( + UCHAR Interval) +{ + UCHAR IntervalIndex; if (Interval == 1) IntervalIndex = 1; @@ -409,6 +395,54 @@ else IntervalIndex = 10; + return IntervalIndex; +} + +VOID +CUSBQueue::LinkInterruptQueueHead( + PQUEUE_HEAD QueueHead) +{ + PEHCIREQUEST Request; + UCHAR Interval, IntervalIndex; + USB_DEVICE_SPEED DeviceSpeed; + PQUEUE_HEAD InterruptQueueHead; + + // get internal req + Request = PEHCIREQUEST(QueueHead->Request); + ASSERT(Request); + + // get interval + Interval = Request->GetInterval(); + + // get device speed + DeviceSpeed = Request->GetSpeed(); + if (DeviceSpeed == UsbHighSpeed) + { + // interrupt queue head can be scheduled on each possible micro frame + QueueHead->EndPointCapabilities.InterruptScheduleMask = 0xFF; + } + else + { + // As we do not yet support FSTNs to correctly reference low/full + // speed interrupt transfers, we simply put them into the 1 interval + // queue. This way we ensure that we reach them on every micro frame + // and can do the corresponding start/complete split transactions. + // ToDo: use FSTNs to correctly link non high speed interrupt transfers + Interval = 1; + + // For now we also force start splits to be in micro frame 0 and + // complete splits to be in micro frame 2, 3 and 4. + QueueHead->EndPointCapabilities.InterruptScheduleMask = 0x01; + QueueHead->EndPointCapabilities.SplitCompletionMask = 0x1C; + } + + // sanitize interrupt interval + Interval = max(1, Interval); + + // get interval index + IntervalIndex = GetIntervalIndex(Interval); + + // get interrupt queue head InterruptQueueHead = m_InterruptQueueHeads[IntervalIndex]; @@ -418,6 +452,9 @@ InterruptQueueHead->HorizontalLinkPointer = QueueHead->PhysicalAddr | QH_TYPE_QH; InterruptQueueHead->NextQueueHead = QueueHead; + + // store in periodic list + InsertTailList(&m_PeriodicQueueHeads, &QueueHead->LinkedQueueHeads); } // @@ -595,6 +632,67 @@ } VOID +CUSBQueue::QueueHeadInterruptCompletion( + PQUEUE_HEAD QueueHead, + NTSTATUS Status) +{ + PEHCIREQUEST Request; + UCHAR Interval, IntervalIndex; + PQUEUE_HEAD InterruptQueueHead, LastQueueHead = NULL; + + + // + // sanity check + // + PC_ASSERT(QueueHead->Request); + + // + // get IUSBRequest interface + // + Request = (PEHCIREQUEST)QueueHead->Request; + + // get interval + Interval = Request->GetInterval(); + + // sanitize interval + Interval = max(1, Interval); + + // get interval index + IntervalIndex = GetIntervalIndex(Interval); + + // get interrupt queue head from index + InterruptQueueHead = m_InterruptQueueHeads[IntervalIndex]; + + while(InterruptQueueHead != NULL) + { + if (InterruptQueueHead == QueueHead) + break; + + // move to next queue head + LastQueueHead = InterruptQueueHead; + InterruptQueueHead = (PQUEUE_HEAD)InterruptQueueHead->NextQueueHead; + } + + if (InterruptQueueHead != QueueHead) + { + // queue head not in list + ASSERT(FALSE); + return; + } + + // now unlink queue head + LastQueueHead->HorizontalLinkPointer = QueueHead->HorizontalLinkPointer; + LastQueueHead->NextQueueHead = QueueHead->NextQueueHead; + + DPRINT1("Periodic QueueHead %p Addr $x unlinked\n", QueueHead, QueueHead->PhysicalAddr); + + // insert into completed list + InsertTailList(&m_CompletedRequestAsyncList, &QueueHead->LinkedQueueHeads); +} + + + +VOID CUSBQueue::QueueHeadCompletion( PQUEUE_HEAD CurrentQH, NTSTATUS Status) @@ -619,15 +717,6 @@ VOID CUSBQueue::ProcessPeriodicSchedule( - IN NTSTATUS Status, - OUT PULONG ShouldRingDoorBell) -{ - - -} - -VOID -CUSBQueue::ProcessAsyncList( IN NTSTATUS Status, OUT PULONG ShouldRingDoorBell) { @@ -646,6 +735,82 @@ // walk async list // ASSERT(AsyncListQueueHead); + Entry = m_PeriodicQueueHeads.Flink; + + while(Entry != &m_PeriodicQueueHeads) + { + // + // get queue head structure + // + QueueHead = (PQUEUE_HEAD)CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); + ASSERT(QueueHead); + + // + // sanity check + // + PC_ASSERT(QueueHead->Request); + + // + // get IUSBRequest interface + // + Request = (PEHCIREQUEST)QueueHead->Request; + + // + // move to next entry + // + Entry = Entry->Flink; + + // + // check if queue head is complete + // + IsQueueHeadComplete = Request->IsQueueHeadComplete(QueueHead); + + DPRINT("Request %p QueueHead %p Complete %d\n", Request, QueueHead, IsQueueHeadComplete); + + // + // check if queue head is complete + // + if (IsQueueHeadComplete) + { + // + // current queue head is complete + // + QueueHeadInterruptCompletion(QueueHead, Status); + + // + // ring door bell is going to be necessary + // + *ShouldRingDoorBell = TRUE; + } + } + + // + // release lock + // + KeReleaseSpinLock(m_Lock, OldLevel); + +} + +VOID +CUSBQueue::ProcessAsyncList( + IN NTSTATUS Status, + OUT PULONG ShouldRingDoorBell) +{ + KIRQL OldLevel; + PLIST_ENTRY Entry; + PQUEUE_HEAD QueueHead; + PEHCIREQUEST Request; + BOOLEAN IsQueueHeadComplete; + + // + // lock completed async list + // + KeAcquireSpinLock(m_Lock, &OldLevel); + + // + // walk async list + // + ASSERT(AsyncListQueueHead); Entry = AsyncListQueueHead->LinkedQueueHeads.Flink; while(Entry != &AsyncListQueueHead->LinkedQueueHeads)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2012