Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 58277: Fix Japanese translation
by hbelusca＠svn.reactos.org 02 Feb '13

02 Feb '13

Author: hbelusca Date: Sat Feb 2 22:42:05 2013 New Revision: 58277 URL: http://svn.reactos.org/svn/reactos?rev=58277&view=rev Log: Fix Japanese translation Modified: branches/ros-csrss/win32ss/user/consrv/lang/ja-JP.rc Modified: branches/ros-csrss/win32ss/user/consrv/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lang/ja-JP.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lang/ja-JP.rc [iso-8859-1] Sat Feb 2 22:42:05 2013 @@ -5,7 +5,7 @@ IDS_EDIT "ç·¨é" IDS_MARK "ç¯å²æå®" IDS_COPY "ã³ãã¼\tEnter" - IDS_PASTE "è²¼\ãä»ã" + IDS_PASTE "è²¼ãä»ã" IDS_SELECTALL "ãã¹ã¦é¸æ" IDS_SCROLL "ã¹ã¯ãã¼ã«" IDS_FIND "æ¤ç´¢..."

1 0

[tkreuzer] 58276: [MKHIVE] Fix build, but remove support for architecture specific inf sections. This means livecd cannot have those until someone implements this. I give up...
by tkreuzer＠svn.reactos.org 02 Feb '13

02 Feb '13

Author: tkreuzer Date: Sat Feb 2 22:36:31 2013 New Revision: 58276 URL: http://svn.reactos.org/svn/reactos?rev=58276&view=rev Log: [MKHIVE] Fix build, but remove support for architecture specific inf sections. This means livecd cannot have those until someone implements this. I give up... Modified: trunk/reactos/tools/mkhive/reginf.c Modified: trunk/reactos/tools/mkhive/reginf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/reginf.c?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] Sat Feb 2 22:36:31 2013 @@ -47,17 +47,6 @@ #define FLG_ADDREG_TYPE_NONE (0x00020000 | FLG_ADDREG_BINVALUETYPE) #define FLG_ADDREG_TYPE_MASK (0xFFFF0000 | FLG_ADDREG_BINVALUETYPE) -#if defined(_M_IX86) || defined(__i386__) -static const WCHAR Architecture[] = {'x','8','6',0}; -#elif defined(_M_AMD64) || defined(__x86_64__) -static const WCHAR Architecture[] = {'a','m','d','6','4'0}; -#elif defined(_M_IA64) -static const WCHAR Architecture[] = {'i','a','6','4',0}; -#elif defined(_M_ARM) -static const WCHAR Architecture[] = {'a','r','m',0}; -#elif defined(_M_PPC) -static const WCHAR Architecture[] = {'p','p','c',0}; -#endif static const WCHAR HKCR[] = {'H','K','C','R',0}; static const WCHAR HKCU[] = {'H','K','C','U',0}; @@ -492,7 +481,6 @@ { HINF hInf; ULONG ErrorLine; - WCHAR SectionName[40]; /* Load inf file from install media. */ if (InfHostOpenFile(&hInf, FileName, 0, &ErrorLine) != 0) @@ -506,23 +494,9 @@ DPRINT1 ("registry_callback() for DelReg failed\n"); } - wcsncpy(SectionName, DelReg, sizeof(SectionName) / sizeof(WCHAR)); - wcsncat(SectionName, Architecture, sizeof(SectionName) / sizeof(WCHAR)); - if (!registry_callback (hInf, SectionName, TRUE)) - { - DPRINT1 ("registry_callback() for DelReg.NT* failed\n"); - } - if (!registry_callback (hInf, (PWCHAR)AddReg, FALSE)) { DPRINT1 ("registry_callback() for AddReg failed\n"); - } - - wcsncpy(SectionName, AddReg, sizeof(SectionName) / sizeof(WCHAR)); - wcsncat(SectionName, Architecture, sizeof(SectionName) / sizeof(WCHAR)); - if (!registry_callback (hInf, SectionName, FALSE)) - { - DPRINT1 ("registry_callback() for AddReg.NT* failed\n"); } InfHostCloseFile (hInf);

1 0

[hbelusca] 58275: [CONSOLE.CPL] Convert language resource files to UTF-8
by hbelusca＠svn.reactos.org 02 Feb '13

02 Feb '13

Author: hbelusca Date: Sat Feb 2 22:31:27 2013 New Revision: 58275 URL: http://svn.reactos.org/svn/reactos?rev=58275&view=rev Log: [CONSOLE.CPL] Convert language resource files to UTF-8 Modified: branches/ros-csrss/dll/cpl/console/lang/bg-BG.rc branches/ros-csrss/dll/cpl/console/lang/cs-CZ.rc branches/ros-csrss/dll/cpl/console/lang/de-DE.rc branches/ros-csrss/dll/cpl/console/lang/en-US.rc (contents, props changed) branches/ros-csrss/dll/cpl/console/lang/es-ES.rc branches/ros-csrss/dll/cpl/console/lang/he-IL.rc branches/ros-csrss/dll/cpl/console/lang/id-ID.rc branches/ros-csrss/dll/cpl/console/lang/it-IT.rc branches/ros-csrss/dll/cpl/console/lang/no-NO.rc branches/ros-csrss/dll/cpl/console/lang/pl-PL.rc branches/ros-csrss/dll/cpl/console/lang/ru-RU.rc branches/ros-csrss/dll/cpl/console/lang/sk-SK.rc branches/ros-csrss/dll/cpl/console/lang/zh-CN.rc branches/ros-csrss/dll/cpl/console/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/dll/cpl/console/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/rsrc.…

1 0

[tkreuzer] 58274: [MKHIVE] 2nd try to fix *nix build
by tkreuzer＠svn.reactos.org 02 Feb '13

02 Feb '13

Author: tkreuzer Date: Sat Feb 2 22:08:53 2013 New Revision: 58274 URL: http://svn.reactos.org/svn/reactos?rev=58274&view=rev Log: [MKHIVE] 2nd try to fix *nix build Modified: trunk/reactos/tools/mkhive/reginf.c Modified: trunk/reactos/tools/mkhive/reginf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/reginf.c?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] Sat Feb 2 22:08:53 2013 @@ -47,9 +47,9 @@ #define FLG_ADDREG_TYPE_NONE (0x00020000 | FLG_ADDREG_BINVALUETYPE) #define FLG_ADDREG_TYPE_MASK (0xFFFF0000 | FLG_ADDREG_BINVALUETYPE) -#ifdef _M_IX86 +#if defined(_M_IX86) || defined(__i386__) static const WCHAR Architecture[] = {'x','8','6',0}; -#elif defined(_M_AMD64) +#elif defined(_M_AMD64) || defined(__x86_64__) static const WCHAR Architecture[] = {'a','m','d','6','4'0}; #elif defined(_M_IA64) static const WCHAR Architecture[] = {'i','a','6','4',0};

1 0

[hbelusca] 58273: [CONSRV] Convert language resource files into UTF-8
by hbelusca＠svn.reactos.org 02 Feb '13

02 Feb '13

Author: hbelusca Date: Sat Feb 2 22:08:18 2013 New Revision: 58273 URL: http://svn.reactos.org/svn/reactos?rev=58273&view=rev Log: [CONSRV] Convert language resource files into UTF-8 Modified: branches/ros-csrss/win32ss/user/consrv/consrv.rc branches/ros-csrss/win32ss/user/consrv/lang/bg-BG.rc branches/ros-csrss/win32ss/user/consrv/lang/cs-CZ.rc branches/ros-csrss/win32ss/user/consrv/lang/de-DE.rc branches/ros-csrss/win32ss/user/consrv/lang/el-GR.rc branches/ros-csrss/win32ss/user/consrv/lang/en-US.rc branches/ros-csrss/win32ss/user/consrv/lang/es-ES.rc branches/ros-csrss/win32ss/user/consrv/lang/fr-FR.rc branches/ros-csrss/win32ss/user/consrv/lang/id-ID.rc branches/ros-csrss/win32ss/user/consrv/lang/it-IT.rc branches/ros-csrss/win32ss/user/consrv/lang/ja-JP.rc branches/ros-csrss/win32ss/user/consrv/lang/no-NO.rc branches/ros-csrss/win32ss/user/consrv/lang/pl-PL.rc branches/ros-csrss/win32ss/user/consrv/lang/pt-BR.rc branches/ros-csrss/win32ss/user/consrv/lang/ro-RO.rc branches/ros-csrss/win32ss/user/consrv/lang/ru-RU.rc branches/ros-csrss/win32ss/user/consrv/lang/sk-SK.rc branches/ros-csrss/win32ss/user/consrv/lang/sv-SE.rc branches/ros-csrss/win32ss/user/consrv/lang/tr-TR.rc branches/ros-csrss/win32ss/user/consrv/lang/uk-UA.rc branches/ros-csrss/win32ss/user/consrv/lang/zh-CN.rc branches/ros-csrss/win32ss/user/consrv/lang/zh-TW.rc branches/ros-csrss/win32ss/user/consrv/resource.h branches/ros-csrss/win32ss/user/consrv/rsrc.rc Modified: branches/ros-csrss/win32ss/user/consrv/consrv.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/consrv.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/consrv.rc [iso-8859-1] Sat Feb 2 22:08:18 2013 @@ -10,6 +10,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "consrv.dll" #include <reactos/version.rc> -1 ICON DISCARDABLE "res/terminal.ico" +IDI_CONSOLE ICON DISCARDABLE "res/terminal.ico" #include "rsrc.rc" Modified: branches/ros-csrss/win32ss/user/consrv/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lang/bg-BG.rc [iso-8859-1] Sat Feb 2 22:08:18 2013 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS CSRSS subsystem - * FILE: subsystems/win32/csrss/win32csr/lang/bg-BG.rc + * FILE: win32ss/user/consrv/lang/bg-BG.rc * PURPOSE: Bulgarian resource file */ @@ -8,22 +8,22 @@ STRINGTABLE BEGIN - IDS_EDIT "Îáðàáîòêà" - IDS_MARK "Îòáåëÿçâàíå" - IDS_COPY "Çàïîìíÿíå\tEnter" - IDS_PASTE "Ïîñòàâÿíå" - IDS_SELECTALL "Èçáîð íà âñè÷êî" - IDS_SCROLL "Ïðåëèñòâàíå" - IDS_FIND "Òúðñåíå..." - IDS_DEFAULTS "Ïîäðàçáèðàíè" - IDS_PROPERTIES "Ñâîéñòâà" - IDS_SCROLLHERE "Ïðåëèñòâàíå òóê" - IDS_SCROLLTOP "Ïðåëèñòâàíå äî ãîðå" - IDS_SCROLLBOTTOM "Ïðåëèñòâàíå äî äîëó" - IDS_SCROLLPAGE_UP "Ãîðíà ñòðàíèöà" - IDS_SCROLLPAGE_DOWN "Äîëíà ñòðàíèöà" - IDS_SCROLLUP "Ïðåëèñòâàíå íàãîðå" - IDS_SCROLLDOWN "Ïðåëèñòâàíå íàäîëó" + IDS_EDIT "ÐÐ±ÑÐ°Ð±Ð¾ÑÐºÐ°" + IDS_MARK "ÐÑÐ±ÐµÐ»ÑÐ·Ð²Ð°Ð½Ðµ" + IDS_COPY "ÐÐ°Ð¿Ð¾Ð¼Ð½ÑÐ½Ðµ\tEnter" + IDS_PASTE "ÐÐ¾ÑÑÐ°Ð²ÑÐ½Ðµ" + IDS_SELECTALL "ÐÐ·Ð±Ð¾Ñ Ð½Ð° Ð²ÑÐ¸ÑÐºÐ¾" + IDS_SCROLL "ÐÑÐµÐ»Ð¸ÑÑÐ²Ð°Ð½Ðµ" + IDS_FIND "Ð¢ÑÑÑÐµÐ½Ðµ..." + IDS_DEFAULTS "ÐÐ¾Ð´ÑÐ°Ð·Ð±Ð¸ÑÐ°Ð½Ð¸" + IDS_PROPERTIES "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°" + IDS_SCROLLHERE "ÐÑÐµÐ»Ð¸ÑÑÐ²Ð°Ð½Ðµ ÑÑÐº" + IDS_SCROLLTOP "ÐÑÐµÐ»Ð¸ÑÑÐ²Ð°Ð½Ðµ Ð´Ð¾ Ð³Ð¾ÑÐµ" + IDS_SCROLLBOTTOM "ÐÑÐµÐ»Ð¸ÑÑÐ²Ð°Ð½Ðµ Ð´Ð¾ Ð´Ð¾Ð»Ñ" + IDS_SCROLLPAGE_UP "ÐÐ¾ÑÐ½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°" + IDS_SCROLLPAGE_DOWN "ÐÐ¾Ð»Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°" + IDS_SCROLLUP "ÐÑÐµÐ»Ð¸ÑÑÐ²Ð°Ð½Ðµ Ð½Ð°Ð³Ð¾ÑÐµ" + IDS_SCROLLDOWN "ÐÑÐµÐ»Ð¸ÑÑÐ²Ð°Ð½Ðµ Ð½Ð°Ð´Ð¾Ð»Ñ" - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_CONSOLE_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lang/cs-CZ.rc [iso-8859-1] Sat Feb 2 22:08:18 2013 @@ -1,4 +1,5 @@ -/* FILE: subsystems/win32/csrss/win32csr/lang/cs-CZ.rc +/* + * FILE: win32ss/user/consrv/lang/cs-CZ.rc * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) * UPDATED: 2011-04-09 */ @@ -7,22 +8,22 @@ STRINGTABLE BEGIN - IDS_EDIT "Upravit" - IDS_MARK "Oznaèit" - IDS_COPY "Kopírovat\tEnter" - IDS_PASTE "Vloit" - IDS_SELECTALL "Oznaèit ve" - IDS_SCROLL "Posunout" - IDS_FIND "Najít..." - IDS_DEFAULTS "Výchozí" - IDS_PROPERTIES "Vlastnosti" - IDS_SCROLLHERE "Posunout sem" - IDS_SCROLLTOP "Posunout na zaèátek" - IDS_SCROLLBOTTOM "Posunout na konec" - IDS_SCROLLPAGE_UP "O stránku výe" - IDS_SCROLLPAGE_DOWN "O stránku níe" - IDS_SCROLLUP "Posunout nahoru" - IDS_SCROLLDOWN "Posunout dolù" + IDS_EDIT "Upravit" + IDS_MARK "OznaÄit" + IDS_COPY "KopÃrovat\tEnter" + IDS_PASTE "VloÅ¾it" + IDS_SELECTALL "OznaÄit vÅ¡e" + IDS_SCROLL "Posunout" + IDS_FIND "NajÃt..." + IDS_DEFAULTS "VÃ½chozÃ" + IDS_PROPERTIES "Vlastnosti" + IDS_SCROLLHERE "Posunout sem" + IDS_SCROLLTOP "Posunout na zaÄÃ¡tek" + IDS_SCROLLBOTTOM "Posunout na konec" + IDS_SCROLLPAGE_UP "O strÃ¡nku vÃ½Å¡e" + IDS_SCROLLPAGE_DOWN "O strÃ¡nku nÃÅ¾e" + IDS_SCROLLUP "Posunout nahoru" + IDS_SCROLLDOWN "Posunout dolÅ¯" - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_CONSOLE_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lang/de-DE.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lang/de-DE.rc [iso-8859-1] Sat Feb 2 22:08:18 2013 @@ -2,22 +2,22 @@ STRINGTABLE BEGIN - IDS_EDIT "Bearbeiten" - IDS_MARK "Markieren" - IDS_COPY "Kopieren\tEnter" - IDS_PASTE "Einfügen" - IDS_SELECTALL "Alles auswählen" - IDS_SCROLL "Scrollen" - IDS_FIND "Suchen..." - IDS_DEFAULTS "Standardwerte" - IDS_PROPERTIES "Eigenschaften" - IDS_SCROLLHERE "Hier scrollen" - IDS_SCROLLTOP "Ganz nach oben scrollen" - IDS_SCROLLBOTTOM "Ganz nach unten scrollen" - IDS_SCROLLPAGE_UP "Seite nach oben" - IDS_SCROLLPAGE_DOWN "Seite nach unten" - IDS_SCROLLUP "Nach oben scrollen" - IDS_SCROLLDOWN "Nach unten scrollen" + IDS_EDIT "Bearbeiten" + IDS_MARK "Markieren" + IDS_COPY "Kopieren\tEnter" + IDS_PASTE "EinfÃ¼gen" + IDS_SELECTALL "Alles auswÃ¤hlen" + IDS_SCROLL "Scrollen" + IDS_FIND "Suchen..." + IDS_DEFAULTS "Standardwerte" + IDS_PROPERTIES "Eigenschaften" + IDS_SCROLLHERE "Hier scrollen" + IDS_SCROLLTOP "Ganz nach oben scrollen" + IDS_SCROLLBOTTOM "Ganz nach unten scrollen" + IDS_SCROLLPAGE_UP "Seite nach oben" + IDS_SCROLLPAGE_DOWN "Seite nach unten" + IDS_SCROLLUP "Nach oben scrollen" + IDS_SCROLLDOWN "Nach unten scrollen" - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_CONSOLE_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lang/el-GR.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lang/el-GR.rc [iso-8859-1] Sat Feb 2 22:08:18 2013 @@ -2,22 +2,22 @@ STRINGTABLE BEGIN - IDS_EDIT "Åðåîåñãáóßá" - IDS_MARK "ÌáñêÜñéóìá" - IDS_COPY "ÁíôéãñáöÞ\tEnter" - IDS_PASTE "Åðéêüëëçóç" - IDS_SELECTALL "ÅðéëïãÞ üëùí" - IDS_SCROLL "Êýëéóç" - IDS_FIND "Åýñåóç..." - IDS_DEFAULTS "ÐñïåðéëïãÞ" - IDS_PROPERTIES "Éäéüôçôåò" - IDS_SCROLLHERE "Êýëéóç åäþ" - IDS_SCROLLTOP "Áñ÷Þ" - IDS_SCROLLBOTTOM "ÔÝëïò" - IDS_SCROLLPAGE_UP "Ðñïçãïýìåíç óåëßäá" - IDS_SCROLLPAGE_DOWN "Åðüìåíç óåëßäá" - IDS_SCROLLUP "Êýëéóç ðÜíù" - IDS_SCROLLDOWN "Êýëéóç êÜôù" + IDS_EDIT "ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±" + IDS_MARK "ÎÎ±ÏÎºÎ¬ÏÎ¹ÏÎ¼Î±" + IDS_COPY "ÎÎ½ÏÎ¹Î³ÏÎ±ÏÎ®\tEnter" + IDS_PASTE "ÎÏÎ¹ÎºÏÎ»Î»Î·ÏÎ·" + IDS_SELECTALL "ÎÏÎ¹Î»Î¿Î³Î® ÏÎ»ÏÎ½" + IDS_SCROLL "ÎÏÎ»Î¹ÏÎ·" + IDS_FIND "ÎÏÏÎµÏÎ·..." + IDS_DEFAULTS "Î ÏÎ¿ÎµÏÎ¹Î»Î¿Î³Î®" + IDS_PROPERTIES "ÎÎ´Î¹ÏÏÎ·ÏÎµÏ" + IDS_SCROLLHERE "ÎÏÎ»Î¹ÏÎ· ÎµÎ´Ï" + IDS_SCROLLTOP "ÎÏÏÎ®" + IDS_SCROLLBOTTOM "Î¤ÎÎ»Î¿Ï" + IDS_SCROLLPAGE_UP "Î ÏÎ¿Î·Î³Î¿ÏÎ¼ÎµÎ½Î· ÏÎµÎ»Î¯Î´Î±" + IDS_SCROLLPAGE_DOWN "ÎÏÏÎ¼ÎµÎ½Î· ÏÎµÎ»Î¯Î´Î±" + IDS_SCROLLUP "ÎÏÎ»Î¹ÏÎ· ÏÎ¬Î½Ï" + IDS_SCROLLDOWN "ÎÏÎ»Î¹ÏÎ· ÎºÎ¬ÏÏ" - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_CONSOLE_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lang/en-US.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lang/en-US.rc [iso-8859-1] Sat Feb 2 22:08:18 2013 @@ -2,22 +2,22 @@ STRINGTABLE BEGIN - IDS_EDIT "Edit" - IDS_MARK "Mark" - IDS_COPY "Copy\tEnter" - IDS_PASTE "Paste" - IDS_SELECTALL "Select All" - IDS_SCROLL "Scroll" - IDS_FIND "Find..." - IDS_DEFAULTS "Defaults" - IDS_PROPERTIES "Properties" - IDS_SCROLLHERE "Scroll here" - IDS_SCROLLTOP "Scroll top" - IDS_SCROLLBOTTOM "Scroll bottom" - IDS_SCROLLPAGE_UP "Page up" - IDS_SCROLLPAGE_DOWN "Page down" - IDS_SCROLLUP "Scroll up" - IDS_SCROLLDOWN "Scroll down" + IDS_EDIT "Edit" + IDS_MARK "Mark" + IDS_COPY "Copy\tEnter" + IDS_PASTE "Paste" + IDS_SELECTALL "Select All" + IDS_SCROLL "Scroll" + IDS_FIND "Find..." + IDS_DEFAULTS "Defaults" + IDS_PROPERTIES "Properties" + IDS_SCROLLHERE "Scroll here" + IDS_SCROLLTOP "Scroll top" + IDS_SCROLLBOTTOM "Scroll bottom" + IDS_SCROLLPAGE_UP "Page up" + IDS_SCROLLPAGE_DOWN "Page down" + IDS_SCROLLUP "Scroll up" + IDS_SCROLLDOWN "Scroll down" - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_CONSOLE_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lang/es-ES.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lang/es-ES.rc [iso-8859-1] Sat Feb 2 22:08:18 2013 @@ -7,22 +7,22 @@ STRINGTABLE BEGIN - IDS_EDIT "Editar" - IDS_MARK "Marcar" - IDS_COPY "Copiar\tIntroducir" - IDS_PASTE "Pegar" - IDS_SELECTALL "Seleccionar Todo" - IDS_SCROLL "Desplazar" - IDS_FIND "Buscar..." - IDS_DEFAULTS "Por defecto" - IDS_PROPERTIES "Propiedades" - IDS_SCROLLHERE "Desplazar aquí" - IDS_SCROLLTOP "Desplazar hasta arriba" - IDS_SCROLLBOTTOM "Desplazar hasta abajo" - IDS_SCROLLPAGE_UP "Subir página" - IDS_SCROLLPAGE_DOWN "Bajar página" - IDS_SCROLLUP "Desplazar arriba" - IDS_SCROLLDOWN "Desplazar abajo" + IDS_EDIT "Editar" + IDS_MARK "Marcar" + IDS_COPY "Copiar\tIntroducir" + IDS_PASTE "Pegar" + IDS_SELECTALL "Seleccionar Todo" + IDS_SCROLL "Desplazar" + IDS_FIND "Buscar..." + IDS_DEFAULTS "Por defecto" + IDS_PROPERTIES "Propiedades" + IDS_SCROLLHERE "Desplazar aquÃ" + IDS_SCROLLTOP "Desplazar hasta arriba" + IDS_SCROLLBOTTOM "Desplazar hasta abajo" + IDS_SCROLLPAGE_UP "Subir pÃ¡gina" + IDS_SCROLLPAGE_DOWN "Bajar pÃ¡gina" + IDS_SCROLLUP "Desplazar arriba" + IDS_SCROLLDOWN "Desplazar abajo" - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_CONSOLE_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lang/fr-FR.rc [iso-8859-1] Sat Feb 2 22:08:18 2013 @@ -1,25 +1,25 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL /* Fixme : Translation could be really improved, with context - La traduction pourrait réellement être améliorée grâce au contexte */ + La traduction pourrait rÃ©ellement Ãªtre amÃ©liorÃ©e grÃ¢ce au contexte */ STRINGTABLE BEGIN - IDS_EDIT "Éditer" - IDS_MARK "Marquer" - IDS_COPY "Copier\tEntrée" - IDS_PASTE "Coller" - IDS_SELECTALL "Tout sélectionner" - IDS_SCROLL "Défiler" - IDS_FIND "Trouver..." - IDS_DEFAULTS "Défauts" - IDS_PROPERTIES "Propriétés" - IDS_SCROLLHERE "Défiler ici" - IDS_SCROLLTOP "Défiler tout en haut" - IDS_SCROLLBOTTOM "Défiler tout en bas" - IDS_SCROLLPAGE_UP "Page précédente" - IDS_SCROLLPAGE_DOWN "Page suivante" - IDS_SCROLLUP "Défiler en haut" - IDS_SCROLLDOWN "Défiler en bas" + IDS_EDIT "Ãditer" + IDS_MARK "Marquer" + IDS_COPY "Copier\tEntrÃ©e" + IDS_PASTE "Coller" + IDS_SELECTALL "Tout sÃ©lectionner" + IDS_SCROLL "DÃ©filer" + IDS_FIND "Trouver..." + IDS_DEFAULTS "DÃ©fauts" + IDS_PROPERTIES "PropriÃ©tÃ©s" + IDS_SCROLLHERE "DÃ©filer ici" + IDS_SCROLLTOP "DÃ©filer tout en haut" + IDS_SCROLLBOTTOM "DÃ©filer tout en bas" + IDS_SCROLLPAGE_UP "Page prÃ©cÃ©dente" + IDS_SCROLLPAGE_DOWN "Page suivante" + IDS_SCROLLUP "DÃ©filer en haut" + IDS_SCROLLDOWN "DÃ©filer en bas" - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_CONSOLE_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lang/id-ID.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lang/id-ID.rc [iso-8859-1] Sat Feb 2 22:08:18 2013 @@ -2,22 +2,22 @@ STRINGTABLE BEGIN - IDS_EDIT "Edit" - IDS_MARK "Tandai" - IDS_COPY "Copy\tEnter" - IDS_PASTE "Paste" - IDS_SELECTALL "Pilih Semua" - IDS_SCROLL "Gulung" - IDS_FIND "Cari..." - IDS_DEFAULTS "Standar" - IDS_PROPERTIES "Properti" - IDS_SCROLLHERE "Gulung ke Sini" - IDS_SCROLLTOP "Gulung ke Atas" - IDS_SCROLLBOTTOM "Gulung ke Bawah" - IDS_SCROLLPAGE_UP "Halaman Naik" - IDS_SCROLLPAGE_DOWN "Halaman Turun" - IDS_SCROLLUP "Gulung Naik" - IDS_SCROLLDOWN "Gulung Turun" + IDS_EDIT "Edit" + IDS_MARK "Tandai" + IDS_COPY "Copy\tEnter" + IDS_PASTE "Paste" + IDS_SELECTALL "Pilih Semua" + IDS_SCROLL "Gulung" + IDS_FIND "Cari..." + IDS_DEFAULTS "Standar" + IDS_PROPERTIES "Properti" + IDS_SCROLLHERE "Gulung ke Sini" + IDS_SCROLLTOP "Gulung ke Atas" + IDS_SCROLLBOTTOM "Gulung ke Bawah" + IDS_SCROLLPAGE_UP "Halaman Naik" + IDS_SCROLLPAGE_DOWN "Halaman Turun" + IDS_SCROLLUP "Gulung Naik" + IDS_SCROLLDOWN "Gulung Turun" - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_CONSOLE_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lang/it-IT.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lang/it-IT.rc [iso-8859-1] Sat Feb 2 22:08:18 2013 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Client/Server Runtime subsystem * LICENSE: GPL - See COPYING in the top level directory -* FILE: subsystems/win32/csrss/win32csr/lang/it-IT.rc -* PURPOSE: Italian Translation of subsystems/win32/csrss/win32csr/lang/en-US.rc +* FILE: win32ss/user/consrv/lang/it-IT.rc +* PURPOSE: Italian Translation * PROGRAMMERS: * Copyright (C) 2007 Daniele Forsi (dforsi at gmail.com) Italian Translation */ @@ -11,22 +11,22 @@ STRINGTABLE BEGIN - IDS_EDIT "Modifica" - IDS_MARK "Seleziona" - IDS_COPY "Copia\tInvio" - IDS_PASTE "Incolla" - IDS_SELECTALL "Seleziona tutto" - IDS_SCROLL "Scorri" - IDS_FIND "Trova..." - IDS_DEFAULTS "Impostazioni predefinite" - IDS_PROPERTIES "Proprietà" - IDS_SCROLLHERE "Scorri qui" - IDS_SCROLLTOP "Scorri in cima" - IDS_SCROLLBOTTOM "Scorri in fondo" - IDS_SCROLLPAGE_UP "Pagina sù" - IDS_SCROLLPAGE_DOWN "Pagina giù" - IDS_SCROLLUP "Scorri sù" - IDS_SCROLLDOWN "Scorri giù" + IDS_EDIT "Modifica" + IDS_MARK "Seleziona" + IDS_COPY "Copia\tInvio" + IDS_PASTE "Incolla" + IDS_SELECTALL "Seleziona tutto" + IDS_SCROLL "Scorri" + IDS_FIND "Trova..." + IDS_DEFAULTS "Impostazioni predefinite" + IDS_PROPERTIES "ProprietÃ " + IDS_SCROLLHERE "Scorri qui" + IDS_SCROLLTOP "Scorri in cima" + IDS_SCROLLBOTTOM "Scorri in fondo" + IDS_SCROLLPAGE_UP "Pagina sÃ¹" + IDS_SCROLLPAGE_DOWN "Pagina giÃ¹" + IDS_SCROLLUP "Scorri sÃ¹" + IDS_SCROLLDOWN "Scorri giÃ¹" - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_CONSOLE_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lang/ja-JP.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lang/ja-JP.rc [iso-8859-1] Sat Feb 2 22:08:18 2013 @@ -2,22 +2,22 @@ STRINGTABLE BEGIN - IDS_EDIT "ÒW" - IDS_MARK "ÍÍwè" - IDS_COPY "Rs[\tEnter" - IDS_PASTE "\\èt¯" - IDS_SELECTALL "·×ÄIð" - IDS_SCROLL "XN[" - IDS_FIND "õ..." - IDS_DEFAULTS "Kèl" - IDS_PROPERTIES "vpeB" - IDS_SCROLLHERE "±±ÉXN[" - IDS_SCROLLTOP "êÔãÉXN[" - IDS_SCROLLBOTTOM "êÔºÉXN[" - IDS_SCROLLPAGE_UP "Page up" - IDS_SCROLLPAGE_DOWN "Page down" - IDS_SCROLLUP "ãÉXN[" - IDS_SCROLLDOWN "ºÉXN[" + IDS_EDIT "ç·¨é" + IDS_MARK "ç¯å²æå®" + IDS_COPY "ã³ãã¼\tEnter" + IDS_PASTE "è²¼\ãä»ã" + IDS_SELECTALL "ãã¹ã¦é¸æ" + IDS_SCROLL "ã¹ã¯ãã¼ã«" + IDS_FIND "æ¤ç´¢..." + IDS_DEFAULTS "è¦å®å¤" + IDS_PROPERTIES "ããããã£" + IDS_SCROLLHERE "ããã«ã¹ã¯ãã¼ã«" + IDS_SCROLLTOP "ä¸çªä¸ã«ã¹ã¯ãã¼ã«" + IDS_SCROLLBOTTOM "ä¸çªä¸ã«ã¹ã¯ãã¼ã«" + IDS_SCROLLPAGE_UP "Page up" + IDS_SCROLLPAGE_DOWN "Page down" + IDS_SCROLLUP "ä¸ã«ã¹ã¯ãã¼ã«" + IDS_SCROLLDOWN "ä¸ã«ã¹ã¯ãã¼ã«" - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_CONSOLE_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lang/no-NO.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lang/no-NO.rc [iso-8859-1] Sat Feb 2 22:08:18 2013 @@ -2,22 +2,22 @@ STRINGTABLE BEGIN - IDS_EDIT "Rediger" - IDS_MARK "Merk" - IDS_COPY "Kopier\tEnter" - IDS_PASTE "Lim inn" - IDS_SELECTALL "Velg alt" - IDS_SCROLL "Rull" - IDS_FIND "Finn..." - IDS_DEFAULTS "Standard" - IDS_PROPERTIES "Egenskaper" - IDS_SCROLLHERE "Rull her" - IDS_SCROLLTOP "Rull til toppen" - IDS_SCROLLBOTTOM "Rull knapp" - IDS_SCROLLPAGE_UP "Side opp" - IDS_SCROLLPAGE_DOWN "Side ned" - IDS_SCROLLUP "Rull opp" - IDS_SCROLLDOWN "Rull ned" + IDS_EDIT "Rediger" + IDS_MARK "Merk" + IDS_COPY "Kopier\tEnter" + IDS_PASTE "Lim inn" + IDS_SELECTALL "Velg alt" + IDS_SCROLL "Rull" + IDS_FIND "Finn..." + IDS_DEFAULTS "Standard" + IDS_PROPERTIES "Egenskaper" + IDS_SCROLLHERE "Rull her" + IDS_SCROLLTOP "Rull til toppen" + IDS_SCROLLBOTTOM "Rull knapp" + IDS_SCROLLPAGE_UP "Side opp" + IDS_SCROLLPAGE_DOWN "Side ned" + IDS_SCROLLUP "Rull opp" + IDS_SCROLLDOWN "Rull ned" - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_CONSOLE_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lang/pl-PL.rc [iso-8859-1] Sat Feb 2 22:08:18 2013 @@ -10,22 +10,22 @@ STRINGTABLE BEGIN - IDS_EDIT "Edytuj" - IDS_MARK "Zaznacz" - IDS_COPY "Kopiuj\tWejdÅº" - IDS_PASTE "Wklej" - IDS_SELECTALL "Zaznacz wszystko" - IDS_SCROLL "PrzewiÅ" - IDS_FIND "ZnajdÅº..." - IDS_DEFAULTS "Ustawienia domyÅlne" - IDS_PROPERTIES "WÅaÅciwoÅci" - IDS_SCROLLHERE "PrzewiÅ tutaj" - IDS_SCROLLTOP "PrzewiÅ na poczÄtek" - IDS_SCROLLBOTTOM "PrzewiÅ na koniec" - IDS_SCROLLPAGE_UP "Poprzednia strona" - IDS_SCROLLPAGE_DOWN "NastÄpna strona" - IDS_SCROLLUP "PrzewiÅ do gÃ³ry" - IDS_SCROLLDOWN "PrzewiÅ na dÃ³Å" + IDS_EDIT "Edytuj" + IDS_MARK "Zaznacz" + IDS_COPY "Kopiuj\tWejdÅº" + IDS_PASTE "Wklej" + IDS_SELECTALL "Zaznacz wszystko" + IDS_SCROLL "PrzewiÅ" + IDS_FIND "ZnajdÅº..." + IDS_DEFAULTS "Ustawienia domyÅlne" + IDS_PROPERTIES "WÅaÅciwoÅci" + IDS_SCROLLHERE "PrzewiÅ tutaj" + IDS_SCROLLTOP "PrzewiÅ na poczÄtek" + IDS_SCROLLBOTTOM "PrzewiÅ na koniec" + IDS_SCROLLPAGE_UP "Poprzednia strona" + IDS_SCROLLPAGE_DOWN "NastÄpna strona" + IDS_SCROLLUP "PrzewiÅ do gÃ³ry" + IDS_SCROLLDOWN "PrzewiÅ na dÃ³Å" - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_CONSOLE_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lang/pt-BR.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lang/pt-BR.rc [iso-8859-1] Sat Feb 2 22:08:18 2013 @@ -4,22 +4,22 @@ STRINGTABLE BEGIN - IDS_EDIT "Editar" - IDS_MARK "Marcar" - IDS_COPY "Copiar\tEnter" - IDS_PASTE "Colar" - IDS_SELECTALL "Selecionar Tudo" - IDS_SCROLL "Rolar" - IDS_FIND "Procurar..." - IDS_DEFAULTS "PadrÃµes" - IDS_PROPERTIES "Propriedades" - IDS_SCROLLHERE "Rolar aqui" - IDS_SCROLLTOP "Rolar atÃ© o topo" - IDS_SCROLLBOTTOM "Rolar atÃ© o fim" - IDS_SCROLLPAGE_UP "Page up" - IDS_SCROLLPAGE_DOWN "Page down" - IDS_SCROLLUP "Scroll up" - IDS_SCROLLDOWN "Scroll down" + IDS_EDIT "Editar" + IDS_MARK "Marcar" + IDS_COPY "Copiar\tEnter" + IDS_PASTE "Colar" + IDS_SELECTALL "Selecionar Tudo" + IDS_SCROLL "Rolar" + IDS_FIND "Procurar..." + IDS_DEFAULTS "PadrÃµes" + IDS_PROPERTIES "Propriedades" + IDS_SCROLLHERE "Rolar aqui" + IDS_SCROLLTOP "Rolar atÃ© o topo" + IDS_SCROLLBOTTOM "Rolar atÃ© o fim" + IDS_SCROLLPAGE_UP "Page up" + IDS_SCROLLPAGE_DOWN "Page down" + IDS_SCROLLUP "Scroll up" + IDS_SCROLLDOWN "Scroll down" - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_CONSOLE_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lang/ro-RO.rc [iso-8859-1] Sat Feb 2 22:08:18 2013 @@ -1,5 +1,5 @@ /* - * FILE: subsystems/win32/csrss/win32csr/lang/ro-RO.rc + * FILE: win32ss/user/consrv/lang/ro-RO.rc * ReactOS Project (http://www.reactos.org) * TRANSLATOR: Fulea Ètefan (PM on ReactOS Forum at fulea.stefan) * CHANGE LOG: 2011-10-16 initial translation @@ -9,22 +9,22 @@ STRINGTABLE BEGIN - IDS_EDIT "Editare" - IDS_MARK "MarcheazÄ" - IDS_COPY "CopiazÄ\tEnter" - IDS_PASTE "LipeÈte" - IDS_SELECTALL "SelecteazÄ tot" - IDS_SCROLL "DeruleazÄ" - IDS_FIND "GÄsireâ¦" - IDS_DEFAULTS "Implicite" - IDS_PROPERTIES "ProprietÄÈi" - IDS_SCROLLHERE "DeruleazÄ aici" - IDS_SCROLLTOP "DeruleazÄ la Ã®nceput" - IDS_SCROLLBOTTOM "DeruleazÄ la sfÃ¢rÈit" - IDS_SCROLLPAGE_UP "Pagina anterioarÄ" - IDS_SCROLLPAGE_DOWN "Pagina urmÄtoare" - IDS_SCROLLUP "DeruleazÄ Ã®n sus" - IDS_SCROLLDOWN "DeruleazÄ Ã®n jos" + IDS_EDIT "Editare" + IDS_MARK "MarcheazÄ" + IDS_COPY "CopiazÄ\tEnter" + IDS_PASTE "LipeÈte" + IDS_SELECTALL "SelecteazÄ tot" + IDS_SCROLL "DeruleazÄ" + IDS_FIND "GÄsireâ¦" + IDS_DEFAULTS "Implicite" + IDS_PROPERTIES "ProprietÄÈi" + IDS_SCROLLHERE "DeruleazÄ aici" + IDS_SCROLLTOP "DeruleazÄ la Ã®nceput" + IDS_SCROLLBOTTOM "DeruleazÄ la sfÃ¢rÈit" + IDS_SCROLLPAGE_UP "Pagina anterioarÄ" + IDS_SCROLLPAGE_DOWN "Pagina urmÄtoare" + IDS_SCROLLUP "DeruleazÄ Ã®n sus" + IDS_SCROLLDOWN "DeruleazÄ Ã®n jos" - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_CONSOLE_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lang/ru-RU.rc [iso-8859-1] Sat Feb 2 22:08:18 2013 @@ -2,22 +2,22 @@ STRINGTABLE BEGIN - IDS_EDIT "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ" - IDS_MARK "ÐÐ¾Ð¼ÐµÑÐ¸ÑÑ" - IDS_COPY "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ\tEnter" - IDS_PASTE "ÐÑÑÐ°Ð²Ð¸ÑÑ" - IDS_SELECTALL "ÐÑÐ´ÐµÐ»Ð¸ÑÑ Ð²ÑÐµ" - IDS_SCROLL "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÑ" - IDS_FIND "ÐÑÐºÐ°ÑÑ..." - IDS_DEFAULTS "Ð£Ð¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ" - IDS_PROPERTIES "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°" - IDS_SCROLLHERE "Scroll Here" - IDS_SCROLLTOP "Scroll Top" - IDS_SCROLLBOTTOM "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÑ Ð²Ð½Ð¸Ð·" - IDS_SCROLLPAGE_UP "ÐÐ²ÐµÑÑ ÑÑÑÐ°Ð½Ð¸ÑÑ" - IDS_SCROLLPAGE_DOWN "ÐÐ½Ð¸Ð· ÑÑÑÐ°Ð½Ð¸ÑÑ" - IDS_SCROLLUP "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÑ Ð²Ð²ÐµÑÑ" - IDS_SCROLLDOWN "Scroll Down" + IDS_EDIT "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ" + IDS_MARK "ÐÐ¾Ð¼ÐµÑÐ¸ÑÑ" + IDS_COPY "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ\tEnter" + IDS_PASTE "ÐÑÑÐ°Ð²Ð¸ÑÑ" + IDS_SELECTALL "ÐÑÐ´ÐµÐ»Ð¸ÑÑ Ð²ÑÐµ" + IDS_SCROLL "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÑ" + IDS_FIND "ÐÑÐºÐ°ÑÑ..." + IDS_DEFAULTS "Ð£Ð¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ" + IDS_PROPERTIES "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°" + IDS_SCROLLHERE "Scroll Here" + IDS_SCROLLTOP "Scroll Top" + IDS_SCROLLBOTTOM "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÑ Ð²Ð½Ð¸Ð·" + IDS_SCROLLPAGE_UP "ÐÐ²ÐµÑÑ ÑÑÑÐ°Ð½Ð¸ÑÑ" + IDS_SCROLLPAGE_DOWN "ÐÐ½Ð¸Ð· ÑÑÑÐ°Ð½Ð¸ÑÑ" + IDS_SCROLLUP "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÑ Ð²Ð²ÐµÑÑ" + IDS_SCROLLDOWN "Scroll Down" - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_CONSOLE_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lang/sk-SK.rc [iso-8859-1] Sat Feb 2 22:08:18 2013 @@ -1,4 +1,4 @@ -/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) +/* TRANSLATOR: MÃ¡rio KaÄmÃ¡r /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR: 29-05-2008 * LastChange: 12-04-2011 */ @@ -7,22 +7,22 @@ STRINGTABLE BEGIN - IDS_EDIT "Upravi" - IDS_MARK "Oznaèi" - IDS_COPY "Kopírova\tEnter" - IDS_PASTE "Vloi" - IDS_SELECTALL "Vybra vetko" - IDS_SCROLL "Rolova" - IDS_FIND "Nájs..." //Find - IDS_DEFAULTS "Predvolené" //Defaults - IDS_PROPERTIES "Vlastnosti" - IDS_SCROLLHERE "Rolova sem" - IDS_SCROLLTOP "K hornému okraju" - IDS_SCROLLBOTTOM "K dolnému okraju" - IDS_SCROLLPAGE_UP "O stránku vyie" - IDS_SCROLLPAGE_DOWN "O stránku niie" - IDS_SCROLLUP "Rolova nahor" - IDS_SCROLLDOWN "Rolova nadol" + IDS_EDIT "UpraviÅ¥" + IDS_MARK "OznaÄiÅ¥" + IDS_COPY "KopÃrovaÅ¥\tEnter" + IDS_PASTE "VloÅ¾iÅ¥" + IDS_SELECTALL "VybraÅ¥ vÅ¡etko" + IDS_SCROLL "RolovaÅ¥" + IDS_FIND "NÃ¡jsÅ¥..." // Find + IDS_DEFAULTS "PredvolenÃ©" // Defaults + IDS_PROPERTIES "Vlastnosti" + IDS_SCROLLHERE "RolovaÅ¥ sem" + IDS_SCROLLTOP "K hornÃ©mu okraju" + IDS_SCROLLBOTTOM "K dolnÃ©mu okraju" + IDS_SCROLLPAGE_UP "O strÃ¡nku vyÅ¡Å¡ie" + IDS_SCROLLPAGE_DOWN "O strÃ¡nku niÅ¾Å¡ie" + IDS_SCROLLUP "RolovaÅ¥ nahor" + IDS_SCROLLDOWN "RolovaÅ¥ nadol" - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_CONSOLE_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lang/sv-SE.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lang/sv-SE.rc [iso-8859-1] Sat Feb 2 22:08:18 2013 @@ -1,30 +1,30 @@ /* * PROJECT: ReactOS CSRSS subsystem - * FILE: subsystems/win32/csrss/win32csr/lang/sv-SE.rc + * FILE: win32ss/user/consrv/lang/sv-SE.rc * PURPOSE: Swedish resource file - * Translation: Jaix Bly + * Translation: Jaix Bly */ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_EDIT "Redigera" - IDS_MARK "Markera" - IDS_COPY "Kopiera\tEnter" - IDS_PASTE "Klistra in" - IDS_SELECTALL "Markera Allt" - IDS_SCROLL "Skrolla" - IDS_FIND "Sök..." - IDS_DEFAULTS "Ursprunglig" - IDS_PROPERTIES "Egenskaper" - IDS_SCROLLHERE "Skrolla hit" - IDS_SCROLLTOP "Skrolla till topp" - IDS_SCROLLBOTTOM "Skrolla till botten" - IDS_SCROLLPAGE_UP "Sida upp" - IDS_SCROLLPAGE_DOWN "Sida ner" - IDS_SCROLLUP "Skrolla upp" - IDS_SCROLLDOWN "Skrolla ner" + IDS_EDIT "Redigera" + IDS_MARK "Markera" + IDS_COPY "Kopiera\tEnter" + IDS_PASTE "Klistra in" + IDS_SELECTALL "Markera Allt" + IDS_SCROLL "Skrolla" + IDS_FIND "SÃ¶k..." + IDS_DEFAULTS "Ursprunglig" + IDS_PROPERTIES "Egenskaper" + IDS_SCROLLHERE "Skrolla hit" + IDS_SCROLLTOP "Skrolla till topp" + IDS_SCROLLBOTTOM "Skrolla till botten" + IDS_SCROLLPAGE_UP "Sida upp" + IDS_SCROLLPAGE_DOWN "Sida ner" + IDS_SCROLLUP "Skrolla upp" + IDS_SCROLLDOWN "Skrolla ner" - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_CONSOLE_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lang/tr-TR.rc [iso-8859-1] Sat Feb 2 22:08:18 2013 @@ -22,22 +22,22 @@ STRINGTABLE BEGIN - IDS_EDIT "DÃ¼zenle" - IDS_MARK "Ä°Åaretle" - IDS_COPY "Kopyala\tEnter" - IDS_PASTE "YapÄ±ÅtÄ±r" - IDS_SELECTALL "TÃ¼mÃ¼nÃ¼ SeÃ§" - IDS_SCROLL "Yuvarla" - IDS_FIND "Bul..." - IDS_DEFAULTS "VarsayÄ±lanlar" - IDS_PROPERTIES "Ãzellikler" - IDS_SCROLLHERE "Buraya yuvarla" - IDS_SCROLLTOP "Ãste yuvarla" - IDS_SCROLLBOTTOM "Alta yuvarla" - IDS_SCROLLPAGE_UP "Sayfa yukarÄ±" - IDS_SCROLLPAGE_DOWN "Sayfa aÅaÄÄ±" - IDS_SCROLLUP "YukarÄ± yuvarla" - IDS_SCROLLDOWN "AÅaÄÄ± yuvarla" + IDS_EDIT "DÃ¼zenle" + IDS_MARK "Ä°Åaretle" + IDS_COPY "Kopyala\tEnter" + IDS_PASTE "YapÄ±ÅtÄ±r" + IDS_SELECTALL "TÃ¼mÃ¼nÃ¼ SeÃ§" + IDS_SCROLL "Yuvarla" + IDS_FIND "Bul..." + IDS_DEFAULTS "VarsayÄ±lanlar" + IDS_PROPERTIES "Ãzellikler" + IDS_SCROLLHERE "Buraya yuvarla" + IDS_SCROLLTOP "Ãste yuvarla" + IDS_SCROLLBOTTOM "Alta yuvarla" + IDS_SCROLLPAGE_UP "Sayfa yukarÄ±" + IDS_SCROLLPAGE_DOWN "Sayfa aÅaÄÄ±" + IDS_SCROLLUP "YukarÄ± yuvarla" + IDS_SCROLLDOWN "AÅaÄÄ± yuvarla" - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_CONSOLE_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lang/uk-UA.rc [iso-8859-1] Sat Feb 2 22:08:18 2013 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS CSRSS subsystem * LICENSE: GPL - See COPYING in the top level directory - * FILE: subsystems/win32/csrss/win32csr/lang/uk-UA.rc + * FILE: win32ss/user/consrv/lang/uk-UA.rc * PURPOSE: Ukraianian resource file * TRANSLATOR: Artem Reznikov */ @@ -10,22 +10,22 @@ STRINGTABLE BEGIN - IDS_EDIT "Ð ÐµÐ´Ð°Ð³ÑÐ²Ð°ÑÐ¸" - IDS_MARK "ÐÐ¸Ð´ÑÐ»Ð¸ÑÐ¸" - IDS_COPY "ÐÐ¾Ð¿ÑÑÐ²Ð°ÑÐ¸\tEnter" - IDS_PASTE "ÐÑÑÐ°Ð²Ð¸ÑÐ¸" - IDS_SELECTALL "ÐÐ¸Ð´ÑÐ»Ð¸ÑÐ¸ Ð²ÑÐµ" - IDS_SCROLL "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÐ¸" - IDS_FIND "ÐÐ½Ð°Ð¹ÑÐ¸..." - IDS_DEFAULTS "ÐÐ°Ð¼Ð¾Ð²ÑÑÐ²Ð°Ð½Ð½Ñ" - IDS_PROPERTIES "ÐÐ»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÑ" - IDS_SCROLLHERE "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÐ¸ ÑÑÐ´Ð¸" - IDS_SCROLLTOP "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÐ¸ Ð½Ð° Ð¿Ð¾ÑÐ°ÑÐ¾Ðº" - IDS_SCROLLBOTTOM "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÐ¸ Ð½Ð° ÐºÑÐ½ÐµÑÑ" - IDS_SCROLLPAGE_UP "ÐÐ¾Ð¿ÐµÑÐµÐ´Ð½Ñ ÑÐ¾ÑÑÑÐ½ÐºÐ°" - IDS_SCROLLPAGE_DOWN "ÐÐ°ÑÑÑÐ¿Ð½Ð° ÑÑÐ¾ÑÑÐ½ÐºÐ°" - IDS_SCROLLUP "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÐ¸ Ð´Ð¾Ð³Ð¾ÑÐ¸" - IDS_SCROLLDOWN "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÐ¸ Ð´Ð¾Ð½Ð¸Ð·Ñ" + IDS_EDIT "Ð ÐµÐ´Ð°Ð³ÑÐ²Ð°ÑÐ¸" + IDS_MARK "ÐÐ¸Ð´ÑÐ»Ð¸ÑÐ¸" + IDS_COPY "ÐÐ¾Ð¿ÑÑÐ²Ð°ÑÐ¸\tEnter" + IDS_PASTE "ÐÑÑÐ°Ð²Ð¸ÑÐ¸" + IDS_SELECTALL "ÐÐ¸Ð´ÑÐ»Ð¸ÑÐ¸ Ð²ÑÐµ" + IDS_SCROLL "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÐ¸" + IDS_FIND "ÐÐ½Ð°Ð¹ÑÐ¸..." + IDS_DEFAULTS "ÐÐ°Ð¼Ð¾Ð²ÑÑÐ²Ð°Ð½Ð½Ñ" + IDS_PROPERTIES "ÐÐ»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÑ" + IDS_SCROLLHERE "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÐ¸ ÑÑÐ´Ð¸" + IDS_SCROLLTOP "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÐ¸ Ð½Ð° Ð¿Ð¾ÑÐ°ÑÐ¾Ðº" + IDS_SCROLLBOTTOM "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÐ¸ Ð½Ð° ÐºÑÐ½ÐµÑÑ" + IDS_SCROLLPAGE_UP "ÐÐ¾Ð¿ÐµÑÐµÐ´Ð½Ñ ÑÐ¾ÑÑÑÐ½ÐºÐ°" + IDS_SCROLLPAGE_DOWN "ÐÐ°ÑÑÑÐ¿Ð½Ð° ÑÑÐ¾ÑÑÐ½ÐºÐ°" + IDS_SCROLLUP "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÐ¸ Ð´Ð¾Ð³Ð¾ÑÐ¸" + IDS_SCROLLDOWN "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÐ¸ Ð´Ð¾Ð½Ð¸Ð·Ñ" - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_CONSOLE_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lang/zh-CN.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lang/zh-CN.rc [iso-8859-1] Sat Feb 2 22:08:18 2013 @@ -2,22 +2,22 @@ STRINGTABLE BEGIN - IDS_EDIT "±à¼" - IDS_MARK "±ê¼Ç" - IDS_COPY "¸´ÖÆ\tEnter" - IDS_PASTE "ð¤Ìù" - IDS_SELECTALL "È«²¿Ñ¡Ôñ" - IDS_SCROLL "¹ö¶¯" - IDS_FIND "²éÕÒ..." - IDS_DEFAULTS "Ä¬ÈÏ" - IDS_PROPERTIES "ÊôÐÔ" - IDS_SCROLLHERE "¹ö¶¯µ½´Ë" - IDS_SCROLLTOP "¹ö¶¯ÖÁ¶¥¶Ë" - IDS_SCROLLBOTTOM "¹ö¶¯ÖÁÄ©¶Ë" - IDS_SCROLLPAGE_UP "ÉÏÒ»Ò³" - IDS_SCROLLPAGE_DOWN "ÏÂÒ»Ò³" - IDS_SCROLLUP "ÏòÉÏ¹ö¶¯" - IDS_SCROLLDOWN "ÏòÏÂ¹ö¶¯" + IDS_EDIT "ç¼è¾" + IDS_MARK "æ è®°" + IDS_COPY "å¤å¶\tEnter" + IDS_PASTE "é»è´´" + IDS_SELECTALL "å¨é¨éæ©" + IDS_SCROLL "æ»å¨" + IDS_FIND "æ¥æ¾..." + IDS_DEFAULTS "é»è®¤" + IDS_PROPERTIES "å±æ§" + IDS_SCROLLHERE "æ»å¨å°æ¤" + IDS_SCROLLTOP "æ»å¨è³é¡¶ç«¯" + IDS_SCROLLBOTTOM "æ»å¨è³æ«ç«¯" + IDS_SCROLLPAGE_UP "ä¸ä¸é¡µ" + IDS_SCROLLPAGE_DOWN "ä¸ä¸é¡µ" + IDS_SCROLLUP "åä¸æ»å¨" + IDS_SCROLLDOWN "åä¸æ»å¨" - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_CONSOLE_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lang/zh-TW.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lang/zh-TW.rc [iso-8859-1] Sat Feb 2 22:08:18 2013 @@ -2,22 +2,22 @@ STRINGTABLE BEGIN - IDS_EDIT "½s¿è" - IDS_MARK "¼Ð°O" - IDS_COPY "½Æ»s\tEnter" - IDS_PASTE "ÂH¶K" - IDS_SELECTALL "¥þ³¡¿ï¾Ü" - IDS_SCROLL "ºu°Ê" - IDS_FIND "´M§ä..." - IDS_DEFAULTS "¹w³]" - IDS_PROPERTIES "ÄÝ©Ê" - IDS_SCROLLHERE "ºu°Ê¨ì¦¹ " - IDS_SCROLLTOP "ºu°Ê¨ì³»¸m" - IDS_SCROLLBOTTOM "ºu°Ê¨ì¥½ºÝ" - IDS_SCROLLPAGE_UP "¤W¤@¶" - IDS_SCROLLPAGE_DOWN "¤U¤@¶" - IDS_SCROLLUP "¦V¤Wºu°Ê" - IDS_SCROLLDOWN "¦V¤Uºu°Ê" + IDS_EDIT "ç·¨è¼¯" + IDS_MARK "æ¨è¨" + IDS_COPY "è¤è£½\tEnter" + IDS_PASTE "é»è²¼" + IDS_SELECTALL "å¨é¨é¸æ" + IDS_SCROLL "æ»¾å" + IDS_FIND "å°æ¾..." + IDS_DEFAULTS "é è¨" + IDS_PROPERTIES "å±¬æ§" + IDS_SCROLLHERE "æ»¾åå°æ¤ " + IDS_SCROLLTOP "æ»¾åå°é ç½®" + IDS_SCROLLBOTTOM "æ»¾åå°æ«ç«¯" + IDS_SCROLLPAGE_UP "ä¸ä¸é " + IDS_SCROLLPAGE_DOWN "ä¸ä¸é " + IDS_SCROLLUP "åä¸æ»¾å" + IDS_SCROLLDOWN "åä¸æ»¾å" - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_CONSOLE_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/r… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/resource.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/resource.h [iso-8859-1] Sat Feb 2 22:08:18 2013 @@ -37,6 +37,7 @@ #define IDS_SCROLLUP 309 #define IDS_SCROLLDOWN 310 +#define IDI_CONSOLE 1 #define IDS_CONSOLE_TITLE 500 /* EOF */ Modified: branches/ros-csrss/win32ss/user/consrv/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/r… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/rsrc.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/rsrc.rc [iso-8859-1] Sat Feb 2 22:08:18 2013 @@ -1,5 +1,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +// UTF-8 +#pragma code_page(65001) #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif @@ -33,21 +35,6 @@ #ifdef LANGUAGE_NB_NO #include "lang/no-NO.rc" #endif -#ifdef LANGUAGE_SK_SK - #include "lang/sk-SK.rc" -#endif -#ifdef LANGUAGE_SV_SE - #include "lang/sv-SE.rc" -#endif -#ifdef LANGUAGE_ZH_CN - #include "lang/zh-CN.rc" -#endif -#ifdef LANGUAGE_ZH_TW - #include "lang/zh-TW.rc" -#endif - -// UTF-8 -#pragma code_page(65001) #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif @@ -60,9 +47,21 @@ #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif -#ifdef LANGUAGE_UK_UA - #include "lang/uk-UA.rc" +#ifdef LANGUAGE_SK_SK + #include "lang/sk-SK.rc" +#endif +#ifdef LANGUAGE_SV_SE + #include "lang/sv-SE.rc" #endif #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif

1 0

[tkreuzer] 58272: [MKHIVE] Try to fix *nix build
by tkreuzer＠svn.reactos.org 02 Feb '13

02 Feb '13

Author: tkreuzer Date: Sat Feb 2 22:05:47 2013 New Revision: 58272 URL: http://svn.reactos.org/svn/reactos?rev=58272&view=rev Log: [MKHIVE] Try to fix *nix build Modified: trunk/reactos/tools/mkhive/reginf.c Modified: trunk/reactos/tools/mkhive/reginf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/reginf.c?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] Sat Feb 2 22:05:47 2013 @@ -48,15 +48,15 @@ #define FLG_ADDREG_TYPE_MASK (0xFFFF0000 | FLG_ADDREG_BINVALUETYPE) #ifdef _M_IX86 -#define Architecture L"x86" +static const WCHAR Architecture[] = {'x','8','6',0}; #elif defined(_M_AMD64) -#define Architecture L"amd64" +static const WCHAR Architecture[] = {'a','m','d','6','4'0}; #elif defined(_M_IA64) -#define Architecture L"ia64" +static const WCHAR Architecture[] = {'i','a','6','4',0}; #elif defined(_M_ARM) -#define Architecture L"arm" +static const WCHAR Architecture[] = {'a','r','m',0}; #elif defined(_M_PPC) -#define Architecture L"ppc" +static const WCHAR Architecture[] = {'p','p','c',0}; #endif static const WCHAR HKCR[] = {'H','K','C','R',0}; @@ -69,6 +69,9 @@ static const WCHAR HKCUPath[] = {'\\','R','e','g','i','s','t','r','y','\\','U','s','e','r','\\','.','D','E','F','A','U','L','T','\\',0}; static const WCHAR HKLMPath[] = {'\\','R','e','g','i','s','t','r','y','\\','M','a','c','h','i','n','e','\\',0}; static const WCHAR HKUPath[] = {'\\','R','e','g','i','s','t','r','y','\\','U','s','e','r','\\',0}; + +static const WCHAR AddReg[] = {'A','d','d','R','e','g',0}; +static const WCHAR DelReg[] = {'D','e','l','R','e','g',0}; /* FUNCTIONS ****************************************************************/ @@ -489,6 +492,7 @@ { HINF hInf; ULONG ErrorLine; + WCHAR SectionName[40]; /* Load inf file from install media. */ if (InfHostOpenFile(&hInf, FileName, 0, &ErrorLine) != 0) @@ -497,22 +501,26 @@ return FALSE; } - if (!registry_callback (hInf, L"DelReg", TRUE)) + if (!registry_callback (hInf, (PWCHAR)DelReg, TRUE)) { DPRINT1 ("registry_callback() for DelReg failed\n"); } - if (!registry_callback (hInf, L"DelReg.NT" Architecture, TRUE)) + wcsncpy(SectionName, DelReg, sizeof(SectionName) / sizeof(WCHAR)); + wcsncat(SectionName, Architecture, sizeof(SectionName) / sizeof(WCHAR)); + if (!registry_callback (hInf, SectionName, TRUE)) { DPRINT1 ("registry_callback() for DelReg.NT* failed\n"); } - if (!registry_callback (hInf, L"AddReg", FALSE)) + if (!registry_callback (hInf, (PWCHAR)AddReg, FALSE)) { DPRINT1 ("registry_callback() for AddReg failed\n"); } - if (!registry_callback (hInf, L"AddReg.NT" Architecture, FALSE)) + wcsncpy(SectionName, AddReg, sizeof(SectionName) / sizeof(WCHAR)); + wcsncat(SectionName, Architecture, sizeof(SectionName) / sizeof(WCHAR)); + if (!registry_callback (hInf, SectionName, FALSE)) { DPRINT1 ("registry_callback() for AddReg.NT* failed\n"); }

1 0

[tkreuzer] 58271: [SETUP] - Implement support for architecture specific INF sections both in mkhive and in usetup (For an example, check hivesys.inf at the bottom) - Get rid of architecture specifi...
by tkreuzer＠svn.reactos.org 02 Feb '13

02 Feb '13

Author: tkreuzer Date: Sat Feb 2 21:56:00 2013 New Revision: 58271 URL: http://svn.reactos.org/svn/reactos?rev=58271&view=rev Log: [SETUP] - Implement support for architecture specific INF sections both in mkhive and in usetup (For an example, check hivesys.inf at the bottom) - Get rid of architecture specific .inf files Added: trunk/reactos/boot/bootdata/hivecls.inf - copied unchanged from r58171, trunk/reactos/boot/bootdata/hivecls_i386.inf trunk/reactos/boot/bootdata/hivedef.inf - copied unchanged from r58171, trunk/reactos/boot/bootdata/hivedef_i386.inf trunk/reactos/boot/bootdata/hiveinst.inf - copied unchanged from r58171, trunk/reactos/boot/bootdata/hiveinst_i386.inf trunk/reactos/boot/bootdata/hivesft.inf - copied unchanged from r58270, trunk/reactos/boot/bootdata/hivesft_i386.inf trunk/reactos/boot/bootdata/hivesys.inf - copied, changed from r58270, trunk/reactos/boot/bootdata/hivesys_i386.inf Removed: trunk/reactos/boot/bootdata/hivecls_amd64.inf trunk/reactos/boot/bootdata/hivecls_arm.inf trunk/reactos/boot/bootdata/hivecls_i386.inf trunk/reactos/boot/bootdata/hivedef_amd64.inf trunk/reactos/boot/bootdata/hivedef_arm.inf trunk/reactos/boot/bootdata/hivedef_i386.inf trunk/reactos/boot/bootdata/hiveinst_arm.inf trunk/reactos/boot/bootdata/hiveinst_i386.inf trunk/reactos/boot/bootdata/hivesft_amd64.inf trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/hivesft_i386.inf trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/base/setup/usetup/registry.c trunk/reactos/boot/bootdata/CMakeLists.txt trunk/reactos/tools/mkhive/reginf.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/setup/usetup/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/registry… Modified: trunk/reactos/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/CMakeLists.t… Removed: trunk/reactos/boot/bootdata/hivecls_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_amd6… Removed: trunk/reactos/boot/bootdata/hivecls_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_arm.… Removed: trunk/reactos/boot/bootdata/hivecls_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_i386… Removed: trunk/reactos/boot/bootdata/hivedef_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_amd6… Removed: trunk/reactos/boot/bootdata/hivedef_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_arm.… Removed: trunk/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_i386… Removed: trunk/reactos/boot/bootdata/hiveinst_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hiveinst_arm… Removed: trunk/reactos/boot/bootdata/hiveinst_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hiveinst_i38… Removed: trunk/reactos/boot/bootdata/hivesft_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_amd6… Removed: trunk/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.… Removed: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… Copied: trunk/reactos/boot/bootdata/hivesys.inf (from r58270, trunk/reactos/boot/bootdata/hivesys_i386.inf) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… Removed: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd6… Removed: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… Removed: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… Modified: trunk/reactos/tools/mkhive/reginf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/reginf.c?rev=…

1 0

[akhaldi] 58270: [NTOS/FSRTL] * Remove a harmless ASSERT. Brought to you by Art Yerkes (arty). CORE-6580 #resolve #comment Committed in 58270.
by akhaldi＠svn.reactos.org 02 Feb '13

02 Feb '13

Author: akhaldi Date: Sat Feb 2 18:49:53 2013 New Revision: 58270 URL: http://svn.reactos.org/svn/reactos?rev=58270&view=rev Log: [NTOS/FSRTL] * Remove a harmless ASSERT. Brought to you by Art Yerkes (arty). CORE-6580 #resolve #comment Committed in 58270. Modified: trunk/reactos/ntoskrnl/fsrtl/filelock.c Modified: trunk/reactos/ntoskrnl/fsrtl/filelock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/filelock.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/filelock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/filelock.c [iso-8859-1] Sat Feb 2 18:49:53 2013 @@ -858,7 +858,10 @@ Find.Exclusive.FileLock.StartingByte = *FileOffset; Find.Exclusive.FileLock.EndingByte.QuadPart = FileOffset->QuadPart + Length->QuadPart; - ASSERT(InternalInfo); + if (!InternalInfo) { + DPRINT("File not previously locked (ever)\n"); + return STATUS_RANGE_NOT_LOCKED; + } Entry = RtlLookupElementGenericTable(&InternalInfo->RangeTable, &Find); if (!Entry) { DPRINT("Range not locked %wZ\n", &FileObject->FileName);

1 0

[janderwald] 58269: [LIBUSB] - Fix bug introduced in 58268 - Spotted by Usurp
by janderwald＠svn.reactos.org 02 Feb '13

02 Feb '13

Author: janderwald Date: Sat Feb 2 17:26:03 2013 New Revision: 58269 URL: http://svn.reactos.org/svn/reactos?rev=58269&view=rev Log: [LIBUSB] - Fix bug introduced in 58268 - Spotted by Usurp Modified: trunk/reactos/lib/drivers/libusb/hcd_controller.cpp Modified: trunk/reactos/lib/drivers/libusb/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hcd_con… ============================================================================== --- trunk/reactos/lib/drivers/libusb/hcd_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/hcd_controller.cpp [iso-8859-1] Sat Feb 2 17:26:03 2013 @@ -138,7 +138,7 @@ Status = m_Hardware->Initialize(m_DriverObject, m_FunctionalDeviceObject, m_PhysicalDeviceObject, m_NextDeviceObject); if (!NT_SUCCESS(Status)) { - DPRINT1("[%S] Failed to initialize hardware object %x\n", Status); + DPRINT1("[%S] Failed to initialize hardware object %x\n", m_Hardware->GetUSBType(), Status); // // failed to initialize hardware object, detach from device stack

1 0

[janderwald] 58268: [USB] - Add interface function to IUSBHardwareDevice, which returns the USB controller type - The controller type is used for debugging in the common usb library (libusb)
by janderwald＠svn.reactos.org 02 Feb '13

02 Feb '13

Author: janderwald Date: Sat Feb 2 15:45:02 2013 New Revision: 58268 URL: http://svn.reactos.org/svn/reactos?rev=58268&view=rev Log: [USB] - Add interface function to IUSBHardwareDevice, which returns the USB controller type - The controller type is used for debugging in the common usb library (libusb) Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp trunk/reactos/drivers/usb/usbhub/pdo.c trunk/reactos/drivers/usb/usbohci/hardware.cpp trunk/reactos/drivers/usb/usbuhci/hardware.cpp trunk/reactos/lib/drivers/libusb/common_interfaces.h trunk/reactos/lib/drivers/libusb/hcd_controller.cpp trunk/reactos/lib/drivers/libusb/hub_controller.cpp trunk/reactos/lib/drivers/libusb/libusb.cpp trunk/reactos/lib/drivers/libusb/usb_device.cpp Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] Sat Feb 2 15:45:02 2013 @@ -127,6 +127,13 @@ return STATUS_UNSUCCESSFUL; } +LPCWSTR +STDMETHODCALLTYPE +CUSBHardwareDevice::GetUSBType() +{ + return L"USBEHCI"; +} + NTSTATUS STDMETHODCALLTYPE CUSBHardwareDevice::Initialize( 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 Feb 2 15:45:02 2013 @@ -280,7 +280,7 @@ DPRINT1("URB_FUNCTION_CLASS_INTERFACE\n"); break; case URB_FUNCTION_VENDOR_DEVICE: - DPRINT1("URB_FUNCTION_VENDOR_DEVICE\n"); + DPRINT("URB_FUNCTION_VENDOR_DEVICE\n"); break; default: DPRINT1("IOCTL_INTERNAL_USB_SUBMIT_URB Function %x NOT IMPLEMENTED\n", Urb->UrbHeader.Function); Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Sat Feb 2 15:45:02 2013 @@ -124,6 +124,14 @@ return STATUS_UNSUCCESSFUL; } +LPCWSTR +STDMETHODCALLTYPE +CUSBHardwareDevice::GetUSBType() +{ + return L"USBOHCI"; +} + + NTSTATUS STDMETHODCALLTYPE CUSBHardwareDevice::Initialize( Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] Sat Feb 2 15:45:02 2013 @@ -145,6 +145,14 @@ return STATUS_UNSUCCESSFUL; } +LPCWSTR +STDMETHODCALLTYPE +CUSBHardwareDevice::GetUSBType() +{ + return L"USBUHCI"; +} + + NTSTATUS CUSBHardwareDevice::Initialize( PDRIVER_OBJECT DriverObject, Modified: trunk/reactos/lib/drivers/libusb/common_interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/common_… ============================================================================== --- trunk/reactos/lib/drivers/libusb/common_interfaces.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/common_interfaces.h [iso-8859-1] Sat Feb 2 15:45:02 2013 @@ -182,7 +182,9 @@ \ STDMETHOD_(VOID, SetStatusChangeEndpointCallBack)( THIS_ \ IN PVOID CallBack, \ - IN PVOID Context) PURE; + IN PVOID Context) PURE; \ + \ + STDMETHOD_(LPCWSTR, GetUSBType)(THIS) PURE; #define IMP_IUSBHARDWAREDEVICE \ @@ -228,7 +230,9 @@ \ STDMETHODIMP_(VOID) SetStatusChangeEndpointCallBack( \ IN PVOID CallBack, \ - IN PVOID Context); + IN PVOID Context); \ + \ + STDMETHODIMP_(LPCWSTR) GetUSBType(); DECLARE_INTERFACE_(IUSBHardwareDevice, IUnknown) { Modified: trunk/reactos/lib/drivers/libusb/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hcd_con… ============================================================================== --- trunk/reactos/lib/drivers/libusb/hcd_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/hcd_controller.cpp [iso-8859-1] Sat Feb 2 15:45:02 2013 @@ -60,6 +60,7 @@ PUSBHARDWAREDEVICE m_Hardware; PHUBCONTROLLER m_HubController; ULONG m_FDODeviceNumber; + LPCWSTR m_USBType; }; //================================================================================================= @@ -93,7 +94,7 @@ // // failed to create hardware object // - DPRINT1("[USBLIB] Failed to create hardware object\n"); + DPRINT1("Failed to create hardware object\n"); return STATUS_INSUFFICIENT_RESOURCES; } @@ -137,7 +138,7 @@ Status = m_Hardware->Initialize(m_DriverObject, m_FunctionalDeviceObject, m_PhysicalDeviceObject, m_NextDeviceObject); if (!NT_SUCCESS(Status)) { - DPRINT1("[USBLIB] Failed to initialize hardware object %x\n", Status); + DPRINT1("[%S] Failed to initialize hardware object %x\n", Status); // // failed to initialize hardware object, detach from device stack @@ -157,6 +158,11 @@ return Status; } + + // + // get usb controller type + // + m_USBType = m_Hardware->GetUSBType(); // @@ -234,7 +240,7 @@ // PC_ASSERT(DeviceExtension->IsFDO); - DPRINT1("[USBLIB] HandleDeviceControl>Type: IoCtl %x InputBufferLength %lu OutputBufferLength %lu\n", + DPRINT1("[%S] HandleDeviceControl>Type: IoCtl %x InputBufferLength %lu OutputBufferLength %lu\n", m_USBType, IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength); @@ -279,7 +285,7 @@ // // informal debug print // - DPRINT1("[USBLIB] Result %S\n", DriverKey->DriverKeyName); + DPRINT1("[%S] Result %S\n", m_USBType, DriverKey->DriverKeyName); } } @@ -331,7 +337,7 @@ PC_ASSERT(IoStack->Parameters.DeviceIoControl.OutputBufferLength - sizeof(ULONG) - sizeof(WCHAR) >= ResultLength); DriverKey->DriverKeyName[ResultLength / sizeof(WCHAR)] = L'\0'; - DPRINT1("[USBLIB] Result %S\n", DriverKey->DriverKeyName); + DPRINT1("[%S] Result %S\n", m_USBType, DriverKey->DriverKeyName); } // @@ -394,7 +400,7 @@ { case IRP_MN_START_DEVICE: { - DPRINT("[USBLIB] HandlePnp IRP_MN_START FDO\n"); + DPRINT("[%S] HandlePnp IRP_MN_START FDO\n", m_USBType); // // first start lower device object @@ -423,12 +429,12 @@ Status = SetSymbolicLink(TRUE); } - DPRINT("[USBLIB] HandlePnp IRP_MN_START FDO: Status %x\n", Status); + DPRINT("[%S] HandlePnp IRP_MN_START FDO: Status %x\n", m_USBType ,Status); break; } case IRP_MN_QUERY_DEVICE_RELATIONS: { - DPRINT("[USBLIB] HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %lx\n", IoStack->Parameters.QueryDeviceRelations.Type); + DPRINT("[%S] HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %lx\n", m_USBType, IoStack->Parameters.QueryDeviceRelations.Type); if (m_HubController == NULL) { @@ -508,7 +514,7 @@ } case IRP_MN_STOP_DEVICE: { - DPRINT("[USBLIB] HandlePnp IRP_MN_STOP_DEVICE\n"); + DPRINT("[%S] HandlePnp IRP_MN_STOP_DEVICE\n", m_USBType); if (m_Hardware) { @@ -549,7 +555,7 @@ IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(m_NextDeviceObject, Irp); #else - DPRINT1("[USBLIB] Denying controller removal due to reinitialization bugs\n"); + DPRINT1("[%S] Denying controller removal due to reinitialization bugs\n", m_USBType); Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_UNSUCCESSFUL; @@ -557,7 +563,7 @@ } case IRP_MN_REMOVE_DEVICE: { - DPRINT("[USBLIB] HandlePnp IRP_MN_REMOVE_DEVICE FDO\n"); + DPRINT("[%S] HandlePnp IRP_MN_REMOVE_DEVICE FDO\n", m_USBType); // // delete the symbolic link @@ -670,7 +676,7 @@ // if (!NT_SUCCESS(Status)) { - DPRINT1("[USBLIB] CreateFDO: Failed to create %wZ, Status %x\n", &DeviceName, Status); + DPRINT1("[%S] CreateFDO: Failed to create %wZ, Status %x\n", m_USBType, &DeviceName, Status); return Status; } } @@ -680,7 +686,7 @@ // m_FDODeviceNumber = UsbDeviceNumber; - DPRINT("[USBLIB] CreateFDO: DeviceName %wZ\n", &DeviceName); + DPRINT("[%S] CreateFDO: DeviceName %wZ\n", m_USBType, &DeviceName); /* done */ return Status; Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hub_con… ============================================================================== --- trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] Sat Feb 2 15:45:02 2013 @@ -105,6 +105,8 @@ PULONG m_DeviceAddressBitmapBuffer; LIST_ENTRY m_UsbDeviceList; PIRP m_PendingSCEIrp; + LPCWSTR m_USBType; + //Internal Functions BOOLEAN QueryStatusChageEndpoint(PIRP Irp); @@ -195,8 +197,6 @@ USHORT VendorID, DeviceID; ULONG Dummy1; - DPRINT1("CHubController::Initialize\n"); - // // initialize members // @@ -205,6 +205,7 @@ m_IsRootHubDevice = IsRootHubDevice; m_DeviceAddress = DeviceAddress; m_DriverObject = DriverObject; + m_USBType = m_Hardware->GetUSBType(); KeInitializeSpinLock(&m_Lock); InitializeListHead(&m_UsbDeviceList); @@ -225,7 +226,6 @@ // RtlInitializeBitMap(&m_DeviceAddressBitmap, m_DeviceAddressBitmapBuffer, 128); RtlClearAllBits(&m_DeviceAddressBitmap); - // // create PDO @@ -310,7 +310,7 @@ // Get the number of ports and check each one for device connected // m_Hardware->GetDeviceDetails(NULL, NULL, &PortCount, NULL); - DPRINT1("[USBLIB] SCE Request %p TransferBufferLength %lu Flags %x MDL %p\n", Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength, Urb->UrbBulkOrInterruptTransfer.TransferFlags, Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL); + DPRINT1("[%S] SCE Request %p TransferBufferLength %lu Flags %x MDL %p\n", m_USBType, Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength, Urb->UrbBulkOrInterruptTransfer.TransferFlags, Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL); TransferBuffer = (PUCHAR)Urb->UrbBulkOrInterruptTransfer.TransferBuffer; @@ -321,7 +321,7 @@ { m_Hardware->GetPortStatus(PortId, &PortStatus, &PortChange); - DPRINT1("[USBLIB] Port %d: Status %x, Change %x\n", PortId, PortStatus, PortChange); + DPRINT1("[%S] Port %d: Status %x, Change %x\n", m_USBType, PortId, PortStatus, PortChange); // @@ -329,7 +329,7 @@ // if (PortChange != 0) { - DPRINT1("[USBLIB] Change state on port %d\n", PortId); + DPRINT1("[%S] Change state on port %d\n", m_USBType, PortId); // Set the value for the port number *TransferBuffer = 1 << ((PortId + 1) & 7); Changed = TRUE; @@ -432,7 +432,7 @@ { case IRP_MN_START_DEVICE: { - DPRINT("[USBLIB] HandlePnp IRP_MN_START_DEVICE\n"); + DPRINT("[%S] HandlePnp IRP_MN_START_DEVICE\n", m_USBType); // // register device interface // @@ -450,7 +450,7 @@ } case IRP_MN_QUERY_ID: { - DPRINT("[USBLIB] HandlePnp IRP_MN_QUERY_ID Type %x\n", IoStack->Parameters.QueryId.IdType); + DPRINT("[%S] HandlePnp IRP_MN_QUERY_ID Type %x\n", m_USBType, IoStack->Parameters.QueryId.IdType); if (IoStack->Parameters.QueryId.IdType == BusQueryDeviceID) { @@ -525,7 +525,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("[USBLIB] HandlePnp> failed to get hardware id %x\n", Status); + DPRINT1("[%S] HandlePnp> failed to get hardware id %x\n", m_USBType, Status); VendorID = 0x8086; DeviceID = 0x3A37; } @@ -553,7 +553,7 @@ Index++; - DPRINT1("[USBLIB] Name %S\n", Buffer); + DPRINT1("[%S] Name %S\n", m_USBType, Buffer); // // allocate buffer @@ -587,7 +587,7 @@ } case IRP_MN_QUERY_CAPABILITIES: { - DPRINT("[USBLIB] HandlePnp IRP_MN_QUERY_CAPABILITIES\n"); + DPRINT("[%S] HandlePnp IRP_MN_QUERY_CAPABILITIES\n", m_USBType); DeviceCapabilities = (PDEVICE_CAPABILITIES)IoStack->Parameters.DeviceCapabilities.Capabilities; @@ -619,7 +619,7 @@ } case IRP_MN_QUERY_INTERFACE: { - DPRINT("[USBLIB] HandlePnp IRP_MN_QUERY_INTERFACE\n"); + DPRINT("[%S] HandlePnp IRP_MN_QUERY_INTERFACE\n", m_USBType); // // handle device interface requests @@ -629,7 +629,7 @@ } case IRP_MN_REMOVE_DEVICE: { - DPRINT("[USBLIB] HandlePnp IRP_MN_REMOVE_DEVICE\n"); + DPRINT("[%S] HandlePnp IRP_MN_REMOVE_DEVICE\n", m_USBType); // // deactivate device interface for BUS PDO @@ -659,7 +659,7 @@ } case IRP_MN_QUERY_DEVICE_RELATIONS: { - DPRINT("[USBLIB] HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %x\n", IoStack->Parameters.QueryDeviceRelations.Type); + DPRINT("[%S] HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %x\n", m_USBType, IoStack->Parameters.QueryDeviceRelations.Type); if (IoStack->Parameters.QueryDeviceRelations.Type == TargetDeviceRelation) { @@ -700,7 +700,7 @@ } case IRP_MN_QUERY_BUS_INFORMATION: { - DPRINT("[USBLIB] HandlePnp IRP_MN_QUERY_BUS_INFORMATION\n"); + DPRINT("[%S] HandlePnp IRP_MN_QUERY_BUS_INFORMATION\n", m_USBType); // // allocate buffer for bus information @@ -733,7 +733,7 @@ } case IRP_MN_STOP_DEVICE: { - DPRINT("[USBLIB] HandlePnp IRP_MN_STOP_DEVICE\n"); + DPRINT("[%S] HandlePnp IRP_MN_STOP_DEVICE\n", m_USBType); // // stop device // @@ -742,7 +742,7 @@ } case IRP_MN_SURPRISE_REMOVAL: { - DPRINT("[USBLIB] HandlePnp IRP_MN_SURPRISE_REMOVAL\n"); + DPRINT("[%S] HandlePnp IRP_MN_SURPRISE_REMOVAL\n", m_USBType); Status = STATUS_SUCCESS; break; } @@ -796,7 +796,7 @@ if (!EndPointDesc) { - DPRINT1("[USBLIB] Error No EndpointDesc\n"); + DPRINT1("[%S] Error No EndpointDesc\n", m_USBType); Urb->UrbIsochronousTransfer.Hdr.Status = USBD_STATUS_INVALID_PIPE_HANDLE; return STATUS_INVALID_PARAMETER; } @@ -805,7 +805,7 @@ // sanity checks // ASSERT(EndPointDesc); - DPRINT("HandleIsochronousTransfer EndPointDesc %p Address %x bmAttributes %x\n", EndPointDesc, EndPointDesc->bEndpointAddress, EndPointDesc->bmAttributes); + DPRINT("[%S] HandleIsochronousTransfer EndPointDesc %p Address %x bmAttributes %x\n", m_USBType, EndPointDesc, EndPointDesc->bEndpointAddress, EndPointDesc->bmAttributes); ASSERT((EndPointDesc->bmAttributes & USB_ENDPOINT_TYPE_MASK) == USB_ENDPOINT_TYPE_ISOCHRONOUS); // @@ -813,7 +813,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] HandleIsochronousTransfer invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleIsochronousTransfer invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -856,7 +856,7 @@ // // Else pend the IRP, to be completed when a device connects or disconnects. // - DPRINT("[USBLIB] Pending SCE Irp\n"); + DPRINT("[%S] Pending SCE Irp\n", m_USBType); m_PendingSCEIrp = Irp; IoMarkIrpPending(Irp); return STATUS_PENDING; @@ -878,7 +878,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] HandleBulkOrInterruptTransfer invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleBulkOrInterruptTransfer invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -905,7 +905,7 @@ ULONG NumPort; ULONG PortId; - DPRINT("[USBLIB] HandleClassOther> Request %x Value %x\n", Urb->UrbControlVendorClassRequest.Request, Urb->UrbControlVendorClassRequest.Value); + DPRINT("[%S] HandleClassOther> Request %x Value %x\n", m_USBType, Urb->UrbControlVendorClassRequest.Request, Urb->UrbControlVendorClassRequest.Value); // // get number of ports available @@ -947,7 +947,7 @@ // // request contains buffer of 2 ushort which are used from submitting port status and port change status // - DPRINT("[USBLIB] PortId %x PortStatus %x PortChange %x\n", PortId, PortStatus, PortChange); + DPRINT("[%S] PortId %x PortStatus %x PortChange %x\n", m_USBType, PortId, PortStatus, PortChange); Buffer = (PUSHORT)Urb->UrbControlVendorClassRequest.TransferBuffer; // @@ -974,7 +974,7 @@ Status = m_Hardware->ClearPortStatus(PortId, C_PORT_RESET); break; default: - DPRINT("[USBLIB] Unknown Value for Clear Feature %x \n", Urb->UrbControlVendorClassRequest.Value); + DPRINT("[%S] Unknown Value for Clear Feature %x \n", m_USBType, Urb->UrbControlVendorClassRequest.Value); break; } @@ -1023,13 +1023,13 @@ break; } default: - DPRINT1("[USBLIB] Unsupported request id %x\n", Urb->UrbControlVendorClassRequest.Value); + DPRINT1("[%S] Unsupported request id %x\n", m_USBType, Urb->UrbControlVendorClassRequest.Value); PC_ASSERT(FALSE); } break; } default: - DPRINT1("[USBLIB] HandleClassOther Unknown request code %x\n", Urb->UrbControlVendorClassRequest.Request); + DPRINT1("[%S] HandleClassOther Unknown request code %x\n", m_USBType, Urb->UrbControlVendorClassRequest.Request); PC_ASSERT(0); Status = STATUS_INVALID_DEVICE_REQUEST; } @@ -1095,7 +1095,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] HandleSelectConfiguration invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleSelectConfiguration invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1151,7 +1151,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] HandleSelectInterface invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleSelectInterface invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1208,7 +1208,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] HandleGetStatusFromDevice invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleGetStatusFromDevice invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1252,7 +1252,7 @@ // Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlDescriptorRequest.TransferBufferLength, Urb->UrbControlDescriptorRequest.TransferBuffer); ASSERT(Status == STATUS_SUCCESS); - DPRINT1("[USBLIB] HandleGetStatusFromDevice Status %x Length %lu DeviceStatus %x\n", Status, Urb->UrbControlDescriptorRequest.TransferBufferLength, *DeviceStatus); + DPRINT1("[%S] HandleGetStatusFromDevice Status %x Length %lu DeviceStatus %x\n", m_USBType, Status, Urb->UrbControlDescriptorRequest.TransferBufferLength, *DeviceStatus); // // done @@ -1273,7 +1273,7 @@ PUSBDEVICE UsbDevice; USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; - DPRINT("CHubController::HandleClassDevice Request %x Class %x\n", Urb->UrbControlVendorClassRequest.Request, Urb->UrbControlVendorClassRequest.Value >> 8); + DPRINT("[%S] HandleClassDevice Request %x Class %x\n", m_USBType, Urb->UrbControlVendorClassRequest.Request, Urb->UrbControlVendorClassRequest.Value >> 8); // // check class request type @@ -1287,7 +1287,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("HandleClassDevice invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleClassDevice invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1371,7 +1371,7 @@ { if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("HandleClassDevice invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleClassDevice invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle // @@ -1387,7 +1387,7 @@ break; } default: - DPRINT1("[USBLIB] HandleClassDevice Class %x not implemented\n", Urb->UrbControlVendorClassRequest.Value >> 8); + DPRINT1("[%S] HandleClassDevice Class %x not implemented\n", m_USBType, Urb->UrbControlVendorClassRequest.Value >> 8); break; } break; @@ -1399,7 +1399,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("HandleClassDevice invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleClassDevice invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1465,7 +1465,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] HandleGetDescriptorFromInterface invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleGetDescriptorFromInterface invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1494,7 +1494,7 @@ Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlDescriptorRequest.TransferBufferLength, Urb->UrbControlDescriptorRequest.TransferBuffer); if (!NT_SUCCESS(Status)) { - DPRINT1("[USBLIB] HandleGetDescriptorFromInterface failed with %x\n", Status); + DPRINT1("[%S] HandleGetDescriptorFromInterface failed with %x\n", m_USBType, Status); } // @@ -1515,7 +1515,7 @@ PUSBDEVICE UsbDevice; ULONG Length, BufferLength; - DPRINT("[USBLIB] HandleGetDescriptor Type %x\n", Urb->UrbControlDescriptorRequest.DescriptorType); + DPRINT("[%S] HandleGetDescriptor Type %x\n", m_USBType, Urb->UrbControlDescriptorRequest.DescriptorType); // // check descriptor type @@ -1547,7 +1547,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] HandleGetDescriptor invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleGetDescriptor invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1654,7 +1654,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] USB_CONFIGURATION_DESCRIPTOR_TYPE invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] USB_CONFIGURATION_DESCRIPTOR_TYPE invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1719,7 +1719,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] USB_STRING_DESCRIPTOR_TYPE invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] USB_STRING_DESCRIPTOR_TYPE invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1749,7 +1749,7 @@ break; } default: - DPRINT1("[USBLIB] CHubController::HandleGetDescriptor DescriptorType %x unimplemented\n", Urb->UrbControlDescriptorRequest.DescriptorType); + DPRINT1("[%S] CHubController::HandleGetDescriptor DescriptorType %x unimplemented\n", m_USBType, Urb->UrbControlDescriptorRequest.DescriptorType); break; } @@ -1781,7 +1781,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] HandleClassEndpoint invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleClassEndpoint invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1862,7 +1862,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] HandleVendorDevice invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleVendorDevice invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1930,7 +1930,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] HandleSyncResetAndClearStall invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleSyncResetAndClearStall invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1947,7 +1947,7 @@ // // failed // - DPRINT1("[USBLIB] failed to reset pipe %x\n", Status); + DPRINT1("[%S] failed to reset pipe %x\n", m_USBType, Status); } @@ -1967,7 +1967,7 @@ // Status = HandleClearStall(Irp, Urb); } - DPRINT1("[USBLIB] URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL Status %x\n", Status); + DPRINT1("[%S] URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL Status %x\n", m_USBType, Status); // // reset data toggle @@ -2003,7 +2003,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] HandleAbortPipe invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleAbortPipe invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -2026,7 +2026,7 @@ // issue request // Status = UsbDevice->AbortPipe(EndpointDescriptor); - DPRINT1("[USBLIB] URB_FUNCTION_ABORT_PIPE Status %x\n", Status); + DPRINT1("[%S] URB_FUNCTION_ABORT_PIPE Status %x\n", m_USBType, Status); // // done @@ -2059,7 +2059,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] HandleClearStall invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleClearStall invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -2076,7 +2076,7 @@ // get device // UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); - DPRINT1("[USBLIB] URB_FUNCTION_SYNC_CLEAR_STALL\n"); + DPRINT1("[%S] URB_FUNCTION_SYNC_CLEAR_STALL\n", m_USBType); // // initialize setup packet @@ -2093,7 +2093,7 @@ // Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, 0, 0); - DPRINT1("[USBLIB] URB_FUNCTION_CLEAR_STALL Status %x\n", Status); + DPRINT1("[%S] URB_FUNCTION_CLEAR_STALL Status %x\n", m_USBType, Status); // // done @@ -2124,7 +2124,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] HandleClassInterface invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleClassInterface invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -2178,7 +2178,7 @@ // // display error // - DPRINT1("URB_FUNCTION_CLASS_INTERFACE failed with Urb Status %x\n", Urb->UrbHeader.Status); + DPRINT1("[%S] URB_FUNCTION_CLASS_INTERFACE failed with Urb Status %x\n", m_USBType, Urb->UrbHeader.Status); } // @@ -2272,7 +2272,7 @@ Status = HandleVendorDevice(Irp, Urb); break; default: - DPRINT1("[USBLIB] IOCTL_INTERNAL_USB_SUBMIT_URB Function %x NOT IMPLEMENTED\n", Urb->UrbHeader.Function); + DPRINT1("[%S] IOCTL_INTERNAL_USB_SUBMIT_URB Function %x NOT IMPLEMENTED\n", m_USBType, Urb->UrbHeader.Function); break; } // @@ -2282,7 +2282,7 @@ } case IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE: { - DPRINT("[USBLIB] IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE %p\n", this); + DPRINT("[%S] IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE %p\n", m_USBType, this); if (IoStack->Parameters.Others.Argument1) { @@ -2307,7 +2307,7 @@ } case IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO: { - DPRINT("[USBLIB] IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO\n"); + DPRINT("[%S] IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO\n", m_USBType); // // this is the first request send, it delivers the PDO to the caller @@ -2336,7 +2336,7 @@ } case IOCTL_INTERNAL_USB_GET_HUB_COUNT: { - DPRINT("[USBLIB] IOCTL_INTERNAL_USB_GET_HUB_COUNT\n"); + DPRINT("[%S] IOCTL_INTERNAL_USB_GET_HUB_COUNT\n", m_USBType); // // after IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO is delivered, the usbhub driver @@ -2359,13 +2359,13 @@ } case IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION: { - DPRINT1("[USBLIB] IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION UNIMPLEMENTED\n"); + DPRINT1("[%S] IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION UNIMPLEMENTED\n", m_USBType); Status = STATUS_SUCCESS; break; } default: { - DPRINT1("[USBLIB] HandleDeviceControl>Type: IoCtl %x InputBufferLength %lu OutputBufferLength %lu NOT IMPLEMENTED\n", + DPRINT1("[%S] HandleDeviceControl>Type: IoCtl %x InputBufferLength %lu OutputBufferLength %lu NOT IMPLEMENTED\n", m_USBType, IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength); @@ -2797,7 +2797,7 @@ NTSTATUS Status; ULONG Index = 0; - DPRINT1("USBHI_InitializeUsbDevice\n"); + DPRINT("USBHI_InitializeUsbDevice\n"); // // first get controller @@ -2893,7 +2893,7 @@ PUSBDEVICE UsbDevice; CHubController * Controller; - DPRINT1("USBHI_GetUsbDescriptors\n"); + DPRINT("USBHI_GetUsbDescriptors\n"); // // sanity check @@ -2962,7 +2962,7 @@ CHubController * Controller; NTSTATUS Status; - DPRINT1("USBHI_RemoveUsbDevice\n"); + DPRINT("USBHI_RemoveUsbDevice\n"); // // first get controller @@ -3010,7 +3010,6 @@ // invalid device handle // DPRINT1("USBHI_RemoveUsbDevice Invalid device handle %p\n", UsbDevice); - PC_ASSERT(0); return STATUS_DEVICE_NOT_CONNECTED; } @@ -3035,7 +3034,7 @@ PUSBDEVICE OldUsbDevice, NewUsbDevice; CHubController * Controller; - DPRINT1("USBHI_RestoreUsbDevice\n"); + DPRINT("USBHI_RestoreUsbDevice\n"); // // first get controller @@ -3081,7 +3080,7 @@ PUSBDEVICE UsbDevice; CHubController * Controller; - DPRINT1("USBHI_QueryDeviceInformation %p\n", BusContext); + DPRINT("USBHI_QueryDeviceInformation %p\n", BusContext); // // sanity check @@ -3203,7 +3202,7 @@ { PUSB_CONTROLLER_INFORMATION_0 ControllerInfo; - DPRINT1("USBHI_GetControllerInformation\n"); + DPRINT("USBHI_GetControllerInformation\n"); // // sanity checks @@ -3266,7 +3265,7 @@ USHORT Dummy1; NTSTATUS Status; - DPRINT1("USBHI_GetExtendedHubInformation\n"); + DPRINT("USBHI_GetExtendedHubInformation\n"); // // sanity checks @@ -3493,7 +3492,7 @@ ULONG Speed, Dummy2; USHORT Dummy1; - DPRINT1("USBDI_GetUSBDIVersion\n"); + DPRINT("USBDI_GetUSBDIVersion\n"); // // get controller @@ -3573,7 +3572,7 @@ ULONG Speed, Dummy2; USHORT Dummy1; - DPRINT1("USBDI_IsDeviceHighSpeed\n"); + DPRINT("USBDI_IsDeviceHighSpeed\n"); // // get controller Modified: trunk/reactos/lib/drivers/libusb/libusb.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/libusb.… ============================================================================== --- trunk/reactos/lib/drivers/libusb/libusb.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/libusb.cpp [iso-8859-1] Sat Feb 2 15:45:02 2013 @@ -28,7 +28,7 @@ NTSTATUS Status; PHCDCONTROLLER HcdController; - DPRINT1("EHCI_AddDevice\n"); + DPRINT1("USBLIB_AddDevice\n"); /* first create the controller object */ Status = CreateHCDController(&HcdController); @@ -114,7 +114,7 @@ } default: { - DPRINT1("EHCI_Dispatch> Major %lu Minor %lu unhandeled\n", IoStack->MajorFunction, IoStack->MinorFunction); + DPRINT1("USBLIB_Dispatch> Major %lu Minor %lu unhandeled\n", IoStack->MajorFunction, IoStack->MinorFunction); Status = STATUS_SUCCESS; } } 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 Feb 2 15:45:02 2013 @@ -86,6 +86,7 @@ ULONG m_PortStatus; PUSBQUEUE m_Queue; PDMAMEMORYMANAGER m_DmaManager; + LPCWSTR m_USBType; PUSB_CONFIGURATION m_ConfigurationDescriptors; }; @@ -119,6 +120,7 @@ m_Parent = Parent; m_Port = Port; m_PortStatus = PortStatus; + m_USBType = m_Device->GetUSBType(); // // initialize device lock @@ -139,7 +141,7 @@ // // failed to get usb queue // - DPRINT1("CUSBDevice::Initialize GetUsbQueue failed with %x\n", Status); + DPRINT1("[%S] GetUsbQueue failed with %x\n", m_USBType, Status); return Status; } @@ -152,7 +154,7 @@ // // failed to get dma manager // - DPRINT1("CUSBDevice::Initialize GetDMA failed with %x\n", Status); + DPRINT1("[%S] GetDMA failed with %x\n", m_USBType, Status); return Status; } @@ -170,7 +172,7 @@ // // failed to get device descriptor // - DPRINT1("CUSBDevice::Initialize Failed to get device descriptor with %x\n", Status); + DPRINT1("[%S] Failed to get device descriptor with %x\n", m_USBType, Status); return Status; } @@ -274,7 +276,7 @@ return Usb20Device; } - DPRINT1("CUSBDevice::GetType Unknown bcdUSB Type %x\n", m_DeviceDescriptor.bcdUSB); + DPRINT1("[%S] GetType Unknown bcdUSB Type %x\n", m_USBType, m_DeviceDescriptor.bcdUSB); //PC_ASSERT(FALSE); return Usb11Device; @@ -309,7 +311,7 @@ UCHAR OldAddress; UCHAR Index; - DPRINT1("CUSBDevice::SetDeviceAddress> Address %x\n", DeviceAddress); + DPRINT1("[%S] SetDeviceAddress> Address %x\n", m_USBType, DeviceAddress); CtrlSetup = (PUSB_DEFAULT_PIPE_SETUP_PACKET)ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET), TAG_USBLIB); if (!CtrlSetup) @@ -332,7 +334,7 @@ if (!NT_SUCCESS(Status)) { // failed to set device address - DPRINT1("CUSBDevice::SetDeviceAddress> failed to set device address with %lx Address %x\n", Status, DeviceAddress); + DPRINT1("[%S] SetDeviceAddress> failed to set device address with %lx Address %x\n", m_USBType, Status, DeviceAddress); return Status; } @@ -349,7 +351,7 @@ Status = CreateDeviceDescriptor(); if (!NT_SUCCESS(Status)) { - DPRINT1("CUSBDevice::SetDeviceAddress> failed to retrieve device descriptor with device address set Error %lx\n", Status); + DPRINT1("[%S] SetDeviceAddress failed to retrieve device descriptor with device address set Error %lx\n", m_USBType, Status); // return error status return Status; } @@ -360,7 +362,7 @@ m_DeviceDescriptor.bNumConfigurations == 0) { // failed to retrieve device descriptor - DPRINT1("CUSBDevice::SetDeviceAddress> device returned bogus device descriptor\n"); + DPRINT1("[%S] SetDeviceAddress> device returned bogus device descriptor\n", m_USBType); DumpDeviceDescriptor(&m_DeviceDescriptor); // return error status @@ -386,7 +388,7 @@ Status = CreateConfigurationDescriptor(Index); if (!NT_SUCCESS(Status)) { - DPRINT1("CUSBDevice::SetDeviceAddress> failed to retrieve configuration %lu\n", Index); + DPRINT1("[%S] SetDeviceAddress> failed to retrieve configuration %lu\n", m_USBType, Index); break; } } @@ -429,7 +431,7 @@ // // no queue, wtf? // - DPRINT1("CUSBDevice::CommitIrp> no queue / dma !!!\n"); + DPRINT1("[%S] CommitIrp> no queue / dma !!!\n", m_USBType); return STATUS_UNSUCCESSFUL; } @@ -442,7 +444,7 @@ // // failed to build request // - DPRINT1("CUSBDevice::CommitIrp> CreateUSBRequest failed with %lx\n", Status); + DPRINT1("[%S] CommitIrp> CreateUSBRequest failed with %lx\n", m_USBType, Status); return Status; } @@ -465,7 +467,7 @@ // // failed to add request // - DPRINT1("CUSBDevice::CommitIrp> failed add request to queue with %lx\n", Status); + DPRINT1("[%S] failed add request to queue with %lx\n", m_USBType, Status); Request->Release(); return Status; } @@ -518,7 +520,7 @@ // // no queue, wtf? // - DPRINT1("CUSBDevice::CommitSetupPacket> no queue!!!\n"); + DPRINT1("[%S] CommitSetupPacket> no queue!!!\n", m_USBType); return STATUS_UNSUCCESSFUL; } @@ -531,7 +533,7 @@ // // failed to build request // - DPRINT1("CUSBDevice::CommitSetupPacket> CreateUSBRequest failed with %x\n", Status); + DPRINT1("[%S] CommitSetupPacket> CreateUSBRequest failed with %x\n", m_USBType, Status); return Status; } @@ -544,7 +546,7 @@ // // failed to initialize request // - DPRINT1("CUSBDevice::CommitSetupPacket> failed to initialize usb request with %x\n", Status); + DPRINT1("[%S] CommitSetupPacket failed to initialize usb request with %x\n", m_USBType, Status); Request->Release(); return Status; } @@ -558,7 +560,7 @@ // // failed to add request // - DPRINT1("CUSBDevice::CommitSetupPacket> failed add request to queue with %x\n", Status); + DPRINT1("[%S] CommitSetupPacket> failed add request to queue with %x\n", m_USBType, Status); Request->Release(); return Status; } @@ -759,7 +761,7 @@ // // failed to get partial configuration descriptor // - DPRINT1("[USBLIB] Failed to get partial configuration descriptor Status %x Index %x\n", Status, Index); + DPRINT1("[%S] Failed to get partial configuration descriptor Status %x Index %x\n", m_USBType, Status, Index); ExFreePoolWithTag(ConfigurationDescriptor, TAG_USBLIB); return Status; } @@ -773,7 +775,7 @@ // // failed to get full configuration descriptor // - DPRINT1("[USBLIB] Failed to get full configuration descriptor Status %x Index %x\n", Status, Index); + DPRINT1("[%S] Failed to get full configuration descriptor Status %x Index %x\n", m_USBType, Status, Index); ExFreePoolWithTag(ConfigurationDescriptor, TAG_USBLIB); return Status; } @@ -968,7 +970,7 @@ if (EndpointDescriptor->bLength == 0 || EndpointDescriptor->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE) { // bogus configuration descriptor - DPRINT1("[USBLIB] Bogus descriptor found in InterfaceNumber %x Alternate %x EndpointIndex %x bLength %x bDescriptorType %x\n", InterfaceDescriptor->bInterfaceNumber, InterfaceDescriptor->bAlternateSetting, PipeIndex, + DPRINT1("[%S] Bogus descriptor found in InterfaceNumber %x Alternate %x EndpointIndex %x bLength %x bDescriptorType %x\n", m_USBType, InterfaceDescriptor->bInterfaceNumber, InterfaceDescriptor->bAlternateSetting, PipeIndex, EndpointDescriptor->bLength, EndpointDescriptor->bDescriptorType); // failed @@ -1040,7 +1042,7 @@ if (!Found) { - DPRINT1("[USBLIB] invalid configuration value %u\n", ConfigurationDescriptor->bConfigurationValue); + DPRINT1("[%S] invalid configuration value %u\n", m_USBType, ConfigurationDescriptor->bConfigurationValue); return STATUS_INVALID_PARAMETER; } @@ -1062,13 +1064,13 @@ if (!ConfigurationDescriptor) { // unconfigure request - DPRINT1("CUSBDevice::SelectConfiguration Unconfigure Request Status %lx\n", Status); + DPRINT1("[%S] SelectConfiguration Unconfigure Request Status %lx\n", m_USBType, Status); m_ConfigurationIndex = 0; return Status; } // informal debug print - DPRINT1("CUSBDevice::SelectConfiguration New Configuration %x Old Configuration %x Result %lx\n", ConfigurationIndex, m_ConfigurationIndex, Status); + DPRINT1("[%S] SelectConfiguration New Configuration %x Old Configuration %x Result %lx\n", m_USBType, ConfigurationIndex, m_ConfigurationIndex, Status); if (!NT_SUCCESS(Status)) { // @@ -1123,7 +1125,7 @@ if (!NT_SUCCESS(Status)) { // failed - DPRINT1("[LIBUSB] Failed to copy interface descriptor Index %lu InterfaceDescriptor %p InterfaceInfo %p\n", ConfigurationIndex, InterfaceDescriptor, InterfaceInfo); + DPRINT1("[%S] Failed to copy interface descriptor Index %lu InterfaceDescriptor %p InterfaceInfo %p\n", m_USBType, ConfigurationIndex, InterfaceDescriptor, InterfaceInfo); break; } @@ -1165,7 +1167,7 @@ if (!Found) { // invalid handle passed - DPRINT1("[USBLIB] Invalid configuration handle passed %p\n", ConfigurationHandle); + DPRINT1("[%S] Invalid configuration handle passed %p\n", m_USBType, ConfigurationHandle); return STATUS_INVALID_PARAMETER; } @@ -1180,7 +1182,7 @@ Status = CommitSetupPacket(&CtrlSetup, NULL, 0, NULL); // informal debug print - DPRINT1("CUSBDevice::SelectInterface AlternateSetting %x InterfaceNumber %x Status %lx\n", InterfaceInfo->AlternateSetting, InterfaceInfo->InterfaceNumber, Status); + DPRINT1("[%S] SelectInterface AlternateSetting %x InterfaceNumber %x Status %lx\n", m_USBType, InterfaceInfo->AlternateSetting, InterfaceInfo->InterfaceNumber, Status); #if 0 if (!NT_SUCCESS(Status)) { @@ -1216,7 +1218,7 @@ InterfaceDescriptor = USBD_ParseConfigurationDescriptor(m_ConfigurationDescriptors[ConfigurationIndex].ConfigurationDescriptor, InterfaceInfo->InterfaceNumber, InterfaceInfo->AlternateSetting); if (!InterfaceDescriptor) { - DPRINT1("[LIBUSB] No such interface Alternate %x InterfaceNumber %x\n", InterfaceInfo->AlternateSetting, InterfaceInfo->InterfaceNumber); + DPRINT1("[%S] No such interface Alternate %x InterfaceNumber %x\n", m_USBType, InterfaceInfo->AlternateSetting, InterfaceInfo->InterfaceNumber); return STATUS_UNSUCCESSFUL; } @@ -1225,7 +1227,7 @@ if (!NT_SUCCESS(Status)) { // failed - DPRINT1("[LIBUSB] Failed to build interface descriptor Status %x\n", Status); + DPRINT1("[%S] Failed to build interface descriptor Status %x\n", m_USBType, Status); return Status; } }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs