Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 32390: - Add Arabic and Czech languages to list
by dchapyshev＠svn.reactos.org 16 Feb '08

16 Feb '08

Author: dchapyshev Date: Sat Feb 16 20:36:34 2008 New Revision: 32390 URL: http://svn.reactos.org/svn/reactos?rev=32390&view=rev Log: - Add Arabic and Czech languages to list Modified: trunk/reactos/base/setup/usetup/mui.c trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (original) +++ trunk/reactos/base/setup/usetup/mui.c Sat Feb 16 20:36:34 2008 @@ -47,11 +47,13 @@ static const MUI_LANGUAGE LanguageList[] = { - /* Lang ID, DefKbdLayout,ANSI CP, OEM CP, MAC CP, Language Name, page strgs,error strings */ + /* Lang ID, DefKbdLayout,ANSI CP, OEM CP, MAC CP, Language Name, page strgs,error strings, other strings */ {L"00000409", L"00000409", L"1252", L"437", L"10000", L"English", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000401", L"00000401", L"1256", L"720", L"10004", L"Arabic", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000402", L"00000402", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries, enUSStrings }, {L"00000403", L"00000403", L"1252", L"850", L"10000", L"Catalan", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000804", L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000405", L"00000405", L"1250", L"852", L"10029", L"Czech", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000406", L"00000406", L"1252", L"850", L"10000", L"Danish", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000413", L"00000813", L"1252", L"850", L"10000", L"Dutch", enUSPages, enUSErrorEntries, enUSStrings }, {L"0000040B", L"0000040B", L"1252", L"850", L"10000", L"Finnish", enUSPages, enUSErrorEntries, enUSStrings }, @@ -65,7 +67,7 @@ {L"00000412", L"00000412", L"949", L"949", L"10003", L"Korean", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000427", L"00000427", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries, enUSStrings }, {L"00000414", L"00000414", L"1252", L"850", L"10000", L"Norwegian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000419", L"00000419", L"1251", L"866", L"10007", L"Russian", ruRUPages, ruRUErrorEntries, enUSStrings }, + {L"00000419", L"00000419", L"1251", L"866", L"10007", L"Russian", ruRUPages, ruRUErrorEntries, ruRUStrings }, {L"0000041B", L"0000041B", L"1250", L"852", L"10029", L"Slovak", skSKPages, skSKErrorEntries, skSKStrings }, {L"0000040A", L"0000040A", L"1252", L"850", L"10000", L"Spanish", esESPages, esESErrorEntries, enUSStrings }, {L"00000415", L"00000415", L"1250", L"852", L"10029", L"Polski", plPLPages, plPLErrorEntries, plPLStrings }, Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Sat Feb 16 20:36:34 2008 @@ -100,9 +100,11 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)" [Language] +00000401 = "Arabic" 00000402 = "Bulgarian" 00000403 = "Catalan" 00000804 = "Chinese (PRC)" +00000405 = "Czech" 00000406 = "Danish" 00000413 = "Dutch" 00000409 = "English"

1 0

[dchapyshev] 32389: - Add small checking - Fix formating
by dchapyshev＠svn.reactos.org 16 Feb '08

16 Feb '08

Author: dchapyshev Date: Sat Feb 16 20:28:58 2008 New Revision: 32389 URL: http://svn.reactos.org/svn/reactos?rev=32389&view=rev Log: - Add small checking - Fix formating Modified: trunk/reactos/base/system/rundll32/lang/bg-BG.rc trunk/reactos/base/system/rundll32/lang/de-DE.rc trunk/reactos/base/system/rundll32/lang/el-GR.rc trunk/reactos/base/system/rundll32/lang/en-US.rc trunk/reactos/base/system/rundll32/lang/es-ES.rc trunk/reactos/base/system/rundll32/lang/fr-FR.rc trunk/reactos/base/system/rundll32/lang/hu-HU.rc trunk/reactos/base/system/rundll32/lang/id-ID.rc trunk/reactos/base/system/rundll32/lang/it-IT.rc trunk/reactos/base/system/rundll32/lang/ja-JP.rc trunk/reactos/base/system/rundll32/lang/lt-LT.rc trunk/reactos/base/system/rundll32/lang/nb-NO.rc trunk/reactos/base/system/rundll32/lang/nl-NL.rc trunk/reactos/base/system/rundll32/lang/pl-PL.rc trunk/reactos/base/system/rundll32/lang/pt-BR.rc trunk/reactos/base/system/rundll32/lang/ru-RU.rc trunk/reactos/base/system/rundll32/lang/sk-SK.rc trunk/reactos/base/system/rundll32/lang/th-TH.rc trunk/reactos/base/system/rundll32/lang/uk-UA.rc trunk/reactos/base/system/rundll32/rundll32.c Modified: trunk/reactos/base/system/rundll32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/bg-BG.rc (original) +++ trunk/reactos/base/system/rundll32/lang/bg-BG.rc Sat Feb 16 20:28:58 2008 @@ -1,12 +1,8 @@ #include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com - */ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "Íåóñïåøíî çàðåæäàíå íà áèáëèîòåêà '%s'" -IDS_MissingEntry, "Ëèïñâàùà âõîäíà òî÷êà:%s\nâ %s" + IDS_DllNotLoaded, "Íåóñïåøíî çàðåæäàíå íà áèáëèîòåêà '%s'" + IDS_MissingEntry, "Ëèïñâàùà âõîäíà òî÷êà:%s\nâ %s" END Modified: trunk/reactos/base/system/rundll32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/de-DE.rc (original) +++ trunk/reactos/base/system/rundll32/lang/de-DE.rc Sat Feb 16 20:28:58 2008 @@ -7,6 +7,6 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "LoadLibrary laden von '%s' fehlgeschlagen" -IDS_MissingEntry, "Fehlender Eintrag:%s\nIn %s" + IDS_DllNotLoaded, "LoadLibrary laden von '%s' fehlgeschlagen" + IDS_MissingEntry, "Fehlender Eintrag:%s\nIn %s" END Modified: trunk/reactos/base/system/rundll32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/el-GR.rc (original) +++ trunk/reactos/base/system/rundll32/lang/el-GR.rc Sat Feb 16 20:28:58 2008 @@ -1,13 +1,11 @@ #include "resource.h" /* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com * Gr.rc by Dj Apal® */ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "LoadLibrary äåí êáôÜöåñå íá öïñôþóåé '%s'" -IDS_MissingEntry, "Ëåßðåé ôï óçìåßï åêêßíçóçò:%s\nIn %s" + IDS_DllNotLoaded, "LoadLibrary äåí êáôÜöåñå íá öïñôþóåé '%s'" + IDS_MissingEntry, "Ëåßðåé ôï óçìåßï åêêßíçóçò:%s\nIn %s" END Modified: trunk/reactos/base/system/rundll32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/en-US.rc (original) +++ trunk/reactos/base/system/rundll32/lang/en-US.rc Sat Feb 16 20:28:58 2008 @@ -7,6 +7,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "LoadLibrary failed to load '%s'" -IDS_MissingEntry, "Missing entry point:%s\nIn %s" + IDS_DllNotLoaded, "LoadLibrary failed to load '%s'" + IDS_MissingEntry, "Missing entry point:%s\nIn %s" END Modified: trunk/reactos/base/system/rundll32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/es-ES.rc (original) +++ trunk/reactos/base/system/rundll32/lang/es-ES.rc Sat Feb 16 20:28:58 2008 @@ -1,12 +1,8 @@ #include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com - */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "El cargador de Librerias falló al cargar '%s'" -IDS_MissingEntry, "Punto de entrada perdido:%s\nIn %s" + IDS_DllNotLoaded, "El cargador de Librerias falló al cargar '%s'" + IDS_MissingEntry, "Punto de entrada perdido:%s\nIn %s" END Modified: trunk/reactos/base/system/rundll32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/fr-FR.rc (original) +++ trunk/reactos/base/system/rundll32/lang/fr-FR.rc Sat Feb 16 20:28:58 2008 @@ -1,12 +1,8 @@ #include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com - */ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "LoadLibrary a échoué lors du chargement de '%s'" -IDS_MissingEntry, "Point d'entrée manquant:%s\ndans %s" + IDS_DllNotLoaded, "LoadLibrary a échoué lors du chargement de '%s'" + IDS_MissingEntry, "Point d'entrée manquant:%s\ndans %s" END Modified: trunk/reactos/base/system/rundll32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/hu-HU.rc (original) +++ trunk/reactos/base/system/rundll32/lang/hu-HU.rc Sat Feb 16 20:28:58 2008 @@ -1,13 +1,11 @@ #include "resource.h" /* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com * Hungarian version is Copyright 2005 - Peter Nagy <nagylakas(a)gmail.com> */ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "A(z) '%s' állományt, vagy valamelyik összetevõjét nem sikerült megnyitni" -IDS_MissingEntry, "Hiányzó bejegyzés: %s\nIn A Következõ állomány nem tölthetõ be: %s" + IDS_DllNotLoaded, "A(z) '%s' állományt, vagy valamelyik összetevõjét nem sikerült megnyitni" + IDS_MissingEntry, "Hiányzó bejegyzés: %s\nIn A Következõ állomány nem tölthetõ be: %s" END Modified: trunk/reactos/base/system/rundll32/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/id-ID.rc (original) +++ trunk/reactos/base/system/rundll32/lang/id-ID.rc Sat Feb 16 20:28:58 2008 @@ -4,6 +4,6 @@ STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "LoadLibrary gagal untuk mengambil '%s'" -IDS_MissingEntry, "entry point hilang:%s\nDalam %s" + IDS_DllNotLoaded, "LoadLibrary gagal untuk mengambil '%s'" + IDS_MissingEntry, "entry point hilang:%s\nDalam %s" END Modified: trunk/reactos/base/system/rundll32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/it-IT.rc (original) +++ trunk/reactos/base/system/rundll32/lang/it-IT.rc Sat Feb 16 20:28:58 2008 @@ -1,12 +1,8 @@ #include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com - */ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "LoadLibrary fallita '%s'" -IDS_MissingEntry, "Manca:%s\nIn %s" + IDS_DllNotLoaded, "LoadLibrary fallita '%s'" + IDS_MissingEntry, "Manca:%s\nIn %s" END Modified: trunk/reactos/base/system/rundll32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/ja-JP.rc (original) +++ trunk/reactos/base/system/rundll32/lang/ja-JP.rc Sat Feb 16 20:28:58 2008 @@ -1,12 +1,8 @@ #include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com - */ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "LoadLibrary Í '%s' ÌÇÝÝÉ¸sµÜµ½B" -IDS_MissingEntry, "Gg |Cgª èÜ¹ñ:%s\n( %s )" + IDS_DllNotLoaded, "LoadLibrary Í '%s' ÌÇÝÝÉ¸sµÜµ½B" + IDS_MissingEntry, "Gg |Cgª èÜ¹ñ:%s\n( %s )" END Modified: trunk/reactos/base/system/rundll32/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/lt-LT.rc (original) +++ trunk/reactos/base/system/rundll32/lang/lt-LT.rc Sat Feb 16 20:28:58 2008 @@ -5,6 +5,6 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "LoadLibrary nepavyko paleisti '%s'" -IDS_MissingEntry, "Trûksta áëjimo taðko:%s\nIn %s" + IDS_DllNotLoaded, "LoadLibrary nepavyko paleisti '%s'" + IDS_MissingEntry, "Trûksta áëjimo taðko:%s\nIn %s" END Modified: trunk/reactos/base/system/rundll32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/nb-NO.rc (original) +++ trunk/reactos/base/system/rundll32/lang/nb-NO.rc Sat Feb 16 20:28:58 2008 @@ -1,12 +1,8 @@ #include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com - */ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "LoadLibrary mislykket å laste '%s'" -IDS_MissingEntry, "Mistet oppføring moment:%s\nIn %s" + IDS_DllNotLoaded, "LoadLibrary mislykket å laste '%s'" + IDS_MissingEntry, "Mistet oppføring moment:%s\nIn %s" END Modified: trunk/reactos/base/system/rundll32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/nl-NL.rc (original) +++ trunk/reactos/base/system/rundll32/lang/nl-NL.rc Sat Feb 16 20:28:58 2008 @@ -1,13 +1,11 @@ #include "resource.h" /* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com * Translation done by Vertaald door Eric Janssen */ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "LoadLibrary kon '%s' niet laden" -IDS_MissingEntry, "Entry point:%s\n niet gevonden In %s" + IDS_DllNotLoaded, "LoadLibrary kon '%s' niet laden" + IDS_MissingEntry, "Entry point:%s\n niet gevonden In %s" END Modified: trunk/reactos/base/system/rundll32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/pl-PL.rc (original) +++ trunk/reactos/base/system/rundll32/lang/pl-PL.rc Sat Feb 16 20:28:58 2008 @@ -8,6 +8,6 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "LoadLibrary nie móg³ za³adowaæ '%s'" -IDS_MissingEntry, "Brakuj¹cy punkt wejcia:%s\nW %s" + IDS_DllNotLoaded, "LoadLibrary nie móg³ za³adowaæ '%s'" + IDS_MissingEntry, "Brakuj¹cy punkt wejcia:%s\nW %s" END Modified: trunk/reactos/base/system/rundll32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/pt-BR.rc (original) +++ trunk/reactos/base/system/rundll32/lang/pt-BR.rc Sat Feb 16 20:28:58 2008 @@ -1,12 +1,8 @@ #include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com - */ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "Erro ao carregar '%s'" -IDS_MissingEntry, "Está faltando a entrada:%s\nem %s" + IDS_DllNotLoaded, "Erro ao carregar '%s'" + IDS_MissingEntry, "Está faltando a entrada:%s\nem %s" END Modified: trunk/reactos/base/system/rundll32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/ru-RU.rc (original) +++ trunk/reactos/base/system/rundll32/lang/ru-RU.rc Sat Feb 16 20:28:58 2008 @@ -1,12 +1,8 @@ #include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com - */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "Íåâîçìîæíî çàãðóçèòü áèáëèîòåêó '%s'" -IDS_MissingEntry, "Íåâîçìîæíî íàéòè òî÷êó âõîäà: %s\nâ áèáëèîòåêå %s" + IDS_DllNotLoaded, "Íåâîçìîæíî çàãðóçèòü áèáëèîòåêó '%s'" + IDS_MissingEntry, "Íåâîçìîæíî íàéòè òî÷êó âõîäà: %s\nâ áèáëèîòåêå %s" END Modified: trunk/reactos/base/system/rundll32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/sk-SK.rc (original) +++ trunk/reactos/base/system/rundll32/lang/sk-SK.rc Sat Feb 16 20:28:58 2008 @@ -1,13 +1,11 @@ #include "resource.h" /* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com * Slovak translation by Kario 2007 <kario(a)szm.sk> */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "Naèítanie kninice zlyhalo pri pokus naèíta '%s'" -IDS_MissingEntry, "Chybný vstupný bod:%s\nv %s" + IDS_DllNotLoaded, "Naèítanie kninice zlyhalo pri pokus naèíta '%s'" + IDS_MissingEntry, "Chybný vstupný bod:%s\nv %s" END Modified: trunk/reactos/base/system/rundll32/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/th-TH.rc (original) +++ trunk/reactos/base/system/rundll32/lang/th-TH.rc Sat Feb 16 20:28:58 2008 @@ -9,6 +9,6 @@ LANGUAGE LANG_THAI, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "¡ÒÃºÃÃ¨Ø¤èÒÃÐººà¡Ô´¼Ô´¾ÅÒ´ '%s'" -IDS_MissingEntry, "¡ÒÃà¢éÒËÒµÓáË¹è§¼Ô´¾ÅÒ´: %s\n%s" + IDS_DllNotLoaded, "¡ÒÃºÃÃ¨Ø¤èÒÃÐººà¡Ô´¼Ô´¾ÅÒ´ '%s'" + IDS_MissingEntry, "¡ÒÃà¢éÒËÒµÓáË¹è§¼Ô´¾ÅÒ´: %s\n%s" END Modified: trunk/reactos/base/system/rundll32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/uk-UA.rc (original) +++ trunk/reactos/base/system/rundll32/lang/uk-UA.rc Sat Feb 16 20:28:58 2008 @@ -12,6 +12,6 @@ STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "LoadLibrary íå âäàëîñÿ çàâàíòàæèòè '%s'" -IDS_MissingEntry, "Íåìîæëèâî çíàéòè òî÷êó âõîäó:%s\nÂ á³áë³îòåö³ %s" + IDS_DllNotLoaded, "LoadLibrary íå âäàëîñÿ çàâàíòàæèòè '%s'" + IDS_MissingEntry, "Íåìîæëèâî çíàéòè òî÷êó âõîäó:%s\nÂ á³áë³îòåö³ %s" END Modified: trunk/reactos/base/system/rundll32/rundll32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rundl… ============================================================================== --- trunk/reactos/base/system/rundll32/rundll32.c (original) +++ trunk/reactos/base/system/rundll32/rundll32.c Sat Feb 16 20:28:58 2008 @@ -60,176 +60,176 @@ // and is not intended to be used in any other program. LPTSTR *WINAPI CommandLineToArgv(LPCTSTR lpCmdLine, int *lpArgc) { - LPTSTR *argv, lpSrc, lpDest, lpArg; - int argc, nBSlash, nNames; - BOOL bInQuotes, bFirstChar; - - // If null was passed in for lpCmdLine, there are no arguments - if (!lpCmdLine) { - if (lpArgc) - *lpArgc = 0; - return 0; - } - - lpSrc = (LPTSTR)lpCmdLine; - // Skip spaces at beginning - while (*lpSrc == _T(' ') || *lpSrc == _T('\t')) - lpSrc++; - - // If command-line starts with null, there are no arguments - if (*lpSrc == 0) { - if (lpArgc) - *lpArgc = 0; - return 0; - } - - lpArg = lpSrc; - argc = 0; - nBSlash = 0; - bInQuotes = FALSE; - bFirstChar = TRUE; - nNames = 0; - - // Count the number of arguments - while (nNames < 4) { - if (*lpSrc == 0 || (*lpSrc == _T(',') && nNames == 2) || ((*lpSrc == _T(' ') || *lpSrc == _T('\t')) && !bInQuotes)) { - // Whitespace not enclosed in quotes signals the start of another argument - argc++; - - // Skip whitespace between arguments - while (*lpSrc == _T(' ') || *lpSrc == _T('\t') || (*lpSrc == _T(',') && nNames == 2)) - lpSrc++; - if (*lpSrc == 0) - break; - if (nNames >= 3) { - // Increment the count for the last argument - argc++; - break; - } - nBSlash = 0; - bFirstChar = TRUE; - continue; - } - else if (*lpSrc == _T('\\')) { - // Count consecutive backslashes - nBSlash++; - bFirstChar = FALSE; - } - else if (*lpSrc == _T('\"') && !(nBSlash & 1)) { - // Open or close quotes - bInQuotes = !bInQuotes; - nBSlash = 0; - } - else { - // Some other character - nBSlash = 0; - if (bFirstChar && ((*lpSrc != _T('/') && nNames <= 1) || nNames > 1)) - nNames++; - bFirstChar = FALSE; - } - lpSrc++; - } - - // Allocate space for the pointers in argv and the strings in one block - argv = (LPTSTR *)malloc(argc * sizeof(LPTSTR) + (_tcslen(lpArg) + 1) * sizeof(TCHAR)); - - if (!argv) { - // Memory allocation failed - if (lpArgc) - *lpArgc = 0; - return 0; - } - - lpSrc = lpArg; - lpDest = lpArg = (LPTSTR)(argv + argc); - argc = 0; - nBSlash = 0; - bInQuotes = FALSE; - bFirstChar = TRUE; - nNames = 0; - - // Fill the argument array - while (nNames < 4) { - if (*lpSrc == 0 || (*lpSrc == _T(',') && nNames == 2) || ((*lpSrc == _T(' ') || *lpSrc == _T('\t')) && !bInQuotes)) { - // Whitespace not enclosed in quotes signals the start of another argument - // Null-terminate argument - *lpDest++ = 0; - argv[argc++] = lpArg; - - // Skip whitespace between arguments - while (*lpSrc == _T(' ') || *lpSrc == _T('\t') || (*lpSrc == _T(',') && nNames == 2)) - lpSrc++; - if (*lpSrc == 0) - break; - lpArg = lpDest; - if (nNames >= 3) { - // Copy the rest of the command-line to the last argument - argv[argc++] = lpArg; - _tcscpy(lpArg,lpSrc); - break; - } - nBSlash = 0; - bFirstChar = TRUE; - continue; - } - else if (*lpSrc == _T('\\')) { - *lpDest++ = _T('\\'); - lpSrc++; - - // Count consecutive backslashes - nBSlash++; - bFirstChar = FALSE; - } - else if (*lpSrc == _T('\"')) { - if (!(nBSlash & 1)) { - // If an even number of backslashes are before the quotes, - // the quotes don't go in the output - lpDest -= nBSlash / 2; - bInQuotes = !bInQuotes; - } - else { - // If an odd number of backslashes are before the quotes, - // output a quote - lpDest -= (nBSlash + 1) / 2; - *lpDest++ = _T('\"'); - bFirstChar = FALSE; - } - lpSrc++; - nBSlash = 0; - } - else { - // Copy other characters - if (bFirstChar && ((*lpSrc != _T('/') && nNames <= 1) || nNames > 1)) - nNames++; - *lpDest++ = *lpSrc++; - nBSlash = 0; - bFirstChar = FALSE; - } - } - - if (lpArgc) - *lpArgc = argc; - return argv; + LPTSTR *argv, lpSrc, lpDest, lpArg; + int argc, nBSlash, nNames; + BOOL bInQuotes, bFirstChar; + + // If null was passed in for lpCmdLine, there are no arguments + if (!lpCmdLine) { + if (lpArgc) + *lpArgc = 0; + return 0; + } + + lpSrc = (LPTSTR)lpCmdLine; + // Skip spaces at beginning + while (*lpSrc == _T(' ') || *lpSrc == _T('\t')) + lpSrc++; + + // If command-line starts with null, there are no arguments + if (*lpSrc == 0) { + if (lpArgc) + *lpArgc = 0; + return 0; + } + + lpArg = lpSrc; + argc = 0; + nBSlash = 0; + bInQuotes = FALSE; + bFirstChar = TRUE; + nNames = 0; + + // Count the number of arguments + while (nNames < 4) { + if (*lpSrc == 0 || (*lpSrc == _T(',') && nNames == 2) || ((*lpSrc == _T(' ') || *lpSrc == _T('\t')) && !bInQuotes)) { + // Whitespace not enclosed in quotes signals the start of another argument + argc++; + + // Skip whitespace between arguments + while (*lpSrc == _T(' ') || *lpSrc == _T('\t') || (*lpSrc == _T(',') && nNames == 2)) + lpSrc++; + if (*lpSrc == 0) + break; + if (nNames >= 3) { + // Increment the count for the last argument + argc++; + break; + } + nBSlash = 0; + bFirstChar = TRUE; + continue; + } + else if (*lpSrc == _T('\\')) { + // Count consecutive backslashes + nBSlash++; + bFirstChar = FALSE; + } + else if (*lpSrc == _T('\"') && !(nBSlash & 1)) { + // Open or close quotes + bInQuotes = !bInQuotes; + nBSlash = 0; + } + else { + // Some other character + nBSlash = 0; + if (bFirstChar && ((*lpSrc != _T('/') && nNames <= 1) || nNames > 1)) + nNames++; + bFirstChar = FALSE; + } + lpSrc++; + } + + // Allocate space for the pointers in argv and the strings in one block + argv = (LPTSTR *)malloc(argc * sizeof(LPTSTR) + (_tcslen(lpArg) + 1) * sizeof(TCHAR)); + + if (!argv) { + // Memory allocation failed + if (lpArgc) + *lpArgc = 0; + return 0; + } + + lpSrc = lpArg; + lpDest = lpArg = (LPTSTR)(argv + argc); + argc = 0; + nBSlash = 0; + bInQuotes = FALSE; + bFirstChar = TRUE; + nNames = 0; + + // Fill the argument array + while (nNames < 4) { + if (*lpSrc == 0 || (*lpSrc == _T(',') && nNames == 2) || ((*lpSrc == _T(' ') || *lpSrc == _T('\t')) && !bInQuotes)) { + // Whitespace not enclosed in quotes signals the start of another argument + // Null-terminate argument + *lpDest++ = 0; + argv[argc++] = lpArg; + + // Skip whitespace between arguments + while (*lpSrc == _T(' ') || *lpSrc == _T('\t') || (*lpSrc == _T(',') && nNames == 2)) + lpSrc++; + if (*lpSrc == 0) + break; + lpArg = lpDest; + if (nNames >= 3) { + // Copy the rest of the command-line to the last argument + argv[argc++] = lpArg; + _tcscpy(lpArg,lpSrc); + break; + } + nBSlash = 0; + bFirstChar = TRUE; + continue; + } + else if (*lpSrc == _T('\\')) { + *lpDest++ = _T('\\'); + lpSrc++; + + // Count consecutive backslashes + nBSlash++; + bFirstChar = FALSE; + } + else if (*lpSrc == _T('\"')) { + if (!(nBSlash & 1)) { + // If an even number of backslashes are before the quotes, + // the quotes don't go in the output + lpDest -= nBSlash / 2; + bInQuotes = !bInQuotes; + } + else { + // If an odd number of backslashes are before the quotes, + // output a quote + lpDest -= (nBSlash + 1) / 2; + *lpDest++ = _T('\"'); + bFirstChar = FALSE; + } + lpSrc++; + nBSlash = 0; + } + else { + // Copy other characters + if (bFirstChar && ((*lpSrc != _T('/') && nNames <= 1) || nNames > 1)) + nNames++; + *lpDest++ = *lpSrc++; + nBSlash = 0; + bFirstChar = FALSE; + } + } + + if (lpArgc) + *lpArgc = argc; + return argv; } void GetModuleTitle(void) { - LPTSTR lpStr; - - GetModuleFileName(0,ModuleFileName,MAX_PATH); - ModuleTitle = ModuleFileName; - - for (lpStr = ModuleFileName;*lpStr;lpStr++) { - if (*lpStr == _T('\\')) - ModuleTitle = lpStr+1; - } - - for (lpStr = ModuleTitle;*lpStr;lpStr++) { - if (_tcsicmp(lpStr,_T(".exe"))==0) - break; - } - - *lpStr = 0; + LPTSTR lpStr; + + GetModuleFileName(0,ModuleFileName,MAX_PATH); + ModuleTitle = ModuleFileName; + + for (lpStr = ModuleFileName;*lpStr;lpStr++) { + if (*lpStr == _T('\\')) + ModuleTitle = lpStr+1; + } + + for (lpStr = ModuleTitle;*lpStr;lpStr++) { + if (_tcsicmp(lpStr,_T(".exe"))==0) + break; + } + + *lpStr = 0; } // The macro ConvertToWideChar takes a tstring parameter and returns @@ -245,15 +245,15 @@ LPWSTR ConvertToWideChar(LPCSTR lpString) { - LPWSTR lpwString; - size_t nStrLen; - - nStrLen = strlen(lpString) + 1; - - lpwString = (LPWSTR)malloc(nStrLen * sizeof(WCHAR)); - MultiByteToWideChar(0,0,lpString,nStrLen,lpwString,nStrLen); - - return lpwString; + LPWSTR lpwString; + size_t nStrLen; + + nStrLen = strlen(lpString) + 1; + + lpwString = (LPWSTR)malloc(nStrLen * sizeof(WCHAR)); + MultiByteToWideChar(0,0,lpString,nStrLen,lpwString,nStrLen); + + return lpwString; } #define FreeConvertedWideChar(lpwString) free(lpwString) @@ -281,47 +281,54 @@ // for the returned string when it is no longer needed. LPSTR DuplicateToMultiByte(LPCTSTR lptString, size_t nBufferSize) { - LPSTR lpString; - size_t nStrLen; - - nStrLen = _tcslen(lptString) + 1; - if (nBufferSize == 0) nBufferSize = nStrLen; - - lpString = (LPSTR)malloc(nBufferSize); + LPSTR lpString; + size_t nStrLen; + + nStrLen = _tcslen(lptString) + 1; + if (nBufferSize == 0) nBufferSize = nStrLen; + + lpString = (LPSTR)malloc(nBufferSize); #ifdef UNICODE - WideCharToMultiByte(0,0,lptString,nStrLen,lpString,nBufferSize,0,0); + WideCharToMultiByte(0,0,lptString,nStrLen,lpString,nBufferSize,0,0); #else - strncpy(lpString,lptString,nBufferSize); -#endif - - return lpString; + strncpy(lpString,lptString,nBufferSize); +#endif + + return lpString; } LRESULT CALLBACK EmptyWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - return DefWindowProc(hWnd, uMsg, wParam, lParam); + return DefWindowProc(hWnd, uMsg, wParam, lParam); } // Registers a minimal window class for passing to the dll function -ATOM RegisterBlankClass(HINSTANCE hInstance) -{ - WNDCLASSEX wcex; - - wcex.cbSize = sizeof(WNDCLASSEX); - - wcex.style = 0; - wcex.lpfnWndProc = EmptyWindowProc; - wcex.cbClsExtra = 0; - wcex.cbWndExtra = 0; - wcex.hInstance = hInstance; - wcex.hIcon = 0; - wcex.hCursor = 0; - wcex.hbrBackground = 0; - wcex.lpszMenuName = 0; - wcex.lpszClassName = rundll32_wclass; - wcex.hIconSm = 0; - - return RegisterClassEx(&wcex); +ATOM RegisterBlankClass(HINSTANCE hInstance, HINSTANCE hPrevInstance) +{ + WNDCLASSEX wcex; + ATOM Ret; + + if (!hPrevInstance) + { + wcex.cbSize = sizeof(WNDCLASSEX); + + wcex.style = 0; + wcex.lpfnWndProc = EmptyWindowProc; + wcex.cbClsExtra = 0; + wcex.cbWndExtra = 0; + wcex.hInstance = hInstance; + wcex.hIcon = 0; + wcex.hCursor = 0; + wcex.hbrBackground = 0; + wcex.lpszMenuName = 0; + wcex.lpszClassName = rundll32_wclass; + wcex.hIconSm = 0; + } + + Ret = RegisterClassEx(&wcex); + if (!Ret) return FALSE; + + return Ret; } int WINAPI WinMain( @@ -331,149 +338,152 @@ int nCmdShow ) { - int argc; - TCHAR szMsg[RC_STRING_MAX_SIZE]; - - LPTSTR *argv; - LPTSTR lptCmdLine,lptDllName,lptFuncName,lptMsgBuffer; - LPSTR lpFuncName,lpaCmdLine; - LPWSTR lpwCmdLine; - HMODULE hDll; - DllWinMainW fnDllWinMainW; - DllWinMainA fnDllWinMainA; - HWND hWindow; - int nRetVal,i; - size_t nStrLen; - - // Get command-line in argc-argv format - argv = CommandLineToArgv(GetCommandLine(),&argc); - - // Skip all beginning arguments starting with a slash (/) - for (i = 1; i < argc; i++) - if (*argv[i] != _T('/')) break; - - // If no dll was specified, there is nothing to do - if (i >= argc) { - if (argv) free(argv); - return 0; - } - - lptDllName = argv[i++]; - - // The next argument, which specifies the name of the dll function, - // can either have a comma between it and the dll filename or a space. - // Using a comma here is the preferred method - if (i < argc) - lptFuncName = argv[i++]; - else - lptFuncName = _T(""); - - // If no function name was specified, nothing needs to be done - if (!*lptFuncName) { - if (argv) free(argv); - return 0; - } - - // The rest of the arguments will be passed to dll function - if (i < argc) - lptCmdLine = argv[i]; - else - lptCmdLine = _T(""); - - nRetVal = 0; - - // Everything is all setup, so load the dll now - hDll = LoadLibrary(lptDllName); - if (hDll) { - nStrLen = _tcslen(lptFuncName); - // Make a non-unicode version of the function name, - // since that is all GetProcAddress accepts - lpFuncName = DuplicateToMultiByte(lptFuncName,nStrLen + 2); + int argc; + TCHAR szMsg[RC_STRING_MAX_SIZE]; + + LPTSTR *argv; + LPTSTR lptCmdLine,lptDllName,lptFuncName,lptMsgBuffer; + LPSTR lpFuncName,lpaCmdLine; + LPWSTR lpwCmdLine; + HMODULE hDll; + DllWinMainW fnDllWinMainW; + DllWinMainA fnDllWinMainA; + HWND hWindow; + int nRetVal,i; + size_t nStrLen; + + // Get command-line in argc-argv format + argv = CommandLineToArgv(GetCommandLine(),&argc); + + // Skip all beginning arguments starting with a slash (/) + for (i = 1; i < argc; i++) + if (*argv[i] != _T('/')) break; + + // If no dll was specified, there is nothing to do + if (i >= argc) { + if (argv) free(argv); + return 0; + } + + lptDllName = argv[i++]; + + // The next argument, which specifies the name of the dll function, + // can either have a comma between it and the dll filename or a space. + // Using a comma here is the preferred method + if (i < argc) + lptFuncName = argv[i++]; + else + lptFuncName = _T(""); + + // If no function name was specified, nothing needs to be done + if (!*lptFuncName) { + if (argv) free(argv); + return 0; + } + + // The rest of the arguments will be passed to dll function + if (i < argc) + lptCmdLine = argv[i]; + else + lptCmdLine = _T(""); + + nRetVal = 0; + + // Everything is all setup, so load the dll now + hDll = LoadLibrary(lptDllName); + if (hDll) { + nStrLen = _tcslen(lptFuncName); + // Make a non-unicode version of the function name, + // since that is all GetProcAddress accepts + lpFuncName = DuplicateToMultiByte(lptFuncName,nStrLen + 2); #ifdef UNICODE - lpFuncName[nStrLen] = 'W'; - lpFuncName[nStrLen+1] = 0; - // Get address of unicode version of the dll function if it exists - fnDllWinMainW = (DllWinMainW)GetProcAddress(hDll,lpFuncName); - fnDllWinMainA = 0; - if (!fnDllWinMainW) { - // If no unicode function was found, get the address of the non-unicode function - lpFuncName[nStrLen] = 'A'; - fnDllWinMainA = (DllWinMainA)GetProcAddress(hDll,lpFuncName); - if (!fnDllWinMainA) { - // If first non-unicode function was not found, get the address - // of the other non-unicode function - lpFuncName[nStrLen] = 0; - fnDllWinMainA = (DllWinMainA)GetProcAddress(hDll,lpFuncName); - } - } + lpFuncName[nStrLen] = 'W'; + lpFuncName[nStrLen+1] = 0; + // Get address of unicode version of the dll function if it exists + fnDllWinMainW = (DllWinMainW)GetProcAddress(hDll,lpFuncName); + fnDllWinMainA = 0; + if (!fnDllWinMainW) { + // If no unicode function was found, get the address of the non-unicode function + lpFuncName[nStrLen] = 'A'; + fnDllWinMainA = (DllWinMainA)GetProcAddress(hDll,lpFuncName); + if (!fnDllWinMainA) { + // If first non-unicode function was not found, get the address + // of the other non-unicode function + lpFuncName[nStrLen] = 0; + fnDllWinMainA = (DllWinMainA)GetProcAddress(hDll,lpFuncName); + } + } #else - // Get address of non-unicode version of the dll function if it exists - fnDllWinMainA = (DllWinMainA)GetProcAddress(hDll,lpFuncName); - fnDllWinMainW = 0; - if (!fnDllWinMainA) { - // If first non-unicode function was not found, get the address - // of the other non-unicode function - lpFuncName[nStrLen] = 'A'; - lpFuncName[nStrLen+1] = 0; - fnDllWinMainA = (DllWinMainA)GetProcAddress(hDll,lpFuncName); - if (!fnDllWinMainA) { - // If non-unicode function was not found, get the address of the unicode function - lpFuncName[nStrLen] = 'W'; - fnDllWinMainW = (DllWinMainW)GetProcAddress(hDll,lpFuncName); - } - } -#endif - - free(lpFuncName); - - RegisterBlankClass(hInstance); - // Create a window so we can pass a window handle to - // the dll function; this is required - hWindow = CreateWindowEx(0,rundll32_wclass,rundll32_wtitle,0,CW_USEDEFAULT,0,CW_USEDEFAULT,0,0,0,hInstance,0); - - if (fnDllWinMainW) { - // Convert the command-line string to unicode and call the dll function - lpwCmdLine = ConvertToWideChar(lptCmdLine); - nRetVal = fnDllWinMainW(hWindow,hInstance,lpwCmdLine,nCmdShow); - FreeConvertedWideChar(lpwCmdLine); - } - else if (fnDllWinMainA) { - // Convert the command-line string to ansi and call the dll function - lpaCmdLine = ConvertToMultiByte(lptCmdLine); - nRetVal = fnDllWinMainA(hWindow,hInstance,lpaCmdLine,nCmdShow); - FreeConvertedMultiByte(lpaCmdLine); - } - else { - // The specified dll function was not found; display an error message - GetModuleTitle(); + // Get address of non-unicode version of the dll function if it exists + fnDllWinMainA = (DllWinMainA)GetProcAddress(hDll,lpFuncName); + fnDllWinMainW = 0; + if (!fnDllWinMainA) { + // If first non-unicode function was not found, get the address + // of the other non-unicode function + lpFuncName[nStrLen] = 'A'; + lpFuncName[nStrLen+1] = 0; + fnDllWinMainA = (DllWinMainA)GetProcAddress(hDll,lpFuncName); + if (!fnDllWinMainA) { + // If non-unicode function was not found, get the address of the unicode function + lpFuncName[nStrLen] = 'W'; + fnDllWinMainW = (DllWinMainW)GetProcAddress(hDll,lpFuncName); + } + } +#endif + + free(lpFuncName); + + if (!RegisterBlankClass(hInstance, hPrevInstance)) + { + return 0; + } + // Create a window so we can pass a window handle to + // the dll function; this is required + hWindow = CreateWindowEx(0,rundll32_wclass,rundll32_wtitle,0,CW_USEDEFAULT,0,CW_USEDEFAULT,0,0,0,hInstance,0); + + if (fnDllWinMainW) { + // Convert the command-line string to unicode and call the dll function + lpwCmdLine = ConvertToWideChar(lptCmdLine); + nRetVal = fnDllWinMainW(hWindow,hInstance,lpwCmdLine,nCmdShow); + FreeConvertedWideChar(lpwCmdLine); + } + else if (fnDllWinMainA) { + // Convert the command-line string to ansi and call the dll function + lpaCmdLine = ConvertToMultiByte(lptCmdLine); + nRetVal = fnDllWinMainA(hWindow,hInstance,lpaCmdLine,nCmdShow); + FreeConvertedMultiByte(lpaCmdLine); + } + else { + // The specified dll function was not found; display an error message + GetModuleTitle(); LoadString( GetModuleHandle(NULL), IDS_MissingEntry, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - lptMsgBuffer = (LPTSTR)malloc((_tcslen(szMsg) - 4 + _tcslen(lptFuncName) + _tcslen(lptDllName) + 1) * sizeof(TCHAR)); - _stprintf(lptMsgBuffer,szMsg,lptFuncName,lptDllName); - MessageBox(0,lptMsgBuffer,ModuleTitle,MB_ICONERROR); - free(lptMsgBuffer); - } - - DestroyWindow(hWindow); - UnregisterClass(rundll32_wclass,hInstance); - - // The dll function has finished executing, so unload it - FreeLibrary(hDll); - } - else { - // The dll could not be loaded; display an error message - GetModuleTitle(); - LoadString( GetModuleHandle(NULL), IDS_DllNotLoaded, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - - lptMsgBuffer = (LPTSTR)malloc((_tcslen(szMsg) - 2 + _tcslen(lptDllName) + 1) * sizeof(TCHAR)); - _stprintf(lptMsgBuffer,szMsg,lptDllName); - - MessageBox(0,lptMsgBuffer,ModuleTitle,MB_ICONERROR); - free(lptMsgBuffer); - } - - if (argv) free(argv); - return nRetVal; -} - + lptMsgBuffer = (LPTSTR)malloc((_tcslen(szMsg) - 4 + _tcslen(lptFuncName) + _tcslen(lptDllName) + 1) * sizeof(TCHAR)); + _stprintf(lptMsgBuffer,szMsg,lptFuncName,lptDllName); + MessageBox(0,lptMsgBuffer,ModuleTitle,MB_ICONERROR); + free(lptMsgBuffer); + } + + DestroyWindow(hWindow); + UnregisterClass(rundll32_wclass,hInstance); + + // The dll function has finished executing, so unload it + FreeLibrary(hDll); + } + else { + // The dll could not be loaded; display an error message + GetModuleTitle(); + LoadString( GetModuleHandle(NULL), IDS_DllNotLoaded, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + + lptMsgBuffer = (LPTSTR)malloc((_tcslen(szMsg) - 2 + _tcslen(lptDllName) + 1) * sizeof(TCHAR)); + _stprintf(lptMsgBuffer,szMsg,lptDllName); + + MessageBox(0,lptMsgBuffer,ModuleTitle,MB_ICONERROR); + free(lptMsgBuffer); + } + + if (argv) free(argv); + return nRetVal; +} +

1 0

[dchapyshev] 32388: - Add libpng 1.2.24 (from libpng.org)
by dchapyshev＠svn.reactos.org 16 Feb '08

16 Feb '08

Author: dchapyshev Date: Sat Feb 16 19:23:33 2008 New Revision: 32388 URL: http://svn.reactos.org/svn/reactos?rev=32388&view=rev Log: - Add libpng 1.2.24 (from libpng.org) Added: trunk/rosapps/lib/libpng/ trunk/rosapps/lib/libpng/docs/ trunk/rosapps/lib/libpng/docs/ANNOUNCE (with props) trunk/rosapps/lib/libpng/docs/CHANGES (with props) trunk/rosapps/lib/libpng/docs/INSTALL (with props) trunk/rosapps/lib/libpng/docs/KNOWNBUG (with props) trunk/rosapps/lib/libpng/docs/LICENSE (with props) trunk/rosapps/lib/libpng/docs/README (with props) trunk/rosapps/lib/libpng/docs/TODO (with props) trunk/rosapps/lib/libpng/docs/Y2KINFO (with props) trunk/rosapps/lib/libpng/docs/example.c (with props) trunk/rosapps/lib/libpng/docs/libpng-1.2.24.txt (with props) trunk/rosapps/lib/libpng/libpng.rbuild (with props) trunk/rosapps/lib/libpng/png.c (with props) trunk/rosapps/lib/libpng/png.h (with props) trunk/rosapps/lib/libpng/pngconf.h (with props) trunk/rosapps/lib/libpng/pngerror.c (with props) trunk/rosapps/lib/libpng/pnggccrd.c (with props) trunk/rosapps/lib/libpng/pngget.c (with props) trunk/rosapps/lib/libpng/pngmem.c (with props) trunk/rosapps/lib/libpng/pngpread.c (with props) trunk/rosapps/lib/libpng/pngread.c (with props) trunk/rosapps/lib/libpng/pngrio.c (with props) trunk/rosapps/lib/libpng/pngrtran.c (with props) trunk/rosapps/lib/libpng/pngrutil.c (with props) trunk/rosapps/lib/libpng/pngset.c (with props) trunk/rosapps/lib/libpng/pngtest.c (with props) trunk/rosapps/lib/libpng/pngtrans.c (with props) trunk/rosapps/lib/libpng/pngvcrd.c (with props) trunk/rosapps/lib/libpng/pngwio.c (with props) trunk/rosapps/lib/libpng/pngwrite.c (with props) trunk/rosapps/lib/libpng/pngwtran.c (with props) trunk/rosapps/lib/libpng/pngwutil.c (with props) Modified: trunk/rosapps/lib/directory.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rosapps/lib/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/directory.rbuild?rev=3… Added: trunk/rosapps/lib/libpng/docs/ANNOUNCE URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/docs/ANNOUNCE?r… Added: trunk/rosapps/lib/libpng/docs/CHANGES URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/docs/CHANGES?re… Added: trunk/rosapps/lib/libpng/docs/INSTALL URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/docs/INSTALL?re… Added: trunk/rosapps/lib/libpng/docs/KNOWNBUG URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/docs/KNOWNBUG?r… Added: trunk/rosapps/lib/libpng/docs/LICENSE URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/docs/LICENSE?re… Added: trunk/rosapps/lib/libpng/docs/README URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/docs/README?rev… Added: trunk/rosapps/lib/libpng/docs/TODO URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/docs/TODO?rev=3… Added: trunk/rosapps/lib/libpng/docs/Y2KINFO URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/docs/Y2KINFO?re… Added: trunk/rosapps/lib/libpng/docs/example.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/docs/example.c?… Added: trunk/rosapps/lib/libpng/docs/libpng-1.2.24.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/docs/libpng-1.2… Added: trunk/rosapps/lib/libpng/libpng.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/libpng.rbuild?r… Added: trunk/rosapps/lib/libpng/png.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/png.c?rev=32388… Added: trunk/rosapps/lib/libpng/png.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/png.h?rev=32388… Added: trunk/rosapps/lib/libpng/pngconf.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngconf.h?rev=3… Added: trunk/rosapps/lib/libpng/pngerror.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngerror.c?rev=… Added: trunk/rosapps/lib/libpng/pnggccrd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pnggccrd.c?rev=… Added: trunk/rosapps/lib/libpng/pngget.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngget.c?rev=32… Added: trunk/rosapps/lib/libpng/pngmem.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngmem.c?rev=32… Added: trunk/rosapps/lib/libpng/pngpread.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngpread.c?rev=… Added: trunk/rosapps/lib/libpng/pngread.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngread.c?rev=3… Added: trunk/rosapps/lib/libpng/pngrio.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngrio.c?rev=32… Added: trunk/rosapps/lib/libpng/pngrtran.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngrtran.c?rev=… Added: trunk/rosapps/lib/libpng/pngrutil.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngrutil.c?rev=… Added: trunk/rosapps/lib/libpng/pngset.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngset.c?rev=32… Added: trunk/rosapps/lib/libpng/pngtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngtest.c?rev=3… Added: trunk/rosapps/lib/libpng/pngtrans.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngtrans.c?rev=… Added: trunk/rosapps/lib/libpng/pngvcrd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngvcrd.c?rev=3… Added: trunk/rosapps/lib/libpng/pngwio.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngwio.c?rev=32… Added: trunk/rosapps/lib/libpng/pngwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngwrite.c?rev=… Added: trunk/rosapps/lib/libpng/pngwtran.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngwtran.c?rev=… Added: trunk/rosapps/lib/libpng/pngwutil.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngwutil.c?rev=…

1 0

[dchapyshev] 32387: - Update Russian translation
by dchapyshev＠svn.reactos.org 16 Feb '08

16 Feb '08

Author: dchapyshev Date: Sat Feb 16 18:26:00 2008 New Revision: 32387 URL: http://svn.reactos.org/svn/reactos?rev=32387&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc Sat Feb 16 18:26:00 2008 @@ -256,7 +256,7 @@ EDITTEXT IDC_KERNEL_MEMORY_NONPAGED,185,193,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER GROUPBOX "Õðîíîëîãèÿ çàãðóçêè ÖÏ",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT - GROUPBOX "Õðîíîëîãèÿ èñïîëüçîâàíèÿ ïàìÿòè",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT + GROUPBOX "Õðîíîëîãèÿ èñïîëüçîâàíèÿ ôàéëà ïîäêà÷êè",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT PUSHBUTTON "Îòîáðàæåíèå çàãðóçêè ÖÏ",IDC_CPU_USAGE_GRAPH,12,17,47,37,0, WS_EX_CLIENTEDGE PUSHBUTTON "Îòîáðàæåíèå èñïîëüçîâàíèÿ ïàìÿòè",IDC_MEM_USAGE_GRAPH,12,75,47,37,0, @@ -609,16 +609,16 @@ BEGIN IDS_TAB_APPS "Ïðèëîæåíèÿ" IDS_TAB_PROCESSES "Ïðîöåññû" - IDS_TAB_PERFORMANCE "Ïðîèçâîäèòåëüíîñòü" + IDS_TAB_PERFORMANCE "Áûñòðîäåéñòâèå" IDS_TAB_TASK "Çàäà÷à" - IDS_TAB_STATUS "Ñòàòóñ" + IDS_TAB_STATUS "Ñîñòîÿíèå" IDS_TAB_IMAGENAME "Èìÿ îáðàçà" IDS_TAB_PID "PID" IDS_TAB_USERNAME "Èìÿ ïîëüçîâàòåëÿ" IDS_TAB_SESSIONID "Êîä ñåàíñà" IDS_TAB_CPU "ÖÏ" IDS_TAB_CPUTIME "Âðåìÿ ÖÏ" - IDS_TAB_MEMUSAGE "Èñïîëüçîâàíèå ïàìÿòè" + IDS_TAB_MEMUSAGE "Ïàìÿòü" IDS_TAB_PEAKMEMUSAGE "Ïàìÿòü - ìàêñèìóì" IDS_TAB_MEMDELTA "Ïàìÿòü - èçìåíåíèå" IDS_TAB_PAGEFAULT "Îøèáîê ñòðàíèöû" @@ -659,9 +659,9 @@ IDS_MSG_UNABLETERMINATEPRO "Íå óäàëîñü çàâåðøèòü ïðîöåññ" IDS_MSG_UNABLECHANGEPRIORITY "Íå óäàëîñü èçìåíèòü ïðèîðèòåò" IDS_MSG_WARNINGCHANGEPRIORITY "ÂÍÈÌÀÍÈÅ: Èçìåíåíèå ïðèîðèòåòà ìîæåò ïîâëå÷ íåóñòîé÷èâóþ ðàáîòó è ïîòåðþ äàííûõ.\nÂû óâåðåíû, ÷òî ìîæíî ïðîäîëæàòü?" - IDS_MSG_TRAYICONCPUUSAGE "Èñïîëüçîâàíèå ÖÏ: %d%%" - IDS_STATUS_MEMUSAGE "Èñïîëüçîâàíèå ïàìÿòè: %dK / %dK" - IDS_STATUS_CPUUSAGE "Èñïîëüçîâàíèå ÖÏ: %3d%%" + IDS_MSG_TRAYICONCPUUSAGE "Çàãðóçêà ÖÏ: %d%%" + IDS_STATUS_MEMUSAGE "Âûäåëåíèå ïàìÿòè: %dK / %dK" + IDS_STATUS_CPUUSAGE "Çàãðóçêà ÖÏ: %3d%%" IDS_STATUS_PROCESSES "Ïðîöåññîâ: %d" IDS_Not_Responding "Íå îòâå÷àåò" IDS_Running "Ðàáîòàåò"

1 0

[fireball] 32386: - Add a hacked and incorrect (due to absence of checking for BIOS-reserved memory areas) MiInitializePageList from 32371. This allows 1st stage to work, and 2nd stage to work from the first power up. - Real, new, [bugless] MiInitializePageList is #if0-#endif'ed until a problem in it is identified and fixed.
by fireball＠svn.reactos.org 16 Feb '08

16 Feb '08

Author: fireball Date: Sat Feb 16 17:56:56 2008 New Revision: 32386 URL: http://svn.reactos.org/svn/reactos?rev=32386&view=rev Log: - Add a hacked and incorrect (due to absence of checking for BIOS-reserved memory areas) MiInitializePageList from 32371. This allows 1st stage to work, and 2nd stage to work from the first power up. - Real, new, [bugless] MiInitializePageList is #if0-#endif'ed until a problem in it is identified and fixed. Modified: trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Sat Feb 16 17:56:56 2008 @@ -20,6 +20,8 @@ #define KERNEL_RVA(x) RVA(x,KSEG0_BASE) #define KERNEL_DESCRIPTOR_PAGE(x) (((ULONG_PTR)x &~ KSEG0_BASE) >> PAGE_SHIFT) #endif + +ULONG MmFreeLdrPageDirectoryEnd; typedef struct _BIOS_MEMORY_DESCRIPTOR { @@ -920,6 +922,8 @@ /* First get some kernel-loader globals */ AcpiTableDetected = (RosLoaderBlock->Flags & MB_FLAGS_ACPI_TABLE) ? TRUE : FALSE; + MmFreeLdrPageDirectoryEnd = RosLoaderBlock->PageDirectoryEnd; + if (!MmFreeLdrPageDirectoryEnd) MmFreeLdrPageDirectoryEnd = 0x40000; /* Set the NT Loader block and initialize it */ *NtLoaderBlock = KeLoaderBlock = LoaderBlock = &BldrLoaderBlock; Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Sat Feb 16 17:56:56 2008 @@ -251,6 +251,7 @@ return Pfn; } +#if 0 VOID NTAPI MmInitializePageList(VOID) @@ -312,8 +313,8 @@ UsedPage.Flags.Consumer = MC_NPPOOL; UsedPage.ReferenceCount = 2; UsedPage.MapCount = 1; - - /* Loop the memory descriptors */ + + /* Loop the memory descriptors */ for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; NextEntry = NextEntry->Flink) @@ -322,7 +323,7 @@ Md = CONTAINING_RECORD(NextEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); - + /* Skip bad memory */ if ((Md->MemoryType == LoaderFirmwarePermanent) || (Md->MemoryType == LoaderBBTMemory) || @@ -354,7 +355,7 @@ InsertTailList(&FreeUnzeroedPageListHead, &MmPageArray[Md->BasePage + i].ListEntry); UnzeroedPageCount++; - MmStats.NrFreePages++; + MmStats.NrFreePages++; } } else @@ -380,8 +381,201 @@ } KeInitializeEvent(&ZeroPageThreadEvent, NotificationEvent, TRUE); + + DPRINT("Pages: %x %x\n", MmStats.NrFreePages, MmStats.NrSystemPages); + MmStats.NrTotalPages = MmStats.NrFreePages + MmStats.NrSystemPages + MmStats.NrUserPages; + MmInitializeBalancer(MmStats.NrFreePages, MmStats.NrSystemPages); +} +#endif + +VOID +NTAPI +MmInitializePageList() +{ + ULONG i; + ULONG Reserved; + NTSTATUS Status; + PFN_TYPE Pfn = 0; + PHYSICAL_PAGE UsedPage; + ULONG PdeStart = PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart; + ULONG PdePageStart, PdePageEnd; + ULONG VideoPageStart, VideoPageEnd; + ULONG KernelPageStart, KernelPageEnd; + ULONG_PTR KernelStart, KernelEnd; + extern ULONG MiKSeg0Start, MiKSeg0End, MmFreeLdrPageDirectoryEnd; + + /* Initialize the page lists */ + KeInitializeSpinLock(&PageListLock); + InitializeListHead(&UserPageListHead); + InitializeListHead(&FreeUnzeroedPageListHead); + InitializeListHead(&FreeZeroedPageListHead); + + DPRINT1("HACK: Using old incorrect MmInitializePageList(). " + "Please bugfix the new version and delete this one\n"); + + /* Set the size and start of the PFN Database */ + MmPageArray = (PHYSICAL_PAGE *)MmPfnDatabase; + MmPageArraySize = MmHighestPhysicalPage; + Reserved = PAGE_ROUND_UP((MmPageArraySize * sizeof(PHYSICAL_PAGE))) / PAGE_SIZE; + + /* Loop every page required to hold the PFN database */ + for (i = 0; i < Reserved; i++) + { + PVOID Address = (char*)MmPageArray + (i * PAGE_SIZE); + + /* Check if FreeLDR has already allocated it for us */ + if (!MmIsPagePresent(NULL, Address)) + { + /* Use one of our highest usable pages */ + Pfn = MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount - 1; + MiFreeDescriptor->PageCount--; + + /* Set the PFN */ + Status = MmCreateVirtualMappingForKernel(Address, + PAGE_READWRITE, + &Pfn, + 1); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to create virtual mapping\n"); + KEBUGCHECK(0); + } + } + else + { + /* Setting the page protection is necessary to set the global bit */ + MmSetPageProtect(NULL, Address, PAGE_READWRITE); + } + } + + /* Clear the PFN database */ + RtlZeroMemory(MmPageArray, (MmPageArraySize + 1) * sizeof(PHYSICAL_PAGE)); + + /* This is what a used page looks like */ + RtlZeroMemory(&UsedPage, sizeof(UsedPage)); + UsedPage.Flags.Type = MM_PHYSICAL_PAGE_USED; + UsedPage.Flags.Consumer = MC_NPPOOL; + UsedPage.ReferenceCount = 2; + UsedPage.MapCount = 1; + + /* We'll be applying a bunch of hacks -- precompute some static values */ + KernelStart = MiKSeg0Start - KSEG0_BASE; + KernelEnd = MiKSeg0End - KSEG0_BASE; + PdePageStart = PdeStart / PAGE_SIZE; + PdePageEnd = MmFreeLdrPageDirectoryEnd / PAGE_SIZE; + VideoPageStart = 0xA0000 / PAGE_SIZE; + VideoPageEnd = 0x100000 / PAGE_SIZE; + KernelPageStart = KernelStart / PAGE_SIZE; + KernelPageEnd = KernelEnd / PAGE_SIZE; + // Glorious Hack: + // The kernel seems to crash if the region of memory that FreeLDR maps + // (those evil 6MB) is not *entirely* marked "in use", even though only + // 3 or 4MB of it may actually be in use. + // This wasn't noticed before, because the PFN database pages which are + // *VIRTUALLY* continous after the kernel end were also marked as + // *PHYSICALLY* continous (even though they were allocated at the very far + // end of physical memory). + // + // So we'll simply gobble up whatever is left of what FreeLDR mapped. + // + // PS. This is really sinister + // + KernelEnd += (KernelStart + 0x600000) - KernelEnd; + KernelPageEnd = KernelEnd / PAGE_SIZE; + + /* Loop every page on the system */ + for (i = 0; i <= MmPageArraySize; i++) + { + /* Check if it's part of RAM */ + if (/*MiIsPfnRam(BIOSMemoryMap, AddressRangeCount, i)*/TRUE) + { + /* Apply assumptions that all computers are built the same way */ + if (i == 0) + { + /* Page 0 is reserved for the IVT */ + MmPageArray[i] = UsedPage; + MmStats.NrSystemPages++; + } + else if (i == 1) + { + /* Page 1 is reserved for the PCR */ + MmPageArray[i] = UsedPage; + MmStats.NrSystemPages++; + } + else if (i == 2) + { + /* Page 2 is reserved for the KUSER_SHARED_DATA */ + MmPageArray[i] = UsedPage; + MmStats.NrSystemPages++; + } + else if ((i >= PdePageStart) && (i < PdePageEnd)) + { + /* These pages contain the initial FreeLDR PDEs */ + MmPageArray[i] = UsedPage; + MmStats.NrSystemPages++; + } + else if ((i >= VideoPageStart) && (i < VideoPageEnd)) + { + /* + * These pages are usually for the Video ROM BIOS. + * Supposedly anyway. We'll simply ignore the fact that + * many systems have this area somewhere else entirely + * (which we'll assume to be "free" a couple of lines below) + */ + MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; + MmPageArray[i].Flags.Consumer = MC_NPPOOL; + MmStats.NrSystemPages++; + } + else if ((i >= KernelPageStart) && (i < KernelPageEnd)) + { + /* These are pages beloning to the kernel */ + MmPageArray[i] = UsedPage; + MmStats.NrSystemPages++; + } + else if (i >= (MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount)) + { + /* These are pages we allocated above to hold the PFN DB */ + MmPageArray[i] = UsedPage; + MmStats.NrSystemPages++; + } + else + { + /* + * These are supposedly free pages. + * By the way, not all of them are, some contain vital + * FreeLDR data, but since we choose to ignore the Memory + * Descriptor List, why bother, right? + */ + MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_FREE; + MmPageArray[i].ReferenceCount = 0; + InsertTailList(&FreeUnzeroedPageListHead, + &MmPageArray[i].ListEntry); + UnzeroedPageCount++; + MmStats.NrFreePages++; + } + } + else + { + /* These are pages reserved by the BIOS/ROMs */ + MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; + MmPageArray[i].Flags.Consumer = MC_NPPOOL; + MmStats.NrSystemPages++; + } + } + + KeInitializeEvent(&ZeroPageThreadEvent, NotificationEvent, TRUE); DPRINT("Pages: %x %x\n", MmStats.NrFreePages, MmStats.NrSystemPages); + /* + DPRINT1("Unzeroed pages: %x\n", UnzeroedPageCount); + { + ULONG j = 0; + for (j=0; j<=MmPageArraySize; j++) + { + if (j % 0x10 == 0) DbgPrint ("\n0x%x\t", j); + DbgPrint("0x%x\t", MmPageArray[j].AllFlags); + } + }*/ MmStats.NrTotalPages = MmStats.NrFreePages + MmStats.NrSystemPages + MmStats.NrUserPages; MmInitializeBalancer(MmStats.NrFreePages, MmStats.NrSystemPages); }

1 0

[gbrunmar] 32385: Implemented IDirect3D::GetDeviceCaps()
by gbrunmar＠svn.reactos.org 16 Feb '08

16 Feb '08

Author: gbrunmar Date: Sat Feb 16 14:17:46 2008 New Revision: 32385 URL: http://svn.reactos.org/svn/reactos?rev=32385&view=rev Log: Implemented IDirect3D::GetDeviceCaps() Modified: trunk/reactos/dll/directx/d3d9/adapter.c trunk/reactos/dll/directx/d3d9/adapter.h trunk/reactos/dll/directx/d3d9/d3d9_create.c trunk/reactos/dll/directx/d3d9/d3d9_impl.c trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/adapter.c… ============================================================================== --- trunk/reactos/dll/directx/d3d9/adapter.c (original) +++ trunk/reactos/dll/directx/d3d9/adapter.c Sat Feb 16 14:17:46 2008 @@ -6,12 +6,24 @@ * PROGRAMERS: Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> */ +#define _WIN32_WINNT 0x0502 #include "d3d9_common.h" #include <d3d9.h> #include <ddraw.h> #include <strsafe.h> #include <debug.h> +#include "d3d9_private.h" #include "adapter.h" + +#define D3D9_CAPS1 (D3DCAPS_READ_SCANLINE) +#define D3D9_PRE_XP_CAPS2 (D3DCAPS2_CANAUTOGENMIPMAP | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_RESERVED | D3DCAPS2_FULLSCREENGAMMA) +#define D3D9_XP_OR_LATER_CAPS2 (D3D9_PRE_XP_CAPS2 | D3DCAPS2_CANMANAGERESOURCE) +#define D3D9_CAPS3 (D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD | D3DCAPS3_LINEAR_TO_SRGB_PRESENTATION | D3DCAPS3_COPY_TO_VIDMEM | D3DCAPS3_COPY_TO_SYSTEMMEM) + +#define D3DCAPS2_PRESENT_INTERVAL_SEVERAL 0x00200000 +#define D3DCAPS2_PRESENT_INTERVAL_IMMEDIATE 0x00400000 + +#define D3DVTXPCAPS_FOGVERTEX 0x00000004 typedef BOOL (WINAPI *LPFN_ISWOW64PROCESS) (HANDLE, PBOOL); typedef BOOL (WINAPI *LPFN_DISABLEWOW64FSREDIRECTION) (PVOID*); @@ -165,6 +177,98 @@ GenerateDeviceIdentifier(pIdentifier); return TRUE; +} + + + +static BOOL IsWindowsXPorLaterCompatible() +{ + OSVERSIONINFOA osvi; + + ZeroMemory(&osvi, sizeof(OSVERSIONINFOA)); + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA); + + if (GetVersionExA(&osvi) != 0) + { + return ( (osvi.dwMajorVersion > 5) || + ( (osvi.dwMajorVersion == 5) && (osvi.dwMinorVersion >= 1) )); + } + + return FALSE; +} + +static void CopyDriverCaps(const D3DCAPS9* pSrcCaps, D3DCAPS9* pDstCaps) +{ + *pDstCaps = *pSrcCaps; + + pDstCaps->Caps = pSrcCaps->Caps & D3D9_CAPS1; + + /* TODO: Fit in D3DCAPS2_CANCALIBRATEGAMMA somewhere here */ + if (IsWindowsXPorLaterCompatible()) + pDstCaps->Caps2 = pSrcCaps->Caps2 & D3D9_XP_OR_LATER_CAPS2; + else + pDstCaps->Caps2 = pSrcCaps->Caps2 & D3D9_PRE_XP_CAPS2; + + pDstCaps->Caps3 = pSrcCaps->Caps3 & D3D9_CAPS3; + + pDstCaps->PresentationIntervals = D3DPRESENT_INTERVAL_ONE; + if (pSrcCaps->Caps2 & D3DCAPS2_PRESENT_INTERVAL_SEVERAL) + pDstCaps->PresentationIntervals |= (D3DPRESENT_INTERVAL_TWO | D3DPRESENT_INTERVAL_THREE | D3DPRESENT_INTERVAL_FOUR); + if (pSrcCaps->Caps2 & D3DCAPS2_PRESENT_INTERVAL_IMMEDIATE) + pDstCaps->PresentationIntervals |= D3DPRESENT_INTERVAL_IMMEDIATE; + + pDstCaps->PrimitiveMiscCaps = pSrcCaps->PrimitiveMiscCaps & ~D3DPMISCCAPS_SEPERATEFVFFOG; + + if (pSrcCaps->VertexProcessingCaps & D3DVTXPCAPS_FOGVERTEX) + { + pDstCaps->RasterCaps |= D3DPRASTERCAPS_FOGVERTEX; + pDstCaps->VertexProcessingCaps &= ~D3DVTXPCAPS_FOGVERTEX; + } + + if (pSrcCaps->MaxPointSize < 0.0f) + pDstCaps->MaxPointSize = 1.0f; +} + +HRESULT GetAdapterCaps(const LPDIRECT3D9_DISPLAYADAPTER_INT pDisplayAdapter, D3DDEVTYPE DeviceType, D3DCAPS9* pDstCaps) +{ + HRESULT hResult = D3DERR_INVALIDDEVICE; + LPD3D9_DRIVERCAPS pDriverCaps = NULL; + + ZeroMemory(pDstCaps, sizeof(D3DCAPS9)); + + switch (DeviceType) + { + case D3DDEVTYPE_HAL: + pDriverCaps = &pDisplayAdapter->DriverCaps; + hResult = D3D_OK; + break; + + case D3DDEVTYPE_REF: + case D3DDEVTYPE_SW: + case D3DDEVTYPE_NULLREF: + UNIMPLEMENTED; + hResult = D3D_OK; + break; + + default: + DPRINT1("Unknown DeviceType argument"); + break; + } + + if (pDriverCaps != NULL) + { + CopyDriverCaps(&pDriverCaps->DriverCaps, pDstCaps); + } + + if (SUCCEEDED(hResult)) + { + pDstCaps->DeviceType = DeviceType; + pDstCaps->MasterAdapterOrdinal = pDisplayAdapter->MasterAdapterIndex; + pDstCaps->AdapterOrdinalInGroup = pDisplayAdapter->AdapterIndexInGroup; + pDstCaps->NumberOfAdaptersInGroup = pDisplayAdapter->NumAdaptersInGroup; + } + + return hResult; } Modified: trunk/reactos/dll/directx/d3d9/adapter.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/adapter.h… ============================================================================== --- trunk/reactos/dll/directx/d3d9/adapter.h (original) +++ trunk/reactos/dll/directx/d3d9/adapter.h Sat Feb 16 14:17:46 2008 @@ -13,6 +13,8 @@ BOOL GetAdapterMode(LPCSTR lpszDeviceName, D3DDISPLAYMODE* pMode); +HRESULT GetAdapterCaps(const LPDIRECT3D9_DISPLAYADAPTER_INT pDisplayAdapter, D3DDEVTYPE DeviceType, D3DCAPS9* pDstCaps); + HMONITOR GetAdapterMonitor(LPCSTR lpszDeviceName); UINT GetDisplayFormatCount(D3DFORMAT Format, const D3DDISPLAYMODE* pSupportedDisplayModes, UINT NumDisplayModes); Modified: trunk/reactos/dll/directx/d3d9/d3d9_create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_crea… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_create.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_create.c Sat Feb 16 14:17:46 2008 @@ -6,8 +6,7 @@ * PROGRAMERS: Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> */ -typedef struct IDirect3D9 *LPDIRECT3D9; - +#include <d3d9.h> #include "d3d9_create.h" #include "d3d9_helpers.h" #include <debug.h> Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_impl… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c Sat Feb 16 14:17:46 2008 @@ -312,7 +312,8 @@ * If the method successfully fills the pMode structure, the return value is D3D_OK. * If Adapter is out of range or pMode is a bad pointer, the return value will be D3DERR_INVALIDCALL. * -*/static HRESULT WINAPI IDirect3D9Impl_GetAdapterDisplayMode(LPDIRECT3D9 iface, UINT Adapter, D3DDISPLAYMODE* pMode) +*/ +static HRESULT WINAPI IDirect3D9Impl_GetAdapterDisplayMode(LPDIRECT3D9 iface, UINT Adapter, D3DDISPLAYMODE* pMode) { LPDIRECT3D9_INT This = impl_from_IDirect3D9(iface); LOCK_D3D9(); @@ -382,11 +383,58 @@ return D3D_OK; } + +/*++ +* @name IDirect3D9::GetDeviceCaps +* @implemented +* +* The function IDirect3D9Impl_GetDeviceCaps fills the pCaps argument with the +* capabilities of the specified adapter and device type. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3D object returned from Direct3DCreate9() +* +* @param UINT Adapter +* Adapter index to get information about. D3DADAPTER_DEFAULT is the primary display. +* The maximum value for this is the value returned by IDirect3D::GetAdapterCount(). +* +* @param D3DDEVTYPE DeviceType +* One of the D3DDEVTYPE enum members. +* NOTE: Currently only D3DDEVTYPE_HAL is implemented. +* +* @param D3DCAPS9* pCaps +* Pointer to a D3DCAPS9 structure to be filled with the adapter's device type capabilities. +* +* @return HRESULT +* If the method successfully fills the pCaps structure, the return value is D3D_OK. +* If Adapter is out of range or pCaps is a bad pointer, the return value will be D3DERR_INVALIDCALL. +* If DeviceType is invalid, the return value will be D3DERR_INVALIDDEVICE. +* +*/ static HRESULT WINAPI IDirect3D9Impl_GetDeviceCaps(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DCAPS9* pCaps) { - UNIMPLEMENTED - - return D3D_OK; + HRESULT hResult; + LPDIRECT3D9_INT This = impl_from_IDirect3D9(iface); + LOCK_D3D9(); + + if (Adapter >= This->NumDisplayAdapters) + { + DPRINT1("Invalid Adapter number specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (IsBadWritePtr(pCaps, sizeof(D3DCAPS9))) + { + DPRINT1("Invalid pCaps parameter specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + hResult = GetAdapterCaps(&This->DisplayAdapters[Adapter], DeviceType, pCaps); + + UNLOCK_D3D9(); + return hResult; } /*++ Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h Sat Feb 16 14:17:46 2008 @@ -12,96 +12,26 @@ #define DX_D3D9_MAX_NUM_ADAPTERS 12 +typedef struct _tagD3D9_DRIVERCAPS +{ + D3DCAPS9 DriverCaps; +} D3D9_DRIVERCAPS, FAR* LPD3D9_DRIVERCAPS; + typedef struct _tagDIRECT3D9DisplayAdapterInfo_ { /* 0x0000 */ GUID DisplayGuid; /* 0x0010 */ CHAR szDeviceName[MAX_PATH]; /* 0x0114 */ DWORD dwStateFlags; /* 0x0118 */ BOOL bInUseFlag; -/* 0x011c */ DWORD unknown000002; -/* 0x0120 */ DWORD unknown000003; -/* 0x0124 */ DWORD unknown000004; /* 0x00000001 */ +/* 0x011c */ DWORD MasterAdapterIndex; +/* 0x0120 */ DWORD AdapterIndexInGroup; +/* 0x0124 */ DWORD NumAdaptersInGroup; /* 0x00000001 */ /* 0x0128 */ DWORD NumSupportedD3DFormats; /* 0x012c */ DWORD NumSupportedD3DExtendedFormats; /* 0x0130 */ D3DDISPLAYMODE* pSupportedD3DFormats; /* 0x0134 */ D3DDISPLAYMODE* pSupportedD3DExtendedFormats; /* 0x0138 */ DWORD unknown000009; -/* 0x013c */ DWORD unknown000010; /* D3D9_DRIVERCAPS? */ -/* 0x0140 */ DWORD unknown000011; -/* 0x0144 */ DWORD unknown000012; -/* 0x0148 */ DWORD unknown000013; -/* 0x014c */ DWORD unknown000014; -/* 0x0150 */ DWORD unknown000015; -/* 0x0154 */ DWORD unknown000016; -/* 0x0158 */ DWORD unknown000017; -/* 0x015c */ DWORD unknown000018; -/* 0x0160 */ DWORD unknown000019; -/* 0x0164 */ DWORD unknown000020; -/* 0x0168 */ DWORD unknown000021; -/* 0x016c */ DWORD unknown000022; -/* 0x0170 */ DWORD unknown000023; -/* 0x0174 */ DWORD unknown000024; -/* 0x0178 */ DWORD unknown000025; -/* 0x017c */ DWORD unknown000026; -/* 0x0180 */ DWORD unknown000027; -/* 0x0184 */ DWORD unknown000028; -/* 0x0188 */ DWORD unknown000029; -/* 0x018c */ DWORD unknown000030; -/* 0x0190 */ DWORD unknown000031; -/* 0x0194 */ DWORD unknown000032; -/* 0x0198 */ DWORD unknown000033; -/* 0x019c */ DWORD unknown000034; -/* 0x01a0 */ DWORD unknown000035; -/* 0x01a4 */ DWORD unknown000036; -/* 0x01a8 */ DWORD unknown000037; -/* 0x01ac */ DWORD unknown000038; -/* 0x01b0 */ DWORD unknown000039; -/* 0x01b4 */ DWORD unknown000040; -/* 0x01b8 */ DWORD unknown000041; -/* 0x01bc */ DWORD unknown000042; -/* 0x01c0 */ DWORD unknown000043; -/* 0x01c4 */ DWORD unknown000044; -/* 0x01c8 */ DWORD unknown000045; -/* 0x01cc */ DWORD unknown000046; -/* 0x01d0 */ DWORD unknown000047; -/* 0x01d4 */ DWORD unknown000048; -/* 0x01d8 */ DWORD unknown000049; -/* 0x01dc */ DWORD unknown000050; -/* 0x01e0 */ DWORD unknown000051; -/* 0x01e4 */ DWORD unknown000052; -/* 0x01e8 */ DWORD unknown000053; -/* 0x01ec */ DWORD unknown000054; -/* 0x01f0 */ DWORD unknown000055; -/* 0x01f4 */ DWORD unknown000056; -/* 0x01f8 */ DWORD unknown000057; -/* 0x01fc */ DWORD unknown000058; -/* 0x0200 */ DWORD unknown000059; -/* 0x0204 */ DWORD unknown000060; -/* 0x0208 */ DWORD unknown000061; -/* 0x020c */ DWORD unknown000062; -/* 0x0210 */ DWORD unknown000063; -/* 0x0214 */ DWORD unknown000064; -/* 0x0218 */ DWORD unknown000065; -/* 0x021c */ DWORD unknown000066; -/* 0x0220 */ DWORD unknown000067; -/* 0x0224 */ DWORD unknown000068; -/* 0x0228 */ DWORD unknown000069; -/* 0x022c */ DWORD unknown000070; -/* 0x0230 */ DWORD unknown000071; -/* 0x0234 */ DWORD unknown000072; -/* 0x0238 */ DWORD unknown000073; -/* 0x023c */ DWORD unknown000074; -/* 0x0240 */ DWORD unknown000075; -/* 0x0244 */ DWORD unknown000076; -/* 0x0248 */ DWORD unknown000077; -/* 0x024c */ DWORD unknown000078; -/* 0x0250 */ DWORD unknown000079; -/* 0x0254 */ DWORD unknown000080; -/* 0x0258 */ DWORD unknown000081; -/* 0x025c */ DWORD unknown000082; -/* 0x0260 */ DWORD unknown000083; -/* 0x0264 */ DWORD unknown000084; -/* 0x0268 */ DWORD unknown000085; +/* 0x013c */ D3D9_DRIVERCAPS DriverCaps; /* 0x026c */ DWORD dwDisplayWidth; /* Current display res */ /* 0x0270 */ DWORD dwDisplayHeight; /* Current display res */ /* 0x0274 */ DWORD unknown000088; /* Current D3DFORMAT */ @@ -119,10 +49,10 @@ /* 0x02a4 */ DWORD unknown000100; /* 0x02a8 */ DWORD unknown000101; /*? 0xf7627000 */ /* 0x02ac */ DWORD unknown000102; /*? 0x00000002 */ -/* 0x02b0 */ DWORD unknown000103; /*? 0x001552A0 */ +/* 0x02b0 */ LPDWORD unknown000103; /*? 0x001552A0 */ /* 0x02b4 */ DWORD unknown000104; /* 0x02b8 */ DWORD unknown000105; -} Direct3D9DisplayAdapterInfo_INT, *LPDIRECT3D9_DISPLAYADAPTER_INT; +} Direct3D9DisplayAdapterInfo_INT, FAR* LPDIRECT3D9_DISPLAYADAPTER_INT; typedef struct _tagDIRECT3D9_INT_ {

1 0

[cfinck] 32384: - Add an option to use circles instead of markers for the users on the map - Add information about the added users, all users with location data and all users in total - Always enable scroll-wheel zoom, but add an event handler to not scroll the window when the mouse is over the map - Don't close the DB connections implicitly at the end of the scripts, always close them when they are not needed anymore - Firefox doesn't reset the check marks on a reload, so do that manually in so
by cfinck＠svn.reactos.org 15 Feb '08

15 Feb '08

Author: cfinck Date: Sat Feb 16 01:22:18 2008 New Revision: 32384 URL: http://svn.reactos.org/svn/reactos?rev=32384&view=rev Log: - Add an option to use circles instead of markers for the users on the map - Add information about the added users, all users with location data and all users in total - Always enable scroll-wheel zoom, but add an event handler to not scroll the window when the mouse is over the map - Don't close the DB connections implicitly at the end of the scripts, always close them when they are not needed anymore - Firefox doesn't reset the check marks on a reload, so do that manually in some cases BTW, Translators, feel free to translate the People Map UI! Added: trunk/web/reactos.org/htdocs/peoplemap/images/circle_blue.png (with props) trunk/web/reactos.org/htdocs/peoplemap/images/circle_cyan.png (with props) trunk/web/reactos.org/htdocs/peoplemap/images/circle_green.png (with props) trunk/web/reactos.org/htdocs/peoplemap/images/circle_lightgrey.png (with props) trunk/web/reactos.org/htdocs/peoplemap/images/circle_red.png (with props) trunk/web/reactos.org/htdocs/peoplemap/images/circle_violet.png (with props) trunk/web/reactos.org/htdocs/peoplemap/images/circle_white.png (with props) trunk/web/reactos.org/htdocs/peoplemap/images/circle_yellow.png (with props) Modified: trunk/web/reactos.org/htdocs/peoplemap/ajax-deletelocation.php trunk/web/reactos.org/htdocs/peoplemap/ajax-getuser.php trunk/web/reactos.org/htdocs/peoplemap/ajax-setlocation.php trunk/web/reactos.org/htdocs/peoplemap/ie6-fixes.css trunk/web/reactos.org/htdocs/peoplemap/index.php trunk/web/reactos.org/htdocs/peoplemap/lang/de.inc.php trunk/web/reactos.org/htdocs/peoplemap/lang/en.inc.php trunk/web/reactos.org/htdocs/peoplemap/peoplemap.css trunk/web/reactos.org/htdocs/peoplemap/peoplemap.js.php Modified: trunk/web/reactos.org/htdocs/peoplemap/ajax-deletelocation.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/a… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/ajax-deletelocation.php (original) +++ trunk/web/reactos.org/htdocs/peoplemap/ajax-deletelocation.php Sat Feb 16 01:22:18 2008 @@ -30,6 +30,7 @@ // Delete the location entry $query = "DELETE FROM $DB_PEOPLEMAP.user_locations WHERE roscms_user_id = $userid;"; mysql_query($query, $db) or die("<error>Query failed #2!</error>"); + mysql_close($db); // Just return a success state echo "<deleted />"; Modified: trunk/web/reactos.org/htdocs/peoplemap/ajax-getuser.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/a… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/ajax-getuser.php (original) +++ trunk/web/reactos.org/htdocs/peoplemap/ajax-getuser.php Sat Feb 16 01:22:18 2008 @@ -81,5 +81,6 @@ echo "</user>"; } + mysql_close($db); echo "</userinformation>"; ?> Modified: trunk/web/reactos.org/htdocs/peoplemap/ajax-setlocation.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/a… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/ajax-setlocation.php (original) +++ trunk/web/reactos.org/htdocs/peoplemap/ajax-setlocation.php Sat Feb 16 01:22:18 2008 @@ -43,6 +43,7 @@ $query = "SELECT user_name, user_fullname FROM $DB_ROSCMS.users WHERE user_id = $userid LIMIT 1;"; $result = mysql_query($query, $db) or die("<error>Query failed #3!</error>"); $row = mysql_fetch_row($result); + mysql_close($db); echo "<userinformation>"; echo "<user>"; Modified: trunk/web/reactos.org/htdocs/peoplemap/ie6-fixes.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/ie6-fixes.css (original) +++ trunk/web/reactos.org/htdocs/peoplemap/ie6-fixes.css Sat Feb 16 01:22:18 2008 @@ -12,8 +12,16 @@ } /* Show PNG's with alpha transparency through the AlphaImageLoader filter */ -#toolbox0_image, #toolbox1_image, #toolbox2_image { +#icon_marker, #icon_circle, #toolbox0_image, #toolbox1_image, #toolbox2_image { background: none; +} + +#icon_marker { + filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src="images/marker_white.png"); +} + +#icon_circle { + filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src="images/circle_white.png"); } #toolbox0_image { Added: trunk/web/reactos.org/htdocs/peoplemap/images/circle_blue.png URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/peoplemap/images/circle_blue.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/web/reactos.org/htdocs/peoplemap/images/circle_cyan.png URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/peoplemap/images/circle_cyan.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/web/reactos.org/htdocs/peoplemap/images/circle_green.png URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/peoplemap/images/circle_green.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/web/reactos.org/htdocs/peoplemap/images/circle_lightgrey.png URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/peoplemap/images/circle_lightgrey.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/web/reactos.org/htdocs/peoplemap/images/circle_red.png URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/peoplemap/images/circle_red.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/web/reactos.org/htdocs/peoplemap/images/circle_violet.png URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/peoplemap/images/circle_violet.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/web/reactos.org/htdocs/peoplemap/images/circle_white.png URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/peoplemap/images/circle_white.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/web/reactos.org/htdocs/peoplemap/images/circle_yellow.png URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/peoplemap/images/circle_yellow.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/web/reactos.org/htdocs/peoplemap/index.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/index.php (original) +++ trunk/web/reactos.org/htdocs/peoplemap/index.php Sat Feb 16 01:22:18 2008 @@ -88,7 +88,7 @@ <table width="100%" cellspacing="0" cellpadding="0"> <tr> - <td> + <td id="map_td"> <div class="bubble_bg"> <div class="rounded_ll"> <div class="rounded_lr"> @@ -110,6 +110,51 @@ </div> </td> <td id="toolbox_td"> + <div class="bubble_bg"> + <div class="rounded_ll"> + <div class="rounded_lr"> + <div class="rounded_ul"> + <div class="rounded_ur"> + + <div class="bubble"> + <div id="counttext"> + <?php + $db = mysql_connect($DB_HOST, $DB_USER, $DB_PASS) or die("Could not connect to the database!"); + + $query = "SELECT COUNT(*) FROM $DB_ROSCMS.users;"; + $result = mysql_query($query, $db); + $user_count = mysql_result($result, 0); + + $query = "SELECT COUNT(*) FROM $DB_PEOPLEMAP.user_locations;"; + $result = mysql_query($query, $db); + $location_count = mysql_result($result, 0); + + echo $peoplemap_langres["count1"] . "0" . $peoplemap_langres["count2"] . $location_count . $peoplemap_langres["count3"] . $user_count . $peoplemap_langres["count4"]; + + echo "<script type=\"text/javascript\">"; + echo "LocationCount = $location_count;"; + echo "UserCount = $user_count;"; + echo "</script>"; + ?> + </div><br> + + <table> + <tr> + <td><?php echo $peoplemap_langres["icons"]; ?>:</td> + <td><input type="radio" name="icon" value="marker" checked="checked" onclick="SwitchIcon(this.value);"></td> + <td id="icon_marker"></td> + <td><input type="radio" name="icon" value="circle" onclick="SwitchIcon(this.value);"></td> + <td><div id="icon_circle"></div></td> + </tr> + </table> + </div> + + </div> + </div> + </div> + </div> + </div> + <div class="bubble_bg" id="toolbox0_bubble"> <div class="rounded_ll"> <div class="rounded_lr"> @@ -128,8 +173,6 @@ <?php echo $peoplemap_langres["filter_intro"] . "<br><br>"; - // We need a DB connection for getting the user groups and checking if the user is logged in - $db = mysql_connect($DB_HOST, $DB_USER, $DB_PASS) or die("Could not connect to the database!"); $query = "SELECT usrgroup_name_id, usrgroup_name FROM $DB_ROSCMS.usergroups WHERE usrgroup_visible = 1;"; $result = mysql_query($query, $db) or die("Query failed #1!"); @@ -141,7 +184,7 @@ while($row = mysql_fetch_row($result)) { echo "<tr>"; - echo "<td><input type=\"checkbox\" onclick=\"ToggleUserGroup(this, '" . $row[0] . "');\"></td>"; + echo "<td><input type=\"checkbox\" name=\"usergroups\" onclick=\"ToggleUserGroup(this, '" . $row[0] . "');\"></td>"; echo "<td><div class=\"colorbox\" style=\"background: " . current($MARKERS) . "\"></div></td>"; echo "<td>" . $row[1] . "</td>"; echo "<td><img id=\"ajaxloading_" . $row[0] . "\" style=\"visibility: hidden;\" src=\"images/ajax_loading.gif\" alt=\"\"></td>"; Modified: trunk/web/reactos.org/htdocs/peoplemap/lang/de.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/l… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/lang/de.inc.php (original) +++ trunk/web/reactos.org/htdocs/peoplemap/lang/de.inc.php Sat Feb 16 01:22:18 2008 @@ -44,4 +44,10 @@ $peoplemap_langres["nousers"] = "Keinen Benutzer mit Ortsdaten gefunden."; $peoplemap_langres["activatejs"] = "Sie mÃ¼ssen JavaScript aktivieren, um die Personen-Karte zu benutzen!"; $peoplemap_langres["unsupportedbrowser"] = "Die Personen-Karte wird von Ihrem Browser nicht unterstÃ¼tzt."; + + $peoplemap_langres["count1"] = "<strong>"; + $peoplemap_langres["count2"] = " von "; + $peoplemap_langres["count3"] = "</strong> Personen mit Positionsdaten werden angezeigt (von "; + $peoplemap_langres["count4"] = " Benutzern insgesamt)"; + $peoplemap_langres["icons"] = "Symbol benutzen"; ?> Modified: trunk/web/reactos.org/htdocs/peoplemap/lang/en.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/l… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/lang/en.inc.php (original) +++ trunk/web/reactos.org/htdocs/peoplemap/lang/en.inc.php Sat Feb 16 01:22:18 2008 @@ -13,7 +13,7 @@ $peoplemap_langres["header"] = '<a href="http://www.reactos.org/">Home</a> > ReactOS People Map'; $peoplemap_langres["title"] = "ReactOS People Map"; - $peoplemap_langres["intro"] = "The following map shows the locations of ReactOS Developers and Users"; + $peoplemap_langres["intro"] = "The following map shows the locations of ReactOS Developers and Users."; $peoplemap_langres["filter"] = "Filter by User Groups"; $peoplemap_langres["filter_intro"] = "Click a Checkbox next to a User Group to add all Users of this Group to the Map or remove them."; @@ -44,4 +44,10 @@ $peoplemap_langres["nousers"] = "No user with location data found!"; $peoplemap_langres["activatejs"] = "You have to activate JavaScript to use the People Map!"; $peoplemap_langres["unsupportedbrowser"] = "The People Map is not supported by your Browser."; + + $peoplemap_langres["count1"] = "Showing <strong>"; + $peoplemap_langres["count2"] = " of "; + $peoplemap_langres["count3"] = "</strong> users with location data (of "; + $peoplemap_langres["count4"] = " users in total)"; + $peoplemap_langres["icons"] = "Icon to use"; ?> Modified: trunk/web/reactos.org/htdocs/peoplemap/peoplemap.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/p… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/peoplemap.css (original) +++ trunk/web/reactos.org/htdocs/peoplemap/peoplemap.css Sat Feb 16 01:22:18 2008 @@ -20,10 +20,6 @@ a:hover { color: #000000; -} - -tr, td { - vertical-align: top; } h1 { @@ -191,9 +187,25 @@ background: transparent url(images/lr.gif) no-repeat scroll right bottom; } +#map_td, #toolbox_td { + vertical-align: top; +} + #toolbox_td { width: 300px; padding-left: 7px; +} + +#icon_marker { + height: 31px; + width: 19px; + background: url(images/marker_white.png) no-repeat; +} + +#icon_circle { + height: 10px; + width: 10px; + background: url(images/circle_white.png) no-repeat center; } #toolbox0_image, #toolbox1_image, #toolbox2_image { Modified: trunk/web/reactos.org/htdocs/peoplemap/peoplemap.js.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/p… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/peoplemap.js.php (original) +++ trunk/web/reactos.org/htdocs/peoplemap/peoplemap.js.php Sat Feb 16 01:22:18 2008 @@ -10,6 +10,27 @@ var IconTable; var MarkerTable; var MyLocationMarker = null; +var MarkerCount = 0; + +var CircleIcon; +var CurrentIcon; +var CurrentIconPrefix; +var MarkerIcon; + +function UpdateCounts() +{ + document.getElementById("counttext").innerHTML = "<?php echo $peoplemap_langres["count1"]; ?>" + MarkerCount + "<?php echo $peoplemap_langres["count2"]; ?>" + LocationCount + "<?php echo $peoplemap_langres["count3"]; ?>" + UserCount + "<?php echo $peoplemap_langres["count4"]; ?>"; +} + +function GetIconPath(UserGroup) +{ + if(!UserGroup) + IconColor = "white"; + else + IconColor = IconTable[UserGroup]; + + return "images/" + CurrentIconPrefix + "_" + IconColor + ".png"; +} function AddUserToMap(UserId, UserName, FullName, Latitude, Longitude, UserGroup) { @@ -20,15 +41,10 @@ var IconColor; if(!UserGroup) - { UserGroup = ""; - IconColor = "white"; - } - else - IconColor = IconTable[UserGroup]; - - var Icon = new GIcon(G_DEFAULT_ICON, "images/marker_" + IconColor + ".png"); - var Marker = new GMarker( new GLatLng(Latitude, Longitude), Icon ); + + CurrentIcon.image = GetIconPath(UserGroup); + var Marker = new GMarker( new GLatLng(Latitude, Longitude), CurrentIcon ); var html; html = "<strong><a href=\"http://reactos.org/roscms/?page=user&sec=profil&sec2=" + UserId + "\" target=\"_blank\">" + UserName + "</a></strong><br>"; @@ -38,19 +54,21 @@ html += "<?php echo $peoplemap_langres["latitude"]; ?>: " + parseFloat(Latitude) + "°<br>"; html += "<?php echo $peoplemap_langres["longitude"]; ?>: " + parseFloat(Longitude) + "°<br><br>"; - html += "<a href=\"javascript:RemoveUserFromMap(" + UserId + ")\"><?php echo $peoplemap_langres["removefrommap"]; ?></a>"; - - GEvent.addListener( Marker, "click", function() {Marker.openInfoWindowHtml(html);} ); + html += "<a href=\"javascript:RemoveUserFromMap(" + UserId + "); UpdateCounts();\"><?php echo $peoplemap_langres["removefrommap"]; ?></a>"; MarkerTable[UserId] = new Object(); + MarkerTable[UserId].click = GEvent.addListener( Marker, "click", function() {Marker.openInfoWindowHtml(html);} ); MarkerTable[UserId].group = UserGroup; + MarkerTable[UserId].html = html; MarkerTable[UserId].marker = Marker; + MarkerCount++; Map.addOverlay(Marker); } function RemoveUserFromMap(UserId) { + MarkerCount--; Map.removeOverlay(MarkerTable[UserId].marker); delete MarkerTable[UserId]; } @@ -167,7 +185,7 @@ var Longitude = users[i].getElementsByTagName("longitude")[0].firstChild.data; html += "<li>"; - html += "<a href=\"javascript:AddUserToMap(" + UserId + ", '" + UserName + "', '" + FullName + "', " + Latitude + ", " + Longitude + ");\">"; + html += "<a href=\"javascript:AddUserToMap(" + UserId + ", '" + UserName + "', '" + FullName + "', " + Latitude + ", " + Longitude + "); UpdateCounts();\">"; html += UserName; html += "</a>"; @@ -209,6 +227,8 @@ AddUserToMap(UserId, UserName, FullName, Latitude, Longitude, UserGroup); } + + UpdateCounts(); } SetLoading(UserGroup, false); @@ -235,31 +255,46 @@ } } +// Cancel scrolling the window, when the mouse wheel is used while the mouse is in the map +function OnMapMouseScroll(event) +{ + // First hack to get this to work with IE + if(!event) + event = window.event; + + if(event.preventDefault) + { + // The DOM Level 2 way + event.preventDefault(); + } + else + { + // As always, IE also needs an extra handler here.. :-/ + return false; + } +} + function OnWindowResize() { var MinMapHeight = 300; - var MinWndScrollHeight = 800; var MinMapWidth = 500; var SubtractHeight = 300; var SubtractWidth = 500; var MapBox = document.getElementById("map"); var MapHeight; - var WndHeight; var MapWidth; // Set the height if(window.innerHeight) { // All browsers except IE - WndHeight = window.innerHeight; MapHeight = window.innerHeight - SubtractHeight; MapWidth = window.innerWidth - SubtractWidth; } else { // IE in Strict Mode - WndHeight = document.documentElement.clientHeight; MapHeight = document.documentElement.clientHeight - SubtractHeight; MapWidth = document.documentElement.clientWidth - SubtractWidth; } @@ -270,20 +305,14 @@ if(MapWidth < MinMapWidth) MapWidth = MinMapWidth; - if(Map) - { - if(WndHeight < MinWndScrollHeight) - Map.disableScrollWheelZoom(); - else - Map.enableScrollWheelZoom(); - } - MapBox.style.height = String(MapHeight) + "px"; MapBox.style.width = String(MapWidth) + "px"; } function Load() { + var i; + // Exclude IE 5.5 as well, because it has problems with the CSS cursor attribute and various other stuff if( !GBrowserIsCompatible() || navigator.userAgent.indexOf("MSIE 5.5") >= 0) { @@ -301,11 +330,33 @@ Map.addControl(new GMapTypeControl()); Map.addControl(new GOverviewMapControl(new GSize(150,150))); Map.setCenter(new GLatLng(0, 0), 1); - - // Call it again for enabling/disabling scroll wheel zoom - OnWindowResize(); + Map.enableScrollWheelZoom(); + + // There is no standard way for capturing mouse wheel events + // - The "DOMMouseScroll" event is XUL-specific, so it only works with Gecko browsers + // - onmousewheel works with Safari/WebKit, Opera and IE + if(Map.getContainer().addEventListener) + Map.getContainer().addEventListener("DOMMouseScroll", OnMapMouseScroll, false); + + Map.getContainer().onmousewheel = OnMapMouseScroll; MarkerTable = new Object(); + + // Set up the icons + MarkerIcon = new GIcon(G_DEFAULT_ICON); + CircleIcon = new GIcon(G_DEFAULT_ICON); + CircleIcon.shadow = ""; + CircleIcon.iconSize = new GSize(10, 10); + CircleIcon.shadowSize = null; + CircleIcon.iconAnchor = new GPoint(5, 5); + + // Firefox doesn't reset check marks on a reload, so do that manually here + document.getElementsByName("icon")[0].checked = "checked"; + + for(i = 0; i < document.getElementsByName("usergroups").length; i++) + document.getElementsByName("usergroups")[i].checked = ""; + + SwitchIcon("marker"); } function Unload() @@ -313,6 +364,41 @@ delete IconTable; delete MarkerTable; GUnload(); +} + +function SwitchIconCreateMarker(id) +{ + // For some reason, this needs to be done in a separate function. Otherwise all markers will always open the info window of the last marker. + var Marker = new GMarker(MarkerTable[id].marker.getLatLng(), CurrentIcon); + + MarkerTable[id].click = GEvent.addListener(Marker, "click", function() {Marker.openInfoWindowHtml(MarkerTable[id].html);} ); + MarkerTable[id].marker = Marker; + Map.addOverlay(Marker); +} + +function SwitchIcon(prefix) +{ + if(CurrentIconPrefix == prefix) + return; + + // Change the current icon and icon prefix + if(prefix == "circle") + CurrentIcon = CircleIcon; + else + CurrentIcon = MarkerIcon; + + CurrentIconPrefix = prefix; + + // Change the icons of all existing markers (we have to recreate them all :-/) + for(id in MarkerTable) + { + GEvent.removeListener(MarkerTable[id].click); + Map.removeOverlay(MarkerTable[id].marker); + + CurrentIcon.image = GetIconPath(MarkerTable[id].group); + SwitchIconCreateMarker(id); + } + } function ToggleToolbox(id) @@ -372,6 +458,8 @@ if(MarkerTable[id].group == UserGroup) RemoveUserFromMap(id); } + + UpdateCounts(); } }

1 0

[ros-arm-bringup] 32383: On systems with large enough memory (or lots of drivers already loaded), we actually need another PDE to hold the new PTEs to represent the PFN database, since we go past the initial PDEs that come from FreeLDR. On those systems, we would try allocating a new page to hold the PDE, and crash, since the PFN database isn't setup. We now have an MmAllocPageEarly routine which is called during Mm bootstrapping to resolve this issue.
by ros-arm-bringup＠svn.reactos.org 15 Feb '08

15 Feb '08

Author: ros-arm-bringup Date: Fri Feb 15 23:52:36 2008 New Revision: 32383 URL: http://svn.reactos.org/svn/reactos?rev=32383&view=rev Log: On systems with large enough memory (or lots of drivers already loaded), we actually need another PDE to hold the new PTEs to represent the PFN database, since we go past the initial PDEs that come from FreeLDR. On those systems, we would try allocating a new page to hold the PDE, and crash, since the PFN database isn't setup. We now have an MmAllocPageEarly routine which is called during Mm bootstrapping to resolve this issue. Modified: trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Fri Feb 15 23:52:36 2008 @@ -237,6 +237,20 @@ return 0; } +PFN_TYPE +NTAPI +MmAllocEarlyPage(VOID) +{ + PFN_TYPE Pfn; + + /* Use one of our highest usable pages */ + Pfn = MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount - 1; + MiFreeDescriptor->PageCount--; + + /* Return it */ + return Pfn; +} + VOID NTAPI MmInitializePageList(VOID) @@ -269,8 +283,7 @@ if (!MmIsPagePresent(NULL, Address)) { /* Use one of our highest usable pages */ - Pfn = MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount - 1; - MiFreeDescriptor->PageCount--; + Pfn = MmAllocEarlyPage(); /* Set the PFN */ Status = MmCreateVirtualMappingForKernel(Address, @@ -733,6 +746,14 @@ { if (IsListEmpty(&FreeUnzeroedPageListHead)) { + /* Check if this allocation is for the PFN DB itself */ + if (MmStats.NrTotalPages == 0) + { + /* Allocate an early page -- we'll account for it later */ + KeReleaseSpinLock(&PageListLock, oldIrql); + return MmAllocEarlyPage(); + } + DPRINT1("MmAllocPage(): Out of memory\n"); KeReleaseSpinLock(&PageListLock, oldIrql); return 0; Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Fri Feb 15 23:52:36 2008 @@ -351,8 +351,7 @@ /* Count RAM */ MiCountFreePagesInLoaderBlock(KeLoaderBlock); - MmStats.NrTotalPages = MmNumberOfPhysicalPages; - DbgPrint("Used memory %dKb\n", (MmStats.NrTotalPages * PAGE_SIZE) / 1024); + DbgPrint("Used memory %dKb\n", (MmNumberOfPhysicalPages * PAGE_SIZE) / 1024); /* Initialize the kernel address space */ MmInitializeKernelAddressSpace();

1 0

[janderwald] 32380: - taskmgr improvements by Carlo Bramix See issue #3075 for more details.
by janderwald＠svn.reactos.org 15 Feb '08

15 Feb '08

Author: janderwald Date: Fri Feb 15 22:22:55 2008 New Revision: 32380 URL: http://svn.reactos.org/svn/reactos?rev=32380&view=rev Log: - taskmgr improvements by Carlo Bramix See issue #3075 for more details. Modified: trunk/reactos/base/applications/taskmgr/about.c trunk/reactos/base/applications/taskmgr/affinity.c trunk/reactos/base/applications/taskmgr/applpage.c trunk/reactos/base/applications/taskmgr/applpage.h trunk/reactos/base/applications/taskmgr/column.c trunk/reactos/base/applications/taskmgr/endproc.c trunk/reactos/base/applications/taskmgr/procpage.c trunk/reactos/base/applications/taskmgr/taskmgr.c trunk/reactos/base/applications/taskmgr/taskmgr.h Modified: trunk/reactos/base/applications/taskmgr/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/about.c (original) +++ trunk/reactos/base/applications/taskmgr/about.c Fri Feb 15 22:22:55 2008 @@ -1,7 +1,7 @@ /* * ReactOS Task Manager * - * about.cpp + * about.c * * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> * Modified: trunk/reactos/base/applications/taskmgr/affinity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/affinity.c (original) +++ trunk/reactos/base/applications/taskmgr/affinity.c Fri Feb 15 22:22:55 2008 @@ -1,7 +1,7 @@ /* * ReactOS Task Manager * - * affinity.cpp + * affinity.c * * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> * 2005 Klemens Friedl <frik85(a)reactos.at> @@ -24,8 +24,6 @@ #include <precomp.h> HANDLE hProcessAffinityHandle; -WCHAR szTemp[256]; -WCHAR szTempA[256]; static const DWORD dwCpuTable[] = { IDC_CPU0, IDC_CPU1, IDC_CPU2, IDC_CPU3, @@ -46,6 +44,7 @@ ULONG Index; DWORD dwProcessId; WCHAR strErrorText[260]; + WCHAR szTitle[256]; for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) { memset(&lvitem, 0, sizeof(LV_ITEM)); @@ -62,8 +61,8 @@ hProcessAffinityHandle = OpenProcess(PROCESS_QUERY_INFORMATION|PROCESS_SET_INFORMATION, FALSE, dwProcessId); if (!hProcessAffinityHandle) { GetLastErrorText(strErrorText, sizeof(strErrorText) / sizeof(WCHAR)); - LoadStringW(hInst, IDS_MSG_ACCESSPROCESSAFF, szTemp, sizeof(szTemp) / sizeof(WCHAR)); - MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_ACCESSPROCESSAFF, szTitle, sizeof(szTitle) / sizeof(WCHAR)); + MessageBoxW(hMainWnd, strErrorText, szTitle, MB_OK|MB_ICONSTOP); return; } DialogBoxW(hInst, MAKEINTRESOURCEW(IDD_AFFINITY_DIALOG), hMainWnd, AffinityDialogWndProc); @@ -79,6 +78,7 @@ DWORD dwProcessAffinityMask = 0; DWORD dwSystemAffinityMask = 0; WCHAR strErrorText[260]; + WCHAR szTitle[256]; BYTE nCpu; switch (message) { @@ -91,8 +91,8 @@ if (!GetProcessAffinityMask(hProcessAffinityHandle, &dwProcessAffinityMask, &dwSystemAffinityMask)) { GetLastErrorText(strErrorText, sizeof(strErrorText) / sizeof(WCHAR)); EndDialog(hDlg, 0); - LoadStringW(hInst, IDS_MSG_ACCESSPROCESSAFF, szTemp, sizeof(szTemp) / sizeof(WCHAR)); - MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_ACCESSPROCESSAFF, szTitle, sizeof(szTitle) / sizeof(WCHAR)); + MessageBoxW(hMainWnd, strErrorText, szTitle, MB_OK|MB_ICONSTOP); } for (nCpu=0; nCpu<sizeof(dwCpuTable) / sizeof(dwCpuTable[0]); nCpu++) { @@ -143,9 +143,9 @@ * of it's cpu time. */ if (!dwProcessAffinityMask) { - LoadStringW(hInst, IDS_MSG_PROCESSONEPRO, szTemp, sizeof(szTemp) / sizeof(WCHAR)); - LoadStringW(hInst, IDS_MSG_INVALIDOPTION, szTempA, sizeof(szTempA) / sizeof(WCHAR)); - MessageBoxW(hDlg, szTemp, szTempA, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_PROCESSONEPRO, strErrorText, sizeof(strErrorText) / sizeof(WCHAR)); + LoadStringW(hInst, IDS_MSG_INVALIDOPTION, szTitle, sizeof(szTitle) / sizeof(WCHAR)); + MessageBoxW(hDlg, strErrorText, szTitle, MB_OK|MB_ICONSTOP); return TRUE; } @@ -155,8 +155,8 @@ if (!SetProcessAffinityMask(hProcessAffinityHandle, dwProcessAffinityMask)) { GetLastErrorText(strErrorText, sizeof(strErrorText) / sizeof(WCHAR)); EndDialog(hDlg, LOWORD(wParam)); - LoadStringW(hInst, IDS_MSG_ACCESSPROCESSAFF, szTemp, sizeof(szTemp) / sizeof(WCHAR)); - MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_ACCESSPROCESSAFF, szTitle, sizeof(szTitle) / sizeof(WCHAR)); + MessageBoxW(hMainWnd, strErrorText, szTitle, MB_OK|MB_ICONSTOP); } EndDialog(hDlg, LOWORD(wParam)); Modified: trunk/reactos/base/applications/taskmgr/applpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/applpage.c (original) +++ trunk/reactos/base/applications/taskmgr/applpage.c Fri Feb 15 22:22:55 2008 @@ -1,7 +1,7 @@ /* * ReactOS Task Manager * - * applicationpage.cpp + * applpage.c * * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> * 2005 Klemens Friedl <frik85(a)reactos.at> @@ -196,18 +196,13 @@ { DWORD dwStyle = GetWindowLongW(hApplicationPageListCtrl, GWL_STYLE); - dwStyle &= ~LVS_REPORT; - dwStyle &= ~LVS_ICON; - dwStyle &= ~LVS_LIST; - dwStyle &= ~LVS_SMALLICON; - - if (TaskManagerSettings.View_LargeIcons) - dwStyle |= LVS_ICON; - else if (TaskManagerSettings.View_SmallIcons) - dwStyle |= LVS_SMALLICON; - else - dwStyle |= LVS_REPORT; - + dwStyle &= ~(LVS_REPORT | LVS_ICON | LVS_LIST | LVS_SMALLICON); + + switch (TaskManagerSettings.ViewMode) { + case ID_VIEW_LARGE: dwStyle |= LVS_ICON; break; + case ID_VIEW_SMALL: dwStyle |= LVS_SMALLICON; break; + case ID_VIEW_DETAILS: dwStyle |= LVS_REPORT; break; + } SetWindowLongW(hApplicationPageListCtrl, GWL_STYLE, dwStyle); RefreshApplicationPage(); @@ -265,7 +260,7 @@ if (hWnd == hMainWnd) return TRUE; - bLargeIcon = TaskManagerSettings.View_LargeIcons ? TRUE : FALSE; + bLargeIcon = (TaskManagerSettings.ViewMode == ID_VIEW_LARGE); GetWindowTextW(hWnd, szText, 260); /* Get the window text */ @@ -521,13 +516,12 @@ if (pAPLI->bHung) { LoadStringW( GetModuleHandleW(NULL), IDS_Not_Responding , szMsg, sizeof(szMsg) / sizeof(szMsg[0])); - wcsncpy(pnmdi->item.pszText, szMsg, pnmdi->item.cchTextMax); } else { LoadStringW( GetModuleHandleW(NULL), IDS_Running, (LPWSTR) szMsg, sizeof(szMsg) / sizeof(szMsg[0])); - wcsncpy(pnmdi->item.pszText, szMsg, pnmdi->item.cchTextMax); } + wcsncpy(pnmdi->item.pszText, szMsg, pnmdi->item.cchTextMax); } break; @@ -591,12 +585,7 @@ hMenu = LoadMenuW(hInst, MAKEINTRESOURCEW(IDR_APPLICATION_PAGE_CONTEXT1)); hSubMenu = GetSubMenu(hMenu, 0); - if (TaskManagerSettings.View_LargeIcons) - CheckMenuRadioItem(hSubMenu, ID_VIEW_LARGE, ID_VIEW_DETAILS, ID_VIEW_LARGE, MF_BYCOMMAND); - else if (TaskManagerSettings.View_SmallIcons) - CheckMenuRadioItem(hSubMenu, ID_VIEW_LARGE, ID_VIEW_DETAILS, ID_VIEW_SMALL, MF_BYCOMMAND); - else - CheckMenuRadioItem(hSubMenu, ID_VIEW_LARGE, ID_VIEW_DETAILS, ID_VIEW_DETAILS, MF_BYCOMMAND); + CheckMenuRadioItem(hSubMenu, ID_VIEW_LARGE, ID_VIEW_DETAILS, TaskManagerSettings.ViewMode, MF_BYCOMMAND); TrackPopupMenu(hSubMenu, TPM_LEFTALIGN|TPM_TOPALIGN|TPM_LEFTBUTTON, pt.x, pt.y, 0, hMainWnd, NULL); @@ -649,7 +638,7 @@ DestroyMenu(hMenu); } -void ApplicationPage_OnViewLargeIcons(void) +void ApplicationPage_OnView(DWORD dwMode) { HMENU hMenu; HMENU hViewMenu; @@ -657,47 +646,13 @@ hMenu = GetMenu(hMainWnd); hViewMenu = GetSubMenu(hMenu, 2); - TaskManagerSettings.View_LargeIcons = TRUE; - TaskManagerSettings.View_SmallIcons = FALSE; - TaskManagerSettings.View_Details = FALSE; - CheckMenuRadioItem(hViewMenu, ID_VIEW_LARGE, ID_VIEW_DETAILS, ID_VIEW_LARGE, MF_BYCOMMAND); + TaskManagerSettings.ViewMode = dwMode; + CheckMenuRadioItem(hViewMenu, ID_VIEW_LARGE, ID_VIEW_DETAILS, dwMode, MF_BYCOMMAND); UpdateApplicationListControlViewSetting(); } -void ApplicationPage_OnViewSmallIcons(void) -{ - HMENU hMenu; - HMENU hViewMenu; - - hMenu = GetMenu(hMainWnd); - hViewMenu = GetSubMenu(hMenu, 2); - - TaskManagerSettings.View_LargeIcons = FALSE; - TaskManagerSettings.View_SmallIcons = TRUE; - TaskManagerSettings.View_Details = FALSE; - CheckMenuRadioItem(hViewMenu, ID_VIEW_LARGE, ID_VIEW_DETAILS, ID_VIEW_SMALL, MF_BYCOMMAND); - - UpdateApplicationListControlViewSetting(); -} - -void ApplicationPage_OnViewDetails(void) -{ - HMENU hMenu; - HMENU hViewMenu; - - hMenu = GetMenu(hMainWnd); - hViewMenu = GetSubMenu(hMenu, 2); - - TaskManagerSettings.View_LargeIcons = FALSE; - TaskManagerSettings.View_SmallIcons = FALSE; - TaskManagerSettings.View_Details = TRUE; - CheckMenuRadioItem(hViewMenu, ID_VIEW_LARGE, ID_VIEW_DETAILS, ID_VIEW_DETAILS, MF_BYCOMMAND); - - UpdateApplicationListControlViewSetting(); -} - -void ApplicationPage_OnWindowsTileHorizontally(void) +void ApplicationPage_OnWindowsTile(DWORD dwMode) { LPAPPLICATION_PAGE_LIST_ITEM pAPLI = NULL; LV_ITEM item; @@ -717,45 +672,14 @@ if (item.state & LVIS_SELECTED) { pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; - if (pAPLI) { hWndArray[nWndCount] = pAPLI->hWnd; nWndCount++; } } } - TileWindows(NULL, MDITILE_HORIZONTAL, NULL, nWndCount, hWndArray); - HeapFree(GetProcessHeap(), 0, hWndArray); -} - -void ApplicationPage_OnWindowsTileVertically(void) -{ - LPAPPLICATION_PAGE_LIST_ITEM pAPLI = NULL; - LV_ITEM item; - int i; - HWND* hWndArray; - int nWndCount; - - hWndArray = (HWND*)HeapAlloc(GetProcessHeap(), 0, sizeof(HWND) * ListView_GetItemCount(hApplicationPageListCtrl)); - nWndCount = 0; - - for (i=0; i<ListView_GetItemCount(hApplicationPageListCtrl); i++) { - memset(&item, 0, sizeof(LV_ITEM)); - item.mask = LVIF_STATE|LVIF_PARAM; - item.iItem = i; - item.stateMask = (UINT)-1; - (void)ListView_GetItem(hApplicationPageListCtrl, &item); - - if (item.state & LVIS_SELECTED) { - pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; - if (pAPLI) { - hWndArray[nWndCount] = pAPLI->hWnd; - nWndCount++; - } - } - } - - TileWindows(NULL, MDITILE_VERTICAL, NULL, nWndCount, hWndArray); + + TileWindows(NULL, dwMode, NULL, nWndCount, hWndArray); HeapFree(GetProcessHeap(), 0, hWndArray); } Modified: trunk/reactos/base/applications/taskmgr/applpage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/applpage.h (original) +++ trunk/reactos/base/applications/taskmgr/applpage.h Fri Feb 15 22:22:55 2008 @@ -34,11 +34,8 @@ void RefreshApplicationPage(void); void UpdateApplicationListControlViewSetting(void); -void ApplicationPage_OnViewLargeIcons(void); -void ApplicationPage_OnViewSmallIcons(void); -void ApplicationPage_OnViewDetails(void); -void ApplicationPage_OnWindowsTileHorizontally(void); -void ApplicationPage_OnWindowsTileVertically(void); +void ApplicationPage_OnView(DWORD); +void ApplicationPage_OnWindowsTile(DWORD); void ApplicationPage_OnWindowsMinimize(void); void ApplicationPage_OnWindowsMaximize(void); void ApplicationPage_OnWindowsCascade(void); Modified: trunk/reactos/base/applications/taskmgr/column.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/column.c (original) +++ trunk/reactos/base/applications/taskmgr/column.c Fri Feb 15 22:22:55 2008 @@ -1,7 +1,7 @@ /* * ReactOS Task Manager * - * column.cpp + * column.c * * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> * 2005 Klemens Friedl <frik85(a)reactos.at> @@ -24,7 +24,6 @@ #include <precomp.h> UINT ColumnDataHints[COLUMN_NMAX]; -WCHAR szTemp[256]; #define DECLARE_COLUMN_PRESET(_name, _size, _state) \ { IDS_TAB_##_name, IDC_##_name, _size, _state }, @@ -57,7 +56,7 @@ DECLARE_COLUMN_PRESET(IOOTHERBYTES, 70, FALSE) }; -int InsertColumn(int nCol, LPCWSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem); +static int InsertColumn(int nCol, LPCWSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem); INT_PTR CALLBACK ColumnsDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); void AddColumns(void) @@ -79,7 +78,7 @@ UpdateColumnDataHints(); } -int InsertColumn(int nCol, LPCWSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem) +static int InsertColumn(int nCol, LPCWSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem) { LVCOLUMN column; @@ -107,6 +106,7 @@ HDITEM hditem; int i, n; WCHAR text[260]; + WCHAR szTemp[256]; LRESULT size; /* Reset column data */ Modified: trunk/reactos/base/applications/taskmgr/endproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/endproc.c (original) +++ trunk/reactos/base/applications/taskmgr/endproc.c Fri Feb 15 22:22:55 2008 @@ -23,15 +23,13 @@ #include <precomp.h> -WCHAR szTemp[256]; -WCHAR szTempA[256]; - void ProcessPage_OnEndProcess(void) { LVITEM lvitem; ULONG Index; DWORD dwProcessId; HANDLE hProcess; + WCHAR szTitle[256]; WCHAR strErrorText[260]; for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) @@ -53,9 +51,9 @@ if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) return; - LoadStringW(hInst, IDS_MSG_WARNINGTERMINATING, szTemp, 256); - LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); - if (MessageBoxW(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) + LoadStringW(hInst, IDS_MSG_WARNINGTERMINATING, strErrorText, 256); + LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTitle, 256); + if (MessageBoxW(hMainWnd, strErrorText, szTitle, MB_YESNO|MB_ICONWARNING) != IDYES) return; hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, dwProcessId); @@ -63,16 +61,16 @@ if (!hProcess) { GetLastErrorText(strErrorText, 260); - LoadStringW(hInst, IDS_MSG_UNABLETERMINATEPRO, szTemp, 256); - MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_UNABLETERMINATEPRO, szTitle, 256); + MessageBoxW(hMainWnd, strErrorText, szTitle, MB_OK|MB_ICONSTOP); return; } if (!TerminateProcess(hProcess, 0)) { GetLastErrorText(strErrorText, 260); - LoadStringW(hInst, IDS_MSG_UNABLETERMINATEPRO, szTemp, 256); - MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_UNABLETERMINATEPRO, szTitle, 256); + MessageBoxW(hMainWnd, strErrorText, szTitle, MB_OK|MB_ICONSTOP); } CloseHandle(hProcess); @@ -84,6 +82,7 @@ ULONG Index; DWORD dwProcessId; HANDLE hProcess; + WCHAR szTitle[256]; WCHAR strErrorText[260]; for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) @@ -105,9 +104,9 @@ if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) return; - LoadStringW(hInst, IDS_MSG_WARNINGTERMINATING, szTemp, 256); - LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); - if (MessageBoxW(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) + LoadStringW(hInst, IDS_MSG_WARNINGTERMINATING, strErrorText, 256); + LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTitle, 256); + if (MessageBoxW(hMainWnd, strErrorText, szTitle, MB_YESNO|MB_ICONWARNING) != IDYES) return; hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, dwProcessId); @@ -115,16 +114,16 @@ if (!hProcess) { GetLastErrorText(strErrorText, 260); - LoadStringW(hInst, IDS_MSG_UNABLETERMINATEPRO, szTemp, 256); - MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_UNABLETERMINATEPRO, szTitle, 256); + MessageBoxW(hMainWnd, strErrorText, szTitle, MB_OK|MB_ICONSTOP); return; } if (!TerminateProcess(hProcess, 0)) { GetLastErrorText(strErrorText, 260); - LoadStringW(hInst, IDS_MSG_UNABLETERMINATEPRO, szTemp, 256); - MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_UNABLETERMINATEPRO, szTitle, 256); + MessageBoxW(hMainWnd, strErrorText, szTitle, MB_OK|MB_ICONSTOP); } CloseHandle(hProcess); Modified: trunk/reactos/base/applications/taskmgr/procpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/procpage.c (original) +++ trunk/reactos/base/applications/taskmgr/procpage.c Fri Feb 15 22:22:55 2008 @@ -413,7 +413,6 @@ WCHAR strDebugger[260]; DWORD dwDebuggerSize; HKEY hKey; - UINT Idx; memset(&si, 0, sizeof(SYSTEM_INFO)); @@ -460,9 +459,7 @@ dwDebuggerSize = 260; if (RegQueryValueExW(hKey, L"Debugger", NULL, NULL, (LPBYTE)strDebugger, &dwDebuggerSize) == ERROR_SUCCESS) { - for (Idx=0; Idx<wcslen(strDebugger); Idx++) - strDebugger[Idx] = toupper(strDebugger[Idx]); - + CharUpper(strDebugger); if (wcsstr(strDebugger, L"DRWTSN32")) EnableMenuItem(hSubMenu, ID_PROCESS_PAGE_DEBUG, MF_BYCOMMAND|MF_DISABLED|MF_GRAYED); } Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c Fri Feb 15 22:22:55 2008 @@ -137,13 +137,9 @@ TaskManager_OnRestoreMainWindow(); break; case ID_VIEW_LARGE: - ApplicationPage_OnViewLargeIcons(); - break; case ID_VIEW_SMALL: - ApplicationPage_OnViewSmallIcons(); - break; case ID_VIEW_DETAILS: - ApplicationPage_OnViewDetails(); + ApplicationPage_OnView(LOWORD(wParam)); break; case ID_VIEW_SHOWKERNELTIMES: PerformancePage_OnViewShowKernelTimes(); @@ -155,16 +151,10 @@ PerformancePage_OnViewCPUHistoryOneGraphPerCPU(); break; case ID_VIEW_UPDATESPEED_HIGH: - TaskManager_OnViewUpdateSpeedHigh(); - break; case ID_VIEW_UPDATESPEED_NORMAL: - TaskManager_OnViewUpdateSpeedNormal(); - break; case ID_VIEW_UPDATESPEED_LOW: - TaskManager_OnViewUpdateSpeedLow(); - break; case ID_VIEW_UPDATESPEED_PAUSED: - TaskManager_OnViewUpdateSpeedPaused(); + TaskManager_OnViewUpdateSpeed(LOWORD(wParam)); break; case ID_VIEW_SELECTCOLUMNS: ProcessPage_OnViewSelectColumns(); @@ -173,10 +163,10 @@ PostMessageW(hDlg, WM_TIMER, 0, 0); break; case ID_WINDOWS_TILEHORIZONTALLY: - ApplicationPage_OnWindowsTileHorizontally(); + ApplicationPage_OnWindowsTile(MDITILE_HORIZONTAL); break; case ID_WINDOWS_TILEVERTICALLY: - ApplicationPage_OnWindowsTileVertically(); + ApplicationPage_OnWindowsTile(MDITILE_VERTICAL); break; case ID_WINDOWS_MINIMIZE: ApplicationPage_OnWindowsMinimize(); @@ -413,6 +403,22 @@ lpRect->bottom - lpRect->top, clrTopLeft, clrBottomRight); } +static void SetUpdateSpeed(HWND hWnd) +{ + /* Setup update speed (pause=fall down) */ + switch (TaskManagerSettings.UpdateSpeed) { + case ID_VIEW_UPDATESPEED_HIGH: + SetTimer(hWnd, 1, 1000, NULL); + break; + case ID_VIEW_UPDATESPEED_NORMAL: + SetTimer(hWnd, 1, 2000, NULL); + break; + case ID_VIEW_UPDATESPEED_LOW: + SetTimer(hWnd, 1, 4000, NULL); + break; + } +} + BOOL OnCreate(HWND hWnd) { HMENU hMenu; @@ -537,26 +543,15 @@ else CheckMenuItem(hEditMenu, ID_OPTIONS_SHOW16BITTASKS, MF_BYCOMMAND|MF_UNCHECKED); - if (TaskManagerSettings.View_LargeIcons) - CheckMenuRadioItem(hViewMenu, ID_VIEW_LARGE, ID_VIEW_DETAILS, ID_VIEW_LARGE, MF_BYCOMMAND); - else if (TaskManagerSettings.View_SmallIcons) - CheckMenuRadioItem(hViewMenu, ID_VIEW_LARGE, ID_VIEW_DETAILS, ID_VIEW_SMALL, MF_BYCOMMAND); - else - CheckMenuRadioItem(hViewMenu, ID_VIEW_LARGE, ID_VIEW_DETAILS, ID_VIEW_DETAILS, MF_BYCOMMAND); + /* Set the view mode */ + CheckMenuRadioItem(hViewMenu, ID_VIEW_LARGE, ID_VIEW_DETAILS, TaskManagerSettings.ViewMode, MF_BYCOMMAND); if (TaskManagerSettings.ShowKernelTimes) CheckMenuItem(hViewMenu, ID_VIEW_SHOWKERNELTIMES, MF_BYCOMMAND|MF_CHECKED); else CheckMenuItem(hViewMenu, ID_VIEW_SHOWKERNELTIMES, MF_BYCOMMAND|MF_UNCHECKED); - if (TaskManagerSettings.UpdateSpeed == 1) - CheckMenuRadioItem(hUpdateSpeedMenu, ID_VIEW_UPDATESPEED_HIGH, ID_VIEW_UPDATESPEED_PAUSED, ID_VIEW_UPDATESPEED_HIGH, MF_BYCOMMAND); - else if (TaskManagerSettings.UpdateSpeed == 2) - CheckMenuRadioItem(hUpdateSpeedMenu, ID_VIEW_UPDATESPEED_HIGH, ID_VIEW_UPDATESPEED_PAUSED, ID_VIEW_UPDATESPEED_NORMAL, MF_BYCOMMAND); - else if (TaskManagerSettings.UpdateSpeed == 4) - CheckMenuRadioItem(hUpdateSpeedMenu, ID_VIEW_UPDATESPEED_HIGH, ID_VIEW_UPDATESPEED_PAUSED, ID_VIEW_UPDATESPEED_LOW, MF_BYCOMMAND); - else - CheckMenuRadioItem(hUpdateSpeedMenu, ID_VIEW_UPDATESPEED_HIGH, ID_VIEW_UPDATESPEED_PAUSED, ID_VIEW_UPDATESPEED_PAUSED, MF_BYCOMMAND); + CheckMenuRadioItem(hUpdateSpeedMenu, ID_VIEW_UPDATESPEED_HIGH, ID_VIEW_UPDATESPEED_PAUSED, TaskManagerSettings.UpdateSpeed, MF_BYCOMMAND); if (TaskManagerSettings.CPUHistory_OneGraphPerCPU) CheckMenuRadioItem(hCPUHistoryMenu, ID_VIEW_CPUHISTORY_ONEGRAPHALL, ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, MF_BYCOMMAND); @@ -569,12 +564,8 @@ TabCtrl_SetCurFocus/*Sel*/(hTabWnd, 2); TabCtrl_SetCurFocus/*Sel*/(hTabWnd, nActivePage); - if (TaskManagerSettings.UpdateSpeed == 1) - SetTimer(hWnd, 1, 1000, NULL); - else if (TaskManagerSettings.UpdateSpeed == 2) - SetTimer(hWnd, 1, 2000, NULL); - else if (TaskManagerSettings.UpdateSpeed == 4) - SetTimer(hWnd, 1, 4000, NULL); + /* Setup update speed */ + SetUpdateSpeed(hWnd); /* * Refresh the performance data @@ -669,7 +660,7 @@ void LoadSettings(void) { HKEY hKey; - WCHAR szSubKey[] = L"Software\\ReactWare\\TaskManager"; + WCHAR szSubKey[] = L"Software\\ReactOS\\TaskManager"; int i; DWORD dwSize; @@ -690,12 +681,10 @@ TaskManagerSettings.Show16BitTasks = TRUE; /* Update speed settings */ - TaskManagerSettings.UpdateSpeed = 2; + TaskManagerSettings.UpdateSpeed = ID_VIEW_UPDATESPEED_NORMAL; /* Applications page settings */ - TaskManagerSettings.View_LargeIcons = FALSE; - TaskManagerSettings.View_SmallIcons = FALSE; - TaskManagerSettings.View_Details = TRUE; + TaskManagerSettings.ViewMode = ID_VIEW_DETAILS; /* Processes page settings */ TaskManagerSettings.ShowProcessesFromAllUsers = FALSE; /* Server-only? */ @@ -735,8 +724,8 @@ { HKEY hKey; WCHAR szSubKey1[] = L"Software"; - WCHAR szSubKey2[] = L"Software\\ReactWare"; - WCHAR szSubKey3[] = L"Software\\ReactWare\\TaskManager"; + WCHAR szSubKey2[] = L"Software\\ReactOS"; + WCHAR szSubKey3[] = L"Software\\ReactOS\\TaskManager"; /* Open (or create) the key */ hKey = NULL; @@ -819,7 +808,7 @@ SendMessageW(hStatusWnd, SB_SETTEXT, 0, (LPARAM)str); } -void TaskManager_OnViewUpdateSpeedHigh(void) +void TaskManager_OnViewUpdateSpeed(DWORD dwSpeed) { HMENU hMenu; HMENU hViewMenu; @@ -829,64 +818,17 @@ hViewMenu = GetSubMenu(hMenu, 2); hUpdateSpeedMenu = GetSubMenu(hViewMenu, 1); - TaskManagerSettings.UpdateSpeed = 1; - CheckMenuRadioItem(hUpdateSpeedMenu, ID_VIEW_UPDATESPEED_HIGH, ID_VIEW_UPDATESPEED_PAUSED, ID_VIEW_UPDATESPEED_HIGH, MF_BYCOMMAND); + TaskManagerSettings.UpdateSpeed = dwSpeed; + CheckMenuRadioItem(hUpdateSpeedMenu, ID_VIEW_UPDATESPEED_HIGH, ID_VIEW_UPDATESPEED_PAUSED, dwSpeed, MF_BYCOMMAND); KillTimer(hMainWnd, 1); - SetTimer(hMainWnd, 1, 500, NULL); -} - -void TaskManager_OnViewUpdateSpeedNormal(void) -{ - HMENU hMenu; - HMENU hViewMenu; - HMENU hUpdateSpeedMenu; - - hMenu = GetMenu(hMainWnd); - hViewMenu = GetSubMenu(hMenu, 2); - hUpdateSpeedMenu = GetSubMenu(hViewMenu, 1); - - TaskManagerSettings.UpdateSpeed = 2; - CheckMenuRadioItem(hUpdateSpeedMenu, ID_VIEW_UPDATESPEED_HIGH, ID_VIEW_UPDATESPEED_PAUSED, ID_VIEW_UPDATESPEED_NORMAL, MF_BYCOMMAND); - - KillTimer(hMainWnd, 1); - SetTimer(hMainWnd, 1, 2000, NULL); -} - -void TaskManager_OnViewUpdateSpeedLow(void) -{ - HMENU hMenu; - HMENU hViewMenu; - HMENU hUpdateSpeedMenu; - - hMenu = GetMenu(hMainWnd); - hViewMenu = GetSubMenu(hMenu, 2); - hUpdateSpeedMenu = GetSubMenu(hViewMenu, 1); - - TaskManagerSettings.UpdateSpeed = 4; - CheckMenuRadioItem(hUpdateSpeedMenu, ID_VIEW_UPDATESPEED_HIGH, ID_VIEW_UPDATESPEED_PAUSED, ID_VIEW_UPDATESPEED_LOW, MF_BYCOMMAND); - - KillTimer(hMainWnd, 1); - SetTimer(hMainWnd, 1, 4000, NULL); + + SetUpdateSpeed(hMainWnd); } void TaskManager_OnViewRefresh(void) { PostMessageW(hMainWnd, WM_TIMER, 0, 0); -} - -void TaskManager_OnViewUpdateSpeedPaused(void) -{ - HMENU hMenu; - HMENU hViewMenu; - HMENU hUpdateSpeedMenu; - - hMenu = GetMenu(hMainWnd); - hViewMenu = GetSubMenu(hMenu, 2); - hUpdateSpeedMenu = GetSubMenu(hViewMenu, 1); - TaskManagerSettings.UpdateSpeed = 0; - CheckMenuRadioItem(hUpdateSpeedMenu, ID_VIEW_UPDATESPEED_HIGH, ID_VIEW_UPDATESPEED_PAUSED, ID_VIEW_UPDATESPEED_PAUSED, MF_BYCOMMAND); - KillTimer(hMainWnd, 1); } void TaskManager_OnTabWndSelChange(void) @@ -933,12 +875,8 @@ DrawMenuBar(hMainWnd); } - if (TaskManagerSettings.View_LargeIcons) - CheckMenuRadioItem(hViewMenu, ID_VIEW_LARGE, ID_VIEW_DETAILS, ID_VIEW_LARGE, MF_BYCOMMAND); - else if (TaskManagerSettings.View_SmallIcons) - CheckMenuRadioItem(hViewMenu, ID_VIEW_LARGE, ID_VIEW_DETAILS, ID_VIEW_SMALL, MF_BYCOMMAND); - else - CheckMenuRadioItem(hViewMenu, ID_VIEW_LARGE, ID_VIEW_DETAILS, ID_VIEW_DETAILS, MF_BYCOMMAND); + CheckMenuRadioItem(hViewMenu, ID_VIEW_LARGE, ID_VIEW_DETAILS, TaskManagerSettings.ViewMode, MF_BYCOMMAND); + /* * Give the application list control focus */ Modified: trunk/reactos/base/applications/taskmgr/taskmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.h (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.h Fri Feb 15 22:22:55 2008 @@ -68,12 +68,10 @@ /* Update speed settings */ /* How many half-seconds in between updates (i.e. 0 - Paused, 1 - High, 2 - Normal, 4 - Low) */ - int UpdateSpeed; + DWORD UpdateSpeed; /* Applications page settings */ - BOOL View_LargeIcons; - BOOL View_SmallIcons; - BOOL View_Details; + DWORD ViewMode; /* Processes page settings */ BOOL ShowProcessesFromAllUsers; /* Server-only? */ @@ -115,10 +113,7 @@ void TaskManager_OnEnterMenuLoop(HWND hWnd); void TaskManager_OnExitMenuLoop(HWND hWnd); void TaskManager_OnMenuSelect(HWND hWnd, UINT nItemID, UINT nFlags, HMENU hSysMenu); -void TaskManager_OnViewUpdateSpeedHigh(void); -void TaskManager_OnViewUpdateSpeedNormal(void); -void TaskManager_OnViewUpdateSpeedLow(void); -void TaskManager_OnViewUpdateSpeedPaused(void); +void TaskManager_OnViewUpdateSpeed(DWORD); void TaskManager_OnViewRefresh(void); void TaskManager_OnTabWndSelChange(void); LPTSTR GetLastErrorText( LPTSTR lpszBuf, DWORD dwSize );

1 0

[ros-arm-bringup] 32379: We now define KUSER_SHARED_DATA per architecture, since the address isn't portable. Now SharedUserData works on ARM. Implemented KeAcquireInSTackQueuedSpinLock, KeAcquireInStackQueuedSpinLockRaiseToSYnc and KeReleaseInStackQueuedSpinLock based on x86 UP versions. On ARM, the PCR is fully exposed, so some APIs are always-inlined direct-memory-access (unlike x86 which has the fs selector, and undocumented parts of the PCR). This means we can define several macros -- fixed
by ros-arm-bringup＠svn.reactos.org 15 Feb '08

15 Feb '08

Author: ros-arm-bringup Date: Fri Feb 15 22:01:45 2008 New Revision: 32379 URL: http://svn.reactos.org/svn/reactos?rev=32379&view=rev Log: We now define KUSER_SHARED_DATA per architecture, since the address isn't portable. Now SharedUserData works on ARM. Implemented KeAcquireInSTackQueuedSpinLock, KeAcquireInStackQueuedSpinLockRaiseToSYnc and KeReleaseInStackQueuedSpinLock based on x86 UP versions. On ARM, the PCR is fully exposed, so some APIs are always-inlined direct-memory-access (unlike x86 which has the fs selector, and undocumented parts of the PCR). This means we can define several macros -- fixed the headers to allow this, by defining the previous stuff for x86 only. Setup registry data in the ARM loader block. The ARM port boots all the way through ExpInitializeExecutive until reaching MmInit1. The boot-registry is correctly loaded and parsed, as are NLS files! Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c trunk/reactos/hal/halarm/generic/hal.c trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/ketypes.h trunk/reactos/include/reactos/armddk.h trunk/reactos/ntoskrnl/include/internal/ke_x.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c Fri Feb 15 22:01:45 2008 @@ -28,7 +28,7 @@ extern ARM_COARSE_PAGE_TABLE BootTranslationTable, KernelTranslationTable; extern ROS_KERNEL_ENTRY_POINT KernelEntryPoint; extern ULONG_PTR KernelBase; -extern ULONG_PTR AnsiData, OemData, UnicodeData; +extern ULONG_PTR AnsiData, OemData, UnicodeData, RegistryData; ULONG SizeBits[] = { @@ -290,8 +290,9 @@ // // - // TODO: Setup registry data - // + // Setup registry data + // + ArmLoaderBlock->RegistryBase = (PVOID)((ULONG_PTR)RegistryData | KSEG0_BASE); // // TODO: Setup ARC Hardware tree data Modified: trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c Fri Feb 15 22:01:45 2008 @@ -16,7 +16,7 @@ ); extern BOOLEAN FrLdrLoadDriver(PCHAR szFileName, INT nPos); -PVOID AnsiData, OemData, UnicodeData; +PVOID AnsiData, OemData, UnicodeData, RegistryData; /* MODULE MANAGEMENT **********************************************************/ PLOADER_MODULE @@ -109,6 +109,11 @@ else if (!_stricmp(NameBuffer, "casemap.nls")) { UnicodeData = (PVOID)NextModuleBase; + } + else if (!(_stricmp(NameBuffer, "system")) || + !(_stricmp(NameBuffer, "system.hiv"))) + { + RegistryData = (PVOID)NextModuleBase; } /* Load the file image */ Modified: trunk/reactos/hal/halarm/generic/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/generic/hal.c?r… ============================================================================== --- trunk/reactos/hal/halarm/generic/hal.c (original) +++ trunk/reactos/hal/halarm/generic/hal.c Fri Feb 15 22:01:45 2008 @@ -753,33 +753,39 @@ } -VOID -FASTCALL -KeAcquireInStackQueuedSpinLock( - IN PKSPIN_LOCK SpinLock, - IN PKLOCK_QUEUE_HANDLE LockHandle - ) -{ - UNIMPLEMENTED; -} - -VOID -FASTCALL -KeAcquireInStackQueuedSpinLockRaiseToSynch( - IN PKSPIN_LOCK SpinLock, - IN PKLOCK_QUEUE_HANDLE LockHandle - ) -{ - UNIMPLEMENTED; -} - -VOID -FASTCALL -KeReleaseInStackQueuedSpinLock( - IN PKLOCK_QUEUE_HANDLE LockHandle - ) -{ - UNIMPLEMENTED; +/* + * @implemented + */ +VOID +FASTCALL +KeAcquireInStackQueuedSpinLock(IN PKSPIN_LOCK SpinLock, + IN PKLOCK_QUEUE_HANDLE LockHandle) +{ + /* Simply raise to dispatch */ + LockHandle->OldIrql = KeSwapIrql(DISPATCH_LEVEL); +} + +/* + * @implemented + */ +VOID +FASTCALL +KeAcquireInStackQueuedSpinLockRaiseToSynch(IN PKSPIN_LOCK SpinLock, + IN PKLOCK_QUEUE_HANDLE LockHandle) +{ + /* Simply raise to synch */ + LockHandle->OldIrql = KeSwapIrql(SYNCH_LEVEL); +} + +/* + * @implemented + */ +VOID +FASTCALL +KeReleaseInStackQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle) +{ + /* Simply lower IRQL back */ + KeSwapIrql(LockHandle->OldIrql); } VOID Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Fri Feb 15 22:01:45 2008 @@ -5459,6 +5459,20 @@ #error Unknown compiler #endif } + +NTHALAPI +KIRQL +DDKAPI +KeGetCurrentIrql( + VOID); + +NTKERNELAPI +PRKTHREAD +NTAPI +KeGetCurrentThread( + VOID); + +#define KI_USER_SHARED_DATA 0xffdf0000 #elif defined(__x86_64__) @@ -5580,6 +5594,8 @@ #define PAGE_SIZE 0x1000 #define PAGE_SHIFT 12L +#define SharedUserData ((KUSER_SHARED_DATA * CONST) KI_USER_SHARED_DATA) + extern NTKERNELAPI PVOID MmHighestUserAddress; extern NTKERNELAPI PVOID MmSystemRangeStart; extern NTKERNELAPI ULONG_PTR MmUserProbeAddress; @@ -5593,8 +5609,6 @@ #define MM_KSEG0_BASE MM_SYSTEM_RANGE_START #define MM_SYSTEM_SPACE_END 0xFFFFFFFF -#define KI_USER_SHARED_DATA 0xffdf0000 -#define SharedUserData ((KUSER_SHARED_DATA * CONST) KI_USER_SHARED_DATA) #define EFLAG_SIGN 0x8000 #define EFLAG_ZERO 0x4000 @@ -5651,11 +5665,7 @@ PVOID Reserved[4]; } PCIBUSDATA, *PPCIBUSDATA; -NTHALAPI -KIRQL -DDKAPI -KeGetCurrentIrql( - VOID); + #if !defined(__INTERLOCKED_DECLARED) #define __INTERLOCKED_DECLARED @@ -9088,12 +9098,6 @@ KeFlushWriteBuffer(VOID); NTKERNELAPI -PRKTHREAD -NTAPI -KeGetCurrentThread( - VOID); - -NTKERNELAPI ULONG NTAPI KeGetRecommendedSharedDataAlignment( Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h (original) +++ trunk/reactos/include/ndk/ketypes.h Fri Feb 15 22:01:45 2008 @@ -54,11 +54,6 @@ // Dispatcher Priority increments // #define THREAD_ALERT_INCREMENT 2 - -// -// User Shared Data in Kernel-Mode -// -#define KI_USER_SHARED_DATA 0xffdf0000 // // Physical memory offset of KUSER_SHARED_DATA Modified: trunk/reactos/include/reactos/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/armddk.h?r… ============================================================================== --- trunk/reactos/include/reactos/armddk.h (original) +++ trunk/reactos/include/reactos/armddk.h Fri Feb 15 22:01:45 2008 @@ -18,6 +18,7 @@ // FIXME: mmtypes.h? // #define KIPCR 0xFFFFF000 +#define KI_USER_SHARED_DATA 0xFFFFE000 #define USPCR 0x7FFF0000 #define PCR ((volatile KPCR * const)USPCR) #define USERPCR ((volatile KPCR * const)KIPCR) @@ -30,7 +31,12 @@ // // Just read it from the PCR // -#define KeGetCurrentProcessorNumber() ((ULONG)(PCR->Number)) +#define KeGetCurrentProcessorNumber() PCR->Number +#define KeGetCurrentIrql() PCR->CurrentIrql +#define _KeGetCurrentThread() PCR->CurrentThread +#define _KeGetPreviousMode() PCR->CurrentThread->PreviousMode +#define _KeIsExecutingDpc() (PCR->DpcRoutineActive != 0) +#define KeGetDcacheFillSize() PCR->DcacheFillSize // // Stub Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h Fri Feb 15 22:01:45 2008 @@ -1526,6 +1526,7 @@ return Priority; } +#ifndef _M_ARM PRKTHREAD FORCEINLINE KeGetCurrentThread(VOID) @@ -1546,6 +1547,7 @@ /* Return the current mode */ return KeGetCurrentThread()->PreviousMode; } +#endif VOID FORCEINLINE

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