Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 24917: - devmgmt German translation See issue #1846 for more details.
by janderwald＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: janderwald Date: Tue Nov 28 19:58:10 2006 New Revision: 24917 URL: http://svn.reactos.org/svn/reactos?rev=24917&view=rev Log: - devmgmt German translation See issue #1846 for more details. Added: trunk/reactos/base/applications/devmgmt/de-DE.rc (with props) Modified: trunk/reactos/base/applications/devmgmt/devmgmt.rc Added: trunk/reactos/base/applications/devmgmt/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/de-DE.rc (added) +++ trunk/reactos/base/applications/devmgmt/de-DE.rc Tue Nov 28 19:58:10 2006 @@ -1,0 +1,81 @@ +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +IDR_MAINMENU MENU +BEGIN + POPUP "&Datei" + BEGIN + MENUITEM "&Beenden", IDC_EXIT + END + POPUP "Action" + BEGIN + MENUITEM "Drucken", IDC_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "Eigenschaften", IDC_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "Hilfe", IDC_PROGHELP, GRAYED + END + POPUP "View" + BEGIN + MENUITEM "Geräte nach Typ", IDC_DEVBYTYPE, CHECKED + MENUITEM "Geräte nach Verbindung", IDC_STATIC, GRAYED + MENUITEM "Resourcen nach Typ", IDC_STATIC, GRAYED + MENUITEM "Resourcen nach Verbindung", IDC_STATIC, GRAYED + END + POPUP "Help" + BEGIN + MENUITEM "Hilfe", IDC_PROGHELP + MENUITEM "Info", IDC_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "Eigenschaften", IDC_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "Hilfe", IDC_PROGHELP + END +END + +IDD_ABOUTBOX DIALOGEX 22,16,190,182 +CAPTION "Über Geräte-Manager" +FONT 8,"Tahoma",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + PUSHBUTTON "Schließen", IDOK, 75, 162, 44, 15 + ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_PROP "Eigenschaften" + IDS_TOOLTIP_REFRESH "Aktualisieren" + IDS_TOOLTIP_HELP "Hilfe" + IDS_TOOLTIP_EXIT "Beenden" +END + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HINT_BLANK " " + IDS_HINT_EXIT " Das Programm beenden." + IDS_HINT_REFRESH " Die Service-Liste aktualisieren." + IDS_HINT_PROP " Eigenschaften-Seite für die aktuelle Auswahl anzeigen." + IDS_HINT_HELP " Hilfe-Fenster anzeigen." + IDS_HINT_ABOUT " Über ReactOS Geräte-Manager." + + IDS_HINT_SYS_RESTORE " Dieses Fenster auf normale Größe wiederherstellen." + IDS_HINT_SYS_MOVE " Dieses Fenster verschieben." + IDS_HINT_SYS_SIZE " Größe dieses Fensters ändern." + IDS_HINT_SYS_MINIMIZE " Dieses Fenster zu einem Symbol verkleinern." + IDS_HINT_SYS_MAXIMIZE " Dieses Fenster auf Bildschirmgröße vergrößern." + IDS_HINT_SYS_CLOSE " Dieses Fenster schließen." +END Propchange: trunk/reactos/base/applications/devmgmt/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/devmgmt/devmgmt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/devmgmt.rc (original) +++ trunk/reactos/base/applications/devmgmt/devmgmt.rc Tue Nov 28 19:58:10 2006 @@ -25,6 +25,5 @@ IDB_HELP BITMAP DISCARDABLE "res/help.bmp" IDB_EXIT BITMAP DISCARDABLE "res/exit.bmp" - +#include "de-DE.rc" #include "en-US.rc" -

1 0

[janderwald] 24916: - greek translation by Apal - rename language files See issue #1853 for more details.
by janderwald＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: janderwald Date: Tue Nov 28 19:38:14 2006 New Revision: 24916 URL: http://svn.reactos.org/svn/reactos?rev=24916&view=rev Log: - greek translation by Apal - rename language files See issue #1853 for more details. Added: trunk/reactos/dll/cpl/mmsys/de-DE.rc - copied unchanged from r24908, trunk/reactos/dll/cpl/mmsys/De.rc trunk/reactos/dll/cpl/mmsys/en-US.rc (props changed) - copied unchanged from r24915, trunk/reactos/dll/cpl/mmsys/En.rc trunk/reactos/dll/cpl/mmsys/es-ES.rc (props changed) - copied unchanged from r24915, trunk/reactos/dll/cpl/mmsys/Es.rc trunk/reactos/dll/cpl/mmsys/fr-FR.rc - copied unchanged from r24915, trunk/reactos/dll/cpl/mmsys/Fr.rc trunk/reactos/dll/cpl/mmsys/gr-GR.rc (with props) trunk/reactos/dll/cpl/mmsys/nl-NL.rc - copied unchanged from r24915, trunk/reactos/dll/cpl/mmsys/Nl.rc trunk/reactos/dll/cpl/mmsys/ru-RU.rc - copied unchanged from r24915, trunk/reactos/dll/cpl/mmsys/Ru.rc trunk/reactos/dll/cpl/mmsys/uk-UK.rc - copied unchanged from r24915, trunk/reactos/dll/cpl/mmsys/Uk.rc Removed: trunk/reactos/dll/cpl/mmsys/De.rc trunk/reactos/dll/cpl/mmsys/En.rc trunk/reactos/dll/cpl/mmsys/Es.rc trunk/reactos/dll/cpl/mmsys/Fr.rc trunk/reactos/dll/cpl/mmsys/Nl.rc trunk/reactos/dll/cpl/mmsys/Ru.rc trunk/reactos/dll/cpl/mmsys/Uk.rc Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rc Removed: trunk/reactos/dll/cpl/mmsys/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/De.rc?rev=24… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/De.rc (original) +++ trunk/reactos/dll/cpl/mmsys/De.rc (removed) @@ -1,15 +1,0 @@ -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN - -IDD_HARDWARE DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Hardware" -FONT 8, "MS Shell Dlg" -BEGIN -END - -STRINGTABLE -BEGIN - IDS_CPLNAME "Sound und Audio Geräte" - IDS_CPLDESCRIPTION "Ändert das Sound-Schema Ihres Computers, oder konfiguriert die Einstellungen für Ihre Lautsprecher und Aufnahmegeräte." -END - Removed: trunk/reactos/dll/cpl/mmsys/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/En.rc?rev=24… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/En.rc (original) +++ trunk/reactos/dll/cpl/mmsys/En.rc (removed) @@ -1,15 +1,0 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -IDD_HARDWARE DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Hardware" -FONT 8, "MS Shell Dlg" -BEGIN -END - -STRINGTABLE -BEGIN - IDS_CPLNAME "Sound and Audio Devices" - IDS_CPLDESCRIPTION "Changes the sound scheme for your computer, or configure the settings for your speakers and recording devices." -END - Removed: trunk/reactos/dll/cpl/mmsys/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/Es.rc?rev=24… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/Es.rc (original) +++ trunk/reactos/dll/cpl/mmsys/Es.rc (removed) @@ -1,15 +1,0 @@ -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL - -IDD_HARDWARE DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Hardware" -FONT 8, "MS Shell Dlg" -BEGIN -END - -STRINGTABLE -BEGIN - IDS_CPLNAME "Dispositivos de Audio y Sonido" - IDS_CPLDESCRIPTION "Cambia el esquema de sonidos de su computadora, o configura las propiedades de sus bocinas y dispositivos de grabación." -END - Removed: trunk/reactos/dll/cpl/mmsys/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/Fr.rc?rev=24… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/Fr.rc (original) +++ trunk/reactos/dll/cpl/mmsys/Fr.rc (removed) @@ -1,15 +1,0 @@ -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -IDD_HARDWARE DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Matériel" -FONT 8, "MS Shell Dlg" -BEGIN -END - -STRINGTABLE -BEGIN - IDS_CPLNAME "Son et périphériques audio" - IDS_CPLDESCRIPTION "Change le modèle de sons de votre ordinateur, ou configure les paramètres de vos hauts-parleurs et de vos périphériques d'enregistrement." -END - Removed: trunk/reactos/dll/cpl/mmsys/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/Nl.rc?rev=24… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/Nl.rc (original) +++ trunk/reactos/dll/cpl/mmsys/Nl.rc (removed) @@ -1,15 +1,0 @@ -LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL - -IDD_HARDWARE DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Hardware" -FONT 8, "MS Shell Dlg" -BEGIN -END - -STRINGTABLE -BEGIN - IDS_CPLNAME "Geluid en Audio apparaten" - IDS_CPLDESCRIPTION "Verander het geluidsschema van uw computer of configureer de aanwezige geluidsapparatuur." -END - Removed: trunk/reactos/dll/cpl/mmsys/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/Ru.rc?rev=24… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/Ru.rc (original) +++ trunk/reactos/dll/cpl/mmsys/Ru.rc (removed) @@ -1,15 +1,0 @@ -LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL - -IDD_HARDWARE DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Îáîðóäîâàíèå" -FONT 8, "MS Shell Dlg" -BEGIN -END - -STRINGTABLE -BEGIN - IDS_CPLNAME "Çâóê è Ìóëüòèìåäèà" - IDS_CPLDESCRIPTION "Èçìåíåíèå çâóêîâûõ ñõåì âàøåãî êîìïüþòåðà, íàñòðîéêà êîëîíîê è çàïèñûâàþùèõ óñòðîéñòâ." -END - Removed: trunk/reactos/dll/cpl/mmsys/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/Uk.rc?rev=24… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/Uk.rc (original) +++ trunk/reactos/dll/cpl/mmsys/Uk.rc (removed) @@ -1,24 +1,0 @@ -/* - * PROJECT: Multimedia Control Panel Applet - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/cpl/mmsys/Uk.rc - * PURPOSE: Ukraianian Language File for Multimedia Control Panel Applet - * PROGRAMMERS: Artem Reznikov - */ - -LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL - -IDD_HARDWARE DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Óñòàòêóâàííÿ" -FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT -BEGIN -END - -STRINGTABLE -BEGIN - IDS_CPLNAME "Çâóêîâ³ ³ àóä³î ïðèñòðî¿" - IDS_CPLDESCRIPTION "Çì³íà çâóêîâèõ ñõåì âàøîãî êîìï'þòåðà, íàñòðîþâàííÿ êîëîíîê ³ çàïèñóþ÷èõ ïðèñòðî¿â." -END - Propchange: trunk/reactos/dll/cpl/mmsys/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/cpl/mmsys/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/mmsys/gr-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/gr-GR.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/gr-GR.rc (added) +++ trunk/reactos/dll/cpl/mmsys/gr-GR.rc Tue Nov 28 19:38:14 2006 @@ -1,0 +1,15 @@ +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +IDD_HARDWARE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÓõóêåõÝò" +FONT 8, "MS Shell Dlg" +BEGIN +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "ÓõóêåõÝò Þ÷ïõ" + IDS_CPLDESCRIPTION "ÁëëÜæåé ôï ó÷Þìá Þ÷ïõ ôïõ õðïëïãéóôÞ Þ ôñïðïðïéåß ôéò ñõèìßóåéò ãéá ôá ç÷åßá êáé ôéò óõóêåõÝò åããñáöÞò Þ÷ïõ." +END + Propchange: trunk/reactos/dll/cpl/mmsys/gr-GR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.rc (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.rc Tue Nov 28 19:38:14 2006 @@ -10,10 +10,11 @@ IDI_CPLICON ICON "resources/mmsys.ico" -#include "En.rc" -#include "De.rc" -#include "Es.rc" -#include "Ru.rc" -#include "Nl.rc" -#include "Fr.rc" -#include "Uk.rc" +#include "de-DE.rc" +#include "en-US.rc" +#include "es-ES.rc" +#include "fr-FR.rc" +#include "gr-GR.rc" +#include "nl-NL.rc" +#include "ru-RU.rc" +#include "uk-UK.rc"

1 0

[janderwald] 24915: - greek translation by Apal See issue #1853 for more details.
by janderwald＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: janderwald Date: Tue Nov 28 19:26:29 2006 New Revision: 24915 URL: http://svn.reactos.org/svn/reactos?rev=24915&view=rev Log: - greek translation by Apal See issue #1853 for more details. Added: trunk/reactos/base/setup/welcome/gr-GR.rc (with props) Modified: trunk/reactos/base/setup/welcome/welcome.rc Added: trunk/reactos/base/setup/welcome/gr-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/gr-GR.r… ============================================================================== --- trunk/reactos/base/setup/welcome/gr-GR.rc (added) +++ trunk/reactos/base/setup/welcome/gr-GR.rc Tue Nov 28 19:26:29 2006 @@ -1,0 +1,62 @@ +/* $Id$ */ + +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +/* String Tables */ + +/* Default settings */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "ReactOS - Êáëþò ¹ëèáôå" + IDS_DEFAULTTOPICTITLE "ReactOS" + IDS_DEFAULTTOPICDESC "Êáëþò Þëèáôå óôï React Ëåéôïõñãéêü Óýóôçìá.\n\nÅðéëÝîôå Ýíá èÝìá áðü ôï ìåíïý óôá áñéóôåñÜ." +// IDS_CHECKTEXT "Show this dialog again" +// IDS_CLOSETEXT "Exit" +END + +/* Topic buttons */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICBUTTON0 "ÅãêáôÜóôáóç ôïõ ReactOS" + IDS_TOPICBUTTON1 "Åîåñåýíçóç áõôïý ôïõ CD" + IDS_TOPICBUTTON2 "¸îïäïò" +// IDS_TOPICBUTTON3 "Empty Topic 3" +// IDS_TOPICBUTTON4 "Empty Topic 4" +// IDS_TOPICBUTTON5 "Empty Topic 5" +// IDS_TOPICBUTTON6 "Empty Topic 6" +// IDS_TOPICBUTTON7 "Empty Topic 7" +// IDS_TOPICBUTTON8 "Empty Topic 8" +// IDS_TOPICBUTTON9 "Empty Topic 9" +END + +/* Topic titles */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICTITLE0 "ÅãêáôÜóôáóç ôïõ ReactOS" + IDS_TOPICTITLE1 "Åîåñåýíçóç áõôïý ôïõ CD" + IDS_TOPICTITLE2 "¸îïäïò" +// IDS_TOPICTITLE3 "Empty Topic Title 3" +// IDS_TOPICTITLE4 "Empty Topic Title 4" +// IDS_TOPICTITLE5 "Empty Topic Title 5" +// IDS_TOPICTITLE6 "Empty Topic Title 6" +// IDS_TOPICTITLE7 "Empty Topic Title 7" +// IDS_TOPICTITLE8 "Empty Topic Title 8" +// IDS_TOPICTITLE9 "Empty Topic Title 9" +END + +/* Topic descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICDESC0 "Äçìéïõñãßá íÝáò åãêáôÜóôáóçò ôïõ ReactOS óôïí õðïëïãéóôÞ Þ áíáâÜèìéóç ìéáò Þäç õðÜñ÷ïõóáò åãêáôÜóôáóçò." + IDS_TOPICDESC1 "Åîåñåýíçóç áõôïý ôïõ CD." + IDS_TOPICDESC2 "ÐáôÞóôå ãéá íá ôåñìáôßóåôå ôçí åöáñìïãÞ áõôÞ." +// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." +// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." +// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." +// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." +// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." +// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." +// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." +END + +/* EOF */ Propchange: trunk/reactos/base/setup/welcome/gr-GR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/welcome/welcome.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.rc (original) +++ trunk/reactos/base/setup/welcome/welcome.rc Tue Nov 28 19:26:29 2006 @@ -54,6 +54,7 @@ #include "en-US.rc" #include "es-ES.rc" #include "fr-FR.rc" +#include "gr-GR.rc" #include "hu-HU.rc" #include "ja-JP.rc" #include "nl-NL.rc"

1 0

[janderwald] 24914: - greek translation by Apal See issue #1853 for more details.
by janderwald＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: janderwald Date: Tue Nov 28 19:22:43 2006 New Revision: 24914 URL: http://svn.reactos.org/svn/reactos?rev=24914&view=rev Log: - greek translation by Apal See issue #1853 for more details. Added: trunk/reactos/base/applications/games/winemine/gr-GR.rc (with props) Modified: trunk/reactos/base/applications/games/winemine/winemine.rc Added: trunk/reactos/base/applications/games/winemine/gr-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/gr-GR.rc (added) +++ trunk/reactos/base/applications/games/winemine/gr-GR.rc Tue Nov 28 19:22:43 2006 @@ -1,0 +1,83 @@ +#include "resource.h" + +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +STRINGTABLE { + IDS_APPNAME, "ÍáñêáëéåõôÞò" + +} + +MENU_WINEMINE MENU DISCARDABLE +{ + POPUP "&ÅðéëïãÝò" { + MENUITEM "&ÍÝï", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&Óçìåßùóç ìå åñùôçìáôéêü", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&Áñ÷Üñéïò", IDM_BEGINNER + MENUITEM "&Ðñï÷ùñçìÝíïò", IDM_ADVANCED + MENUITEM "&Åéäéêüò", IDM_EXPERT + MENUITEM "&Ðñïóùðéêü", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "¸&îïäïò", IDM_EXIT + } + POPUP "&Ðëçñïöïñßåò" { + MENUITEM "&Ãñçãïñüôåñïé ×ñüíïé", IDM_TIMES + MENUITEM "&Ó÷åôéêÜ...", IDM_ABOUT + } +} + +DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Ãñçãïñüôåñïé ×ñüíïé" +{ + GROUPBOX "Ãñçãïñüôåñïé ×ñüíïé", IDNONE, 10, 10, 140, 45 + LTEXT "Áñ÷Üñéïò", IDNONE, 20, 20, 40, 8 + LTEXT "Ðñï÷ùñçìÝíïò", IDNONE, 20, 30, 40, 8 + LTEXT "Åéäéêüò", IDNONE, 20, 40, 40, 8 + LTEXT "999", IDC_TIME1, 70, 20, 15, 8 + LTEXT "999", IDC_TIME2, 70, 30, 15, 8 + LTEXT "999", IDC_TIME3, 70, 40, 15, 8 + LTEXT "", IDC_NAME1, 90, 20, 55, 8 + LTEXT "", IDC_NAME2, 90, 30, 55, 8 + LTEXT "", IDC_NAME3, 90, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 +} + +DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Óõã÷áñçôÞñéá!" +{ + LTEXT "Ðáñáêáëþ óõìðëçñþóôå ôï üíïìÜ óáò", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "OÊ", IDOK, 60, 40, 40, 15 +} + +DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Ðñïóùðéêü Ðáé÷íßäé" +{ + LTEXT "ÃñáììÝò", IDNONE, 5, 5, 30, 10 + LTEXT "ÓôÞëåò", IDNONE, 5, 35, 30, 10 + LTEXT "ÍÜñêåò", IDNONE, 5, 65, 30, 10 + EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER + DEFPUSHBUTTON "OÊ", IDOK, 40, 30, 50, 15 + PUSHBUTTON "Áêýñùóç", IDCANCEL, 40, 50, 50, 15 +} + +DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Ó÷åôéêÜ..." +{ + LTEXT "Winemine", IDNONE, 10, 10, 35, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 + LTEXT "under the Wine license", IDNONE, 35, 35, 100, 10 + ICON "WINEMINE", IDNONE, 10, 25, 20, 20 + DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 +} Propchange: trunk/reactos/base/applications/games/winemine/gr-GR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/winemine/winemine.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/winemine.rc (original) +++ trunk/reactos/base/applications/games/winemine/winemine.rc Tue Nov 28 19:22:43 2006 @@ -24,6 +24,7 @@ #include "de-DE.rc" #include "en-US.rc" #include "fr-FR.rc" +#include "gr-GR.rc" #include "pl-PL.rc" #include "nl-NL.rc" #include "uk-UA.rc"

1 0

[janderwald] 24913: - insert resource file alphabetically
by janderwald＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: janderwald Date: Tue Nov 28 19:20:30 2006 New Revision: 24913 URL: http://svn.reactos.org/svn/reactos?rev=24913&view=rev Log: - insert resource file alphabetically Modified: trunk/reactos/base/applications/msconfig/rsrc.rc Modified: trunk/reactos/base/applications/msconfig/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/rsrc.rc (original) +++ trunk/reactos/base/applications/msconfig/rsrc.rc Tue Nov 28 19:20:30 2006 @@ -9,10 +9,10 @@ /* include localised resources */ +#include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" #include "lang/nl-NL.rc" #include "lang/nb-NO.rc" -#include "lang/cs-CZ.rc"

1 0

[janderwald] 24912: - czech translation for msconfig - translation by preston See issue #1887 for more details.
by janderwald＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: janderwald Date: Tue Nov 28 19:14:29 2006 New Revision: 24912 URL: http://svn.reactos.org/svn/reactos?rev=24912&view=rev Log: - czech translation for msconfig - translation by preston See issue #1887 for more details. Added: trunk/reactos/base/applications/msconfig/lang/cs-CZ.rc (with props) Modified: trunk/reactos/base/applications/msconfig/rsrc.rc Added: trunk/reactos/base/applications/msconfig/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/cs-CZ.rc (added) +++ trunk/reactos/base/applications/msconfig/lang/cs-CZ.rc Tue Nov 28 19:14:29 2006 @@ -1,0 +1,155 @@ +LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL + +IDD_MSCONFIG_DIALOG DIALOG DISCARDABLE 0, 0, 378, 220 +STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "Nástroj pro konfiguraci systému" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195 + DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Nápovìda", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Storno", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Pouít", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_STARTUP_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148 + PUSHBUTTON "&Povolit ve",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14 + PUSHBUTTON "&Zakázat ve",IDC_BTN_STARTUP_DEACTIVATE,295,155,66,14 +END + +IDD_TOOLS_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List2",IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134 + EDITTEXT IDC_TOOLS_CMDLINE, 1, 139, 360, 12, ES_READONLY + PUSHBUTTON "&Spustit", IDC_BTN_RUN, 311, 155, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_SERVICES_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148 + PUSHBUTTON "&Povolit ve",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14 + PUSHBUTTON "&Zakázat ve",IDC_BTN_SERVICES_DEACTIVATE,295,155,66,14 +END + +IDD_GENERAL_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Výbìr sputìní", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT + CONTROL "Nor&mální sputìní - naèíst vechny ovladaèe zaøízení a sluby", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 215, 10 + CONTROL "&Diagnostické sputìní - naèíst jen základní ovladaèe zaøízení a sluby", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 255, 10 + CONTROL "&Výbìrové sputìní", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 72, 10 + CHECKBOX "&Zpracovat soubor SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 115, 10 + CHECKBOX "&Naèíst systémové sluby", IDC_CBX_SYSTEM_SERVICE, 30, 95, 105, 10 + CHECKBOX "N&aèíst poloky Po sputìní", IDC_CBX_STARTUP_ITEM, 30, 110, 105, 10 +END + +IDD_FREELDR_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200 + PUSHBUTTON "&Kontrola cest sputìní", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 77, 12 + PUSHBUTTON "&Nastavit jako výchozí", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 75, 12 + PUSHBUTTON "Posunout N&ahoru", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 + PUSHBUTTON "Posunout &Dolu", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 + GROUPBOX "Monosti sputìní", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT + CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 56, 10 + CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 + CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 56, 10 + CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 + CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 + PUSHBUTTON "&Upøesnit monosti...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 + LTEXT "&Limit:", -1, 280, 91, 30, 10 + EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT + LTEXT "sek.", -1, 340, 91, 15, 10 +END + +IDD_FREELDR_ADVANCED_PAGE DIALOG DISCARDABLE 0, 0, 175, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CHECKBOX "/&MAXMEM=", IDC_CBX_MAX_MEM, 10, 10, 50, 10 + EDITTEXT IDC_TXT_MAX_MEM, 80, 10, 60, 12 + CONTROL "",IDC_SCR_MAX_MEM, "msctls_updown32", 0x50000000, 140, 10, 11, 11 + CHECKBOX "/&NUMPROC=", IDC_CBX_NUM_PROC, 10, 25, 50, 10 + COMBOBOX IDC_DRP_NUM_PROC, 80, 25, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&PCILOCK", IDC_CBX_PCI_LOCK, 10, 40, 50, 10 + CHECKBOX "/P&ROFILE", IDC_CBX_PROFILE, 10, 55, 50, 10 + CHECKBOX "/&IRQ", IDC_CBX_IRQ, 10, 70, 40, 12 + EDITTEXT IDC_TXT_IRQ, 80, 70, 60, 12, ES_LEFT + CHECKBOX "/&DEBUG", IDC_CBX_DEBUG, 10, 85, 40, 10 + CHECKBOX "/D&EBUGPORT", IDC_CBX_DEBUG_PORT, 20, 100, 60, 10 + COMBOBOX IDC_DRP_DEBUG_PORT, 80, 100, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&BAUDRATE", IDC_CBX_BAUD_RATE, 20, 115, 50, 10 + COMBOBOX IDC_DRP_DRP_BAUD_RATE, 80, 115, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&CHANNEL", IDC_CBX_CHANNEL, 20, 130, 50, 10 + EDITTEXT IDC_TXT_CHANNEL, 80, 130, 60, 12, ES_LEFT + CONTROL "",IDC_SCR_CHANNEL, "msctls_updown32", 0x50000000, 140, 130, 11, 11 + PUSHBUTTON "OK", IDC_OK, 20, 160, 50, 12 + PUSHBUTTON "Storno", IDC_CANCEL, 100, 160, 50, 12 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_MSCONFIG "Nástroj pro konfiguraci systému" + IDS_TAB_GENERAL "Obecné" + IDS_TAB_SYSTEM "SYSTEM.INI" + IDS_TAB_FREELDR "FREELDR.INI" + IDS_TAB_SERVICES "Sluby" + IDS_TAB_STARTUP "Po sputìní" + IDS_TAB_TOOLS "Nástroje" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_COLUMN_SERVICE "Sluba" + IDS_SERVICES_COLUMN_REQ "Poadováno" + IDS_SERVICES_COLUMN_VENDOR "Výrobce" + IDS_SERVICES_COLUMN_STATUS "Stav" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLS_COLUMN_NAME "Jméno" + IDS_TOOLS_COLUMN_DESCR "Popis" + + IDS_TOOLS_CMD_NAME "Konzola" + IDS_TOOLS_CMD_DESCR "" + IDS_TOOLS_CMD_CMD "cmd.exe" + + IDS_TOOLS_INFO_NAME "Verze" + IDS_TOOLS_INFO_DESCR "Zobrazí informaci o verzi systému." + IDS_TOOLS_INFO_CMD "winver.exe" + + IDS_TOOLS_REGEDIT_NAME "Editor registru" + IDS_TOOLS_REGEDIT_DESCR "Otevøe editor registru." + IDS_TOOLS_REGEDIT_CMD "regedit.exe" + + IDS_TOOLS_SYSDM_NAME "Systém" + IDS_TOOLS_SYSDM_DESCR "Zobrazí informace o systému." + IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" + + IDS_STARTUP_COLUMN_ELEMENT "Poloka" + IDS_STARTUP_COLUMN_CMD "Pøíkaz" + IDS_STARTUP_COLUMN_PATH "Cesta" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_STATUS_RUNNING "Sputìno" + IDS_SERVICES_STATUS_STOPPED "Zastaveno" + IDS_SERVICES_YES "Ano" + IDS_SERVICES_UNKNOWN "Neznámý" +END Propchange: trunk/reactos/base/applications/msconfig/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/msconfig/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/rsrc.rc (original) +++ trunk/reactos/base/applications/msconfig/rsrc.rc Tue Nov 28 19:14:29 2006 @@ -15,3 +15,4 @@ #include "lang/hu-HU.rc" #include "lang/nl-NL.rc" #include "lang/nb-NO.rc" +#include "lang/cs-CZ.rc"

1 0

[janderwald] 24911: - fixed encoding in czech lang rc file for notepad - patch by preston See issue #1886 for more details.
by janderwald＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: janderwald Date: Tue Nov 28 19:09:22 2006 New Revision: 24911 URL: http://svn.reactos.org/svn/reactos?rev=24911&view=rev Log: - fixed encoding in czech lang rc file for notepad - patch by preston See issue #1886 for more details. Modified: trunk/reactos/base/applications/notepad/lang/cs-CZ.rc Modified: trunk/reactos/base/applications/notepad/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/cs-CZ.rc (original) +++ trunk/reactos/base/applications/notepad/lang/cs-CZ.rc Tue Nov 28 19:09:22 2006 @@ -45,8 +45,8 @@ BEGIN MENUITEM "&Nový...", CMD_NEW MENUITEM "&Otevøít\tCtrl+O", CMD_OPEN - MENUITEM "&Ulo¾it\tCtrl+S", CMD_SAVE - MENUITEM "Ulo¾it j&ako...", CMD_SAVE_AS + MENUITEM "&Uloit\tCtrl+S", CMD_SAVE + MENUITEM "Uloit j&ako...", CMD_SAVE_AS MENUITEM SEPARATOR MENUITEM "&Tisk", CMD_PRINT MENUITEM "Nas&tavení stránky...", CMD_PAGE_SETUP @@ -60,13 +60,13 @@ MENUITEM SEPARATOR MENUITEM "Vyjmou&t\tCtrl+X", CMD_CUT MENUITEM "&Kopírovat\tCtrl+C", CMD_COPY - MENUITEM "&Vlo¾it\tCtrl+V", CMD_PASTE + MENUITEM "&Vloit\tCtrl+V", CMD_PASTE MENUITEM "&Smazat\tDel", CMD_DELETE MENUITEM SEPARATOR MENUITEM "&Hledej\tCtrl+F", CMD_SEARCH - MENUITEM "&Najdi dal¹í\tF3", CMD_SEARCH_NEXT + MENUITEM "&Najdi dalí\tF3", CMD_SEARCH_NEXT MENUITEM SEPARATOR - MENUITEM "Vybrat v¹&e\tCtrl+A", CMD_SELECT_ALL + MENUITEM "Vybrat v&e\tCtrl+A", CMD_SELECT_ALL MENUITEM "È&as/Datum\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "Zalo&mit dlouhé øádky", CMD_WRAP @@ -78,7 +78,7 @@ MENUITEM "&Najít...", CMD_HELP_SEARCH MENUITEM "&Pomoc k nápovìdì", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About" CMD_ABOUT + MENUITEM "&O programu" CMD_ABOUT MENUITEM "Inf&o...", CMD_ABOUT_WINE END END @@ -112,7 +112,7 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "About ReactOS Notepad" +CAPTION "O aplikaci ReactOS Notepad" FONT 8, "MS Shell Dlg" BEGIN CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n", @@ -146,20 +146,20 @@ STRING_UNTITLED, "(bez názvu)" -STRING_ALL_FILES, "V¹echny soubory (*.*)" +STRING_ALL_FILES, "Vechny soubory (*.*)" STRING_TEXT_FILES_TXT, "Textové soubory (*.txt)" -STRING_TOOLARGE, "Soubor '%s' je pro notepad pøíli¹ velký.\n \ -Pou¾ijte jiný editor, prosím." -STRING_NOTEXT, "Nebyl zadán ¾ádný text. \ -\nPlease type something and try again" +STRING_TOOLARGE, "Soubor '%s' je pro notepad pøíli velký.\n \ +Pouijte jiný editor, prosím." +STRING_NOTEXT, "Nebyl zadán ádný text. \ +\nVlote nìjaký text a zkuste to znovu." STRING_DOESNOTEXIST, "Soubor '%s'\nneexistuje.\n\n \ Chcete ho vytvoøit ?" STRING_NOTSAVED, "Soubor '%s'\nbyl zmìnìn.\n\n \ -Chcete ulo¾it zmìny ?" +Chcete uloit zmìny ?" STRING_NOTFOUND, "'%s' nebyl nalezen." STRING_OUT_OF_MEMORY, "Není dost pamìti na dokonèení této úlohy. \ -\nUzavøete jednu èi více aplikací abyste získali více \nvolné \ +\nUzavøete jednu èi více aplikací, abyste získali více \nvolné \ pamìti." }

1 0

[ion] 24910: - Cleanup more code in the deprecated IRQ implementation and use the newer implementations oF KeInitializeInterrupt and KeDisconnectInterrupt. Will allow easier debugging oF the HAL IRQ regression with the new, unused implementation.
by ion＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: ion Date: Tue Nov 28 18:52:54 2006 New Revision: 24910 URL: http://svn.reactos.org/svn/reactos?rev=24910&view=rev Log: - Cleanup more code in the deprecated IRQ implementation and use the newer implementations oF KeInitializeInterrupt and KeDisconnectInterrupt. Will allow easier debugging oF the HAL IRQ regression with the new, unused implementation. Modified: trunk/reactos/ntoskrnl/deprecated/irq.c Modified: trunk/reactos/ntoskrnl/deprecated/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/deprecated/irq.c?… ============================================================================== --- trunk/reactos/ntoskrnl/deprecated/irq.c (original) +++ trunk/reactos/ntoskrnl/deprecated/irq.c Tue Nov 28 18:52:54 2006 @@ -1,86 +1,24 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/ke/i386/irq.c - * PURPOSE: IRQ handling - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) - */ - -/* - * NOTE: In general the PIC interrupt priority facilities are used to - * preserve the NT IRQL semantics, global interrupt disables are only used - * to keep the PIC in a consistent state - * - */ - -/* INCLUDES ****************************************************************/ + * PURPOSE: Manages the Kernel's IRQ support for external drivers, + * for the purpopses of connecting, disconnecting and setting + * up ISRs for drivers. The backend behind the Io* Interrupt + * routines. + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ #include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* DEPRECATED ****************************************************************/ + #include <../hal/halx86/include/halirq.h> #include <../hal/halx86/include/mps.h> - -#define NDEBUG -#include <internal/debug.h> - -extern KDPC KiExpireTimerDpc; -extern ULONG KiMaximumDpcQueueDepth; -extern ULONG KiMinimumDpcRate; -extern ULONG KiAdjustDpcThreshold; -extern ULONG KiIdealDpcRate; -extern LONG KiTickOffset; -extern ULONG KeMaximumIncrement; -extern ULONG KeMinimumIncrement; -extern ULONG KeTimeAdjustment; -extern BOOLEAN KiClockSetupComplete; - -/* GLOBALS *****************************************************************/ - -/* Interrupt handler list */ - -#ifdef CONFIG_SMP - -#define INT_NAME2(intnum) KiUnexpectedInterrupt##intnum - -#define BUILD_INTERRUPT_HANDLER(intnum) \ -VOID INT_NAME2(intnum)(VOID); - -#define D(x,y) \ - BUILD_INTERRUPT_HANDLER(x##y) - -#define D16(x) \ - D(x,0) D(x,1) D(x,2) D(x,3) \ - D(x,4) D(x,5) D(x,6) D(x,7) \ - D(x,8) D(x,9) D(x,A) D(x,B) \ - D(x,C) D(x,D) D(x,E) D(x,F) - -D16(3) D16(4) D16(5) D16(6) -D16(7) D16(8) D16(9) D16(A) -D16(B) D16(C) D16(D) D16(E) -D16(F) - -#define L(x,y) \ - (ULONG)& INT_NAME2(x##y) - -#define L16(x) \ - L(x,0), L(x,1), L(x,2), L(x,3), \ - L(x,4), L(x,5), L(x,6), L(x,7), \ - L(x,8), L(x,9), L(x,A), L(x,B), \ - L(x,C), L(x,D), L(x,E), L(x,F) - -static ULONG irq_handler[ROUND_UP(NR_IRQS, 16)] = { - L16(3), L16(4), L16(5), L16(6), - L16(7), L16(8), L16(9), L16(A), - L16(B), L16(C), L16(D), L16(E) -}; - -#undef L -#undef L16 -#undef D -#undef D16 - -#else /* CONFIG_SMP */ void irq_handler_0(void); void irq_handler_1(void); @@ -119,8 +57,6 @@ (int)&irq_handler_15, }; -#endif /* CONFIG_SMP */ - /* * PURPOSE: Object describing each isr * NOTE: The data in this table is only modified at passsive level but can @@ -135,15 +71,9 @@ } ISR_TABLE, *PISR_TABLE; -#ifdef CONFIG_SMP -static ISR_TABLE IsrTable[NR_IRQS][MAXIMUM_PROCESSORS]; -#else -static ISR_TABLE IsrTable[NR_IRQS][1]; -#endif +static ISR_TABLE IsrTable[NR_IRQS]; #define TAG_ISR_LOCK TAG('I', 'S', 'R', 'L') - -/* FUNCTIONS ****************************************************************/ #define PRESENT (0x8000) #define I486_INTERRUPT_GATE (0xe00) @@ -153,8 +83,7 @@ NTAPI KeInitInterrupts (VOID) { - int i, j; - + int i; /* * Setup the IDT entries to point to the interrupt handlers @@ -164,15 +93,10 @@ ((IDT_DESCRIPTOR*)&KiIdt[IRQ_BASE+i])->a=(irq_handler[i]&0xffff)+(KGDT_R0_CODE<<16); ((IDT_DESCRIPTOR*)&KiIdt[IRQ_BASE+i])->b=(irq_handler[i]&0xffff0000)+PRESENT+ I486_INTERRUPT_GATE; -#ifdef CONFIG_SMP - for (j = 0; j < MAXIMUM_PROCESSORS; j++) -#else - j = 0; -#endif { - InitializeListHead(&IsrTable[i][j].ListHead); - KeInitializeSpinLock(&IsrTable[i][j].Lock); - IsrTable[i][j].Count = 0; + InitializeListHead(&IsrTable[i].ListHead); + KeInitializeSpinLock(&IsrTable[i].Lock); + IsrTable[i].Count = 0; } } } @@ -192,12 +116,10 @@ KIRQL oldlvl; PISR_TABLE CurrentIsr; - DPRINT("I(0x%.08x, 0x%.08x)\n", vector, old_level); - /* * Iterate the list until one of the isr tells us its device interrupted */ - CurrentIsr = &IsrTable[vector - IRQ_BASE][(ULONG)KeGetCurrentProcessorNumber()]; + CurrentIsr = &IsrTable[vector - IRQ_BASE]; KiAcquireSpinLock(&CurrentIsr->Lock); @@ -234,7 +156,6 @@ * At this point we have interrupts disabled, nothing has been done to * the PIC. */ - KeGetCurrentPrcb()->InterruptCount++; /* @@ -274,11 +195,6 @@ CurrentThread = KeGetCurrentThread(); if (CurrentThread!=NULL && CurrentThread->ApcState.UserApcPending) { - DPRINT("PID: %d, TID: %d CS %04x/%04x\n", - ((PETHREAD)CurrentThread)->ThreadsProcess->UniqueProcessId, - ((PETHREAD)CurrentThread)->Cid.UniqueThread, - Trapframe->Cs, - CurrentThread->TrapFrame ? CurrentThread->TrapFrame->SegCs : 0); ASSERT (CurrentThread->TrapFrame); _enable(); @@ -294,52 +210,192 @@ { HalEndSystemInterrupt (old_level, 0); } - -} - -static VOID -KeDumpIrqList(VOID) -{ - PKINTERRUPT current; - PLIST_ENTRY current_entry; - LONG i, j; - KIRQL oldlvl; - BOOLEAN printed; - - for (i=0;i<NR_IRQS;i++) - { - printed = FALSE; - KeRaiseIrql(VECTOR2IRQL(i + IRQ_BASE),&oldlvl); - - for (j=0; j < KeNumberProcessors; j++) - { - KiAcquireSpinLock(&IsrTable[i][j].Lock); - - current_entry = IsrTable[i][j].ListHead.Flink; - current = CONTAINING_RECORD(current_entry,KINTERRUPT,InterruptListEntry); - while (current_entry!=&(IsrTable[i][j].ListHead)) - { - if (printed == FALSE) - { - printed = TRUE; - DPRINT("For irq %x:\n",i); - } - DPRINT(" Isr %x\n",current); - current_entry = current_entry->Flink; - current = CONTAINING_RECORD(current_entry,KINTERRUPT,InterruptListEntry); - } - KiReleaseSpinLock(&IsrTable[i][j].Lock); - } - KeLowerIrql(oldlvl); - } -} +} + +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +KiGetVectorDispatch(IN ULONG Vector, + IN PDISPATCH_INFO Dispatch) +{ + PKINTERRUPT_ROUTINE Handler; + ULONG Current; + + /* Setup the unhandled dispatch */ + Dispatch->NoDispatch = (PVOID)(((ULONG_PTR)&KiStartUnexpectedRange) + + (Vector - PRIMARY_VECTOR_BASE) * + KiUnexpectedEntrySize); + + /* Setup the handlers */ + Dispatch->InterruptDispatch = KiInterruptDispatch; + Dispatch->FloatingDispatch = NULL; // Floating Interrupts are not supported + Dispatch->ChainedDispatch = KiChainedDispatch; + Dispatch->FlatDispatch = NULL; + + /* Get the current handler */ + Current = ((((PKIPCR)KeGetPcr())->IDT[Vector].ExtendedOffset << 16) + & 0xFFFF0000) | + (((PKIPCR)KeGetPcr())->IDT[Vector].Offset & 0xFFFF); + + /* Set the interrupt */ + Dispatch->Interrupt = CONTAINING_RECORD(Current, + KINTERRUPT, + DispatchCode); + + /* Check what this interrupt is connected to */ + if ((PKINTERRUPT_ROUTINE)Current == Dispatch->NoDispatch) + { + /* Not connected */ + Dispatch->Type = NoConnect; + } + else + { + /* Get the handler */ + Handler = Dispatch->Interrupt->DispatchAddress; + if (Handler == Dispatch->ChainedDispatch) + { + /* It's a chained interrupt */ + Dispatch->Type = ChainConnect; + } + else if ((Handler == Dispatch->InterruptDispatch) || + (Handler == Dispatch->FloatingDispatch)) + { + /* It's unchained */ + Dispatch->Type = NormalConnect; + } + else + { + /* Unknown */ + Dispatch->Type = UnknownConnect; + } + } +} + +VOID +NTAPI +KiConnectVectorToInterrupt(IN PKINTERRUPT Interrupt, + IN CONNECT_TYPE Type) +{ + DISPATCH_INFO Dispatch; + PKINTERRUPT_ROUTINE Handler; + PULONG Patch = &Interrupt->DispatchCode[0]; + + /* Get vector data */ + KiGetVectorDispatch(Interrupt->Vector, &Dispatch); + + /* Check if we're only disconnecting */ + if (Type == NoConnect) + { + /* Set the handler to NoDispatch */ + Handler = Dispatch.NoDispatch; + } + else + { + /* Get the right handler */ + Handler = (Type == NormalConnect) ? + Dispatch.InterruptDispatch: + Dispatch.ChainedDispatch; + ASSERT(Interrupt->FloatingSave == FALSE); + + /* Set the handler */ + Interrupt->DispatchAddress = Handler; + + /* Jump to the last 4 bytes */ + Patch = (PULONG)((ULONG_PTR)Patch + + ((ULONG_PTR)&KiInterruptTemplateDispatch - + (ULONG_PTR)KiInterruptTemplate) - 4); + + /* Apply the patch */ + *Patch = (ULONG)((ULONG_PTR)Handler - ((ULONG_PTR)Patch + 4)); + + /* Now set the final handler address */ + ASSERT(Dispatch.FlatDispatch == NULL); + Handler = (PVOID)&Interrupt->DispatchCode; + } + + /* Set the pointer in the IDT */ + ((PKIPCR)KeGetPcr())->IDT[Interrupt->Vector].ExtendedOffset = + (USHORT)(((ULONG_PTR)Handler >> 16) & 0xFFFF); + ((PKIPCR)KeGetPcr())->IDT[Interrupt->Vector].Offset = + (USHORT)PtrToUlong(Handler); +} + +/* PUBLIC FUNCTIONS **********************************************************/ /* * @implemented */ -BOOLEAN -STDCALL -KeConnectInterrupt(PKINTERRUPT InterruptObject) +VOID +NTAPI +KeInitializeInterrupt(IN PKINTERRUPT Interrupt, + IN PKSERVICE_ROUTINE ServiceRoutine, + IN PVOID ServiceContext, + IN PKSPIN_LOCK SpinLock, + IN ULONG Vector, + IN KIRQL Irql, + IN KIRQL SynchronizeIrql, + IN KINTERRUPT_MODE InterruptMode, + IN BOOLEAN ShareVector, + IN CHAR ProcessorNumber, + IN BOOLEAN FloatingSave) +{ + ULONG i; + PULONG DispatchCode = &Interrupt->DispatchCode[0], Patch = DispatchCode; + + /* Set the Interrupt Header */ + Interrupt->Type = InterruptObject; + Interrupt->Size = sizeof(KINTERRUPT); + + /* Check if we got a spinlock */ + if (SpinLock) + { + /* Use the spinlock given to us */ + Interrupt->ActualLock = SpinLock; + } + else + { + /* This means we'll be using the built-in one */ + KeInitializeSpinLock(&Interrupt->SpinLock); + Interrupt->ActualLock = &Interrupt->SpinLock; + } + + /* Set the other settings */ + Interrupt->ServiceRoutine = ServiceRoutine; + Interrupt->ServiceContext = ServiceContext; + Interrupt->Vector = Vector; + Interrupt->Irql = Irql; + Interrupt->SynchronizeIrql = SynchronizeIrql; + Interrupt->Mode = InterruptMode; + Interrupt->ShareVector = ShareVector; + Interrupt->Number = ProcessorNumber; + Interrupt->FloatingSave = FloatingSave; + + /* Loop the template in memory */ + for (i = 0; i < KINTERRUPT_DISPATCH_CODES; i++) + { + /* Copy the dispatch code */ + *DispatchCode++ = KiInterruptTemplate[i]; + } + + /* Jump to the last 4 bytes */ + Patch = (PULONG)((ULONG_PTR)Patch + + ((ULONG_PTR)&KiInterruptTemplateObject - + (ULONG_PTR)KiInterruptTemplate) - 4); + + /* Apply the patch */ + *Patch = PtrToUlong(Interrupt); + + /* Disconnect it at first */ + Interrupt->Connected = FALSE; +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +KeConnectInterrupt(IN PKINTERRUPT InterruptObject) { KIRQL oldlvl,synch_oldlvl; PKINTERRUPT ListHead; @@ -360,7 +416,7 @@ KeSetSystemAffinityThread(1 << InterruptObject->Number); - CurrentIsr = &IsrTable[Vector][(ULONG)InterruptObject->Number]; + CurrentIsr = &IsrTable[Vector]; KeRaiseIrql(VECTOR2IRQL(Vector + IRQ_BASE),&oldlvl); KiAcquireSpinLock(&CurrentIsr->Lock); @@ -382,13 +438,10 @@ synch_oldlvl = KeAcquireInterruptSpinLock(InterruptObject); - DPRINT("%x %x\n",CurrentIsr->ListHead.Flink, CurrentIsr->ListHead.Blink); - Result = HalEnableSystemInterrupt(Vector + IRQ_BASE, InterruptObject->Irql, InterruptObject->Mode); if (Result) { InsertTailList(&CurrentIsr->ListHead,&InterruptObject->InterruptListEntry); - DPRINT("%x %x\n",InterruptObject->InterruptListEntry.Flink, InterruptObject->InterruptListEntry.Blink); } InterruptObject->Connected = TRUE; @@ -400,8 +453,6 @@ KiReleaseSpinLock(&CurrentIsr->Lock); KeLowerIrql(oldlvl); - KeDumpIrqList(); - KeRevertToUserAffinityThread(); return Result; @@ -409,127 +460,84 @@ /* * @implemented - * - * FUNCTION: Releases a drivers isr - * ARGUMENTS: - * InterruptObject = isr to release - */ -BOOLEAN -STDCALL -KeDisconnectInterrupt(PKINTERRUPT InterruptObject) -{ - KIRQL oldlvl,synch_oldlvl; - PISR_TABLE CurrentIsr; + */ +BOOLEAN +NTAPI +KeDisconnectInterrupt(IN PKINTERRUPT Interrupt) +{ + KIRQL OldIrql, Irql; + ULONG Vector; + DISPATCH_INFO Dispatch; + PKINTERRUPT NextInterrupt; BOOLEAN State; - DPRINT1("KeDisconnectInterrupt\n"); - ASSERT (InterruptObject->Number < KeNumberProcessors); - /* Set the affinity */ - KeSetSystemAffinityThread(1 << InterruptObject->Number); - - /* Get the ISR Tabe */ - CurrentIsr = &IsrTable[InterruptObject->Vector - IRQ_BASE] - [(ULONG)InterruptObject->Number]; - - /* Raise IRQL to required level and lock table */ - KeRaiseIrql(VECTOR2IRQL(InterruptObject->Vector),&oldlvl); - KiAcquireSpinLock(&CurrentIsr->Lock); + KeSetSystemAffinityThread(1 << Interrupt->Number); + + /* Lock the dispatcher */ + OldIrql = KiAcquireDispatcherLock(); /* Check if it's actually connected */ - if ((State = InterruptObject->Connected)) - { - /* Lock the Interrupt */ - synch_oldlvl = KeAcquireInterruptSpinLock(InterruptObject); - - /* Remove this one, and check if all are gone */ - RemoveEntryList(&InterruptObject->InterruptListEntry); - if (IsListEmpty(&CurrentIsr->ListHead)) + State = Interrupt->Connected; + if (State) + { + /* Get the vector and IRQL */ + Irql = Interrupt->Irql; + Vector = Interrupt->Vector; + + /* Get vector dispatch data */ + KiGetVectorDispatch(Vector, &Dispatch); + + /* Check if it was chained */ + if (Dispatch.Type == ChainConnect) { - /* Completely Disable the Interrupt */ - HalDisableSystemInterrupt(InterruptObject->Vector, InterruptObject->Irql); + /* Check if the top-level interrupt is being removed */ + ASSERT(Irql <= SYNCH_LEVEL); + if (Interrupt == Dispatch.Interrupt) + { + /* Get the next one */ + Dispatch.Interrupt = CONTAINING_RECORD(Dispatch.Interrupt-> + InterruptListEntry.Flink, + KINTERRUPT, + InterruptListEntry); + + /* Reconnect it */ + KiConnectVectorToInterrupt(Dispatch.Interrupt, ChainConnect); + } + + /* Remove it */ + RemoveEntryList(&Interrupt->InterruptListEntry); + + /* Get the next one */ + NextInterrupt = CONTAINING_RECORD(Dispatch.Interrupt-> + InterruptListEntry.Flink, + KINTERRUPT, + InterruptListEntry); + + /* Check if this is the only one left */ + if (Dispatch.Interrupt == NextInterrupt) + { + /* Connect it in non-chained mode */ + KiConnectVectorToInterrupt(Dispatch.Interrupt, NormalConnect); + } } - + else + { + /* Only one left, disable and remove it */ + HalDisableSystemInterrupt(Interrupt->Vector, Irql); + KiConnectVectorToInterrupt(Interrupt, NoConnect); + } + /* Disconnect it */ - InterruptObject->Connected = FALSE; - - /* Release the interrupt lock */ - KeReleaseInterruptSpinLock(InterruptObject, synch_oldlvl); - } - /* Release the table spinlock */ - KiReleaseSpinLock(&CurrentIsr->Lock); - KeLowerIrql(oldlvl); - - /* Go back to default affinity */ + Interrupt->Connected = FALSE; + } + + /* Unlock the dispatcher and revert affinity */ + KiReleaseDispatcherLock(OldIrql); KeRevertToUserAffinityThread(); - - /* Return Old Interrupt State */ + + /* Return to caller */ return State; } -/* - * @implemented - */ -VOID -STDCALL -KeInitializeInterrupt(PKINTERRUPT Interrupt, - PKSERVICE_ROUTINE ServiceRoutine, - PVOID ServiceContext, - PKSPIN_LOCK SpinLock, - ULONG Vector, - KIRQL Irql, - KIRQL SynchronizeIrql, - KINTERRUPT_MODE InterruptMode, - BOOLEAN ShareVector, - CHAR ProcessorNumber, - BOOLEAN FloatingSave) -{ - /* Set the Interrupt Header */ - Interrupt->Type = InterruptObject; - Interrupt->Size = sizeof(KINTERRUPT); - - /* Check if we got a spinlock */ - if (SpinLock) - { - Interrupt->ActualLock = SpinLock; - } - else - { - /* This means we'll be usin the built-in one */ - KeInitializeSpinLock(&Interrupt->SpinLock); - Interrupt->ActualLock = &Interrupt->SpinLock; - } - - /* Set the other settings */ - Interrupt->ServiceRoutine = ServiceRoutine; - Interrupt->ServiceContext = ServiceContext; - Interrupt->Vector = Vector; - Interrupt->Irql = Irql; - Interrupt->SynchronizeIrql = SynchronizeIrql; - Interrupt->Mode = InterruptMode; - Interrupt->ShareVector = ShareVector; - Interrupt->Number = ProcessorNumber; - Interrupt->FloatingSave = FloatingSave; - - /* Disconnect it at first */ - Interrupt->Connected = FALSE; -} - -VOID KePrintInterruptStatistic(VOID) -{ - LONG i, j; - - for (j = 0; j < KeNumberProcessors; j++) - { - DPRINT1("CPU%d:\n", j); - for (i = 0; i < NR_IRQS; i++) - { - if (IsrTable[i][j].Count) - { - DPRINT1(" Irq %x(%d): %d\n", i, VECTOR2IRQ(i + IRQ_BASE), IsrTable[i][j].Count); - } - } - } -} - /* EOF */

1 0

[ion] 24908: - Fix prototype/definition of HalCalibratePerformanceCounter and properly implement it. - Implement KeStallExecutionProcessor in its own assembly file isntead of using inlined GCC assembly, and align the loop to 16 bytes for more streamlined execution speed. - Mask out clock interrupt during Phase 0 and Initialize clock interrupt on HAL Phase 1. This enables the HAL clock interrupt which was already written. - Make the clock interrupt use HalpCurrentTimeIncrement instead of hardcodi
by ion＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: ion Date: Tue Nov 28 11:11:14 2006 New Revision: 24908 URL: http://svn.reactos.org/svn/reactos?rev=24908&view=rev Log: - Fix prototype/definition of HalCalibratePerformanceCounter and properly implement it. - Implement KeStallExecutionProcessor in its own assembly file isntead of using inlined GCC assembly, and align the loop to 16 bytes for more streamlined execution speed. - Mask out clock interrupt during Phase 0 and Initialize clock interrupt on HAL Phase 1. This enables the HAL clock interrupt which was already written. - Make the clock interrupt use HalpCurrentTimeIncrement instead of hardcoding a value. - Re-implement HalpInitializeClock to allow for dynamic increments from 1ms to 15ms with appropriate rollovers and to call KeSetTimeIncrement to update timer values with the kernel. - Implement HalSetTimeIncrement to allow changing the clock ms increment (but this isn't yet respected). - Remove system/runtime update routines from the deprecated IRQ implementation and use the newer assembly ones already written, since we're now using the HAL clock interrupt. Remove other unused code. - Fix more bugs in new hal IRQ implementation (that still isn't used yet due to regressions) and implement HalClearSoftwareInterrupt. Modified: trunk/reactos/hal/hal/hal.c trunk/reactos/hal/hal/hal.def trunk/reactos/hal/halx86/generic/generic.rbuild trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/generic/irq.S trunk/reactos/hal/halx86/generic/irql.c trunk/reactos/hal/halx86/generic/systimer.S trunk/reactos/hal/halx86/generic/timer.c trunk/reactos/hal/halx86/include/halp.h trunk/reactos/include/ndk/asm.h trunk/reactos/ntoskrnl/deprecated/irq.c trunk/reactos/ntoskrnl/ke/i386/irq.c Modified: trunk/reactos/hal/hal/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.c?rev=24908&r1… ============================================================================== --- trunk/reactos/hal/hal/hal.c (original) +++ trunk/reactos/hal/hal/hal.c Tue Nov 28 11:11:14 2006 @@ -173,7 +173,8 @@ VOID NTAPI HalCalibratePerformanceCounter( - ULONG Count) + volatile LONG *Count, + ULONGLONG NewCount) { UNIMPLEMENTED; } Modified: trunk/reactos/hal/hal/hal.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.def?rev=24908&… ============================================================================== --- trunk/reactos/hal/hal/hal.def (original) +++ trunk/reactos/hal/hal/hal.def Tue Nov 28 11:11:14 2006 @@ -30,7 +30,7 @@ HalAllocateCrashDumpRegisters@8 HalAssignSlotResources@32 HalBeginSystemInterrupt@12 -HalCalibratePerformanceCounter@4 +HalCalibratePerformanceCounter@12 HalDisableSystemInterrupt@8 HalDisplayString@4 HalEnableSystemInterrupt@12 Modified: trunk/reactos/hal/halx86/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/generic… ============================================================================== --- trunk/reactos/hal/halx86/generic/generic.rbuild (original) +++ trunk/reactos/hal/halx86/generic/generic.rbuild Tue Nov 28 11:11:14 2006 @@ -17,6 +17,7 @@ <file>sysbus.c</file> <file>sysinfo.c</file> <file>timer.c</file> + <file>systimer.S</file> <pch>../include/hal.h</pch> </module> <module name="hal_generic_up" type="objectlibrary"> @@ -28,7 +29,6 @@ <file>irql.c</file> <file>processor.c</file> <file>spinlock.c</file> - <file>systimer.S</file> </module> <module name="hal_generic_pc" type="objectlibrary"> <include base="hal_generic_pc">../include</include> Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… ============================================================================== --- trunk/reactos/hal/halx86/generic/halinit.c (original) +++ trunk/reactos/hal/halx86/generic/halinit.c Tue Nov 28 11:11:14 2006 @@ -113,7 +113,7 @@ HalpInitNonBusHandler(); /* Initialize the clock interrupt */ - //HalpInitPhase1(); + HalpInitPhase1(); /* Initialize DMA. NT does this in Phase 0 */ HalpInitDma(); Modified: trunk/reactos/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S (original) +++ trunk/reactos/hal/halx86/generic/irq.S Tue Nov 28 11:11:14 2006 @@ -67,18 +67,21 @@ .long 0xFFFFFFFB /* IRQL 31 */ HalpSysIntHandler: -.rept 8 +.rept 7 .long GenericIRQ /* IRQ 0-7 */ .endr .long IRQ7 /* IRQ 7 */ -.rept 8 +.rept 7 .long GenericIRQ /* IRQ 8-15 */ .endr .long IRQ15 /* IRQ 15 */ .rept 20 .long GenericIRQ /* IRQ 16-35 */ +.endr +#if DBG .rept 172 .long InvalidIRQ /* IRQ 36-207 */ +#endif .endr SoftIntByteTable: @@ -147,25 +150,38 @@ ret .endfunc -.globl @HalRequestSoftwareInterrupt@4 -.func @HalRequestSoftwareInterrupt@4 -_@HalRequestSoftwareInterrupt@4: -@HalRequestSoftwareInterrupt@4: +.globl @HalClearSoftwareInterrupt@4 +.func @HalClearSoftwareInterrupt@4, @HalClearSoftwareInterrupt@4 +@HalClearSoftwareInterrupt@4: /* Get IRR mask */ mov eax, 1 shl eax, cl + not eax + + /* Set IRR */ + and PCR[KPCR_IRR], eax + ret +.endfunc + +.globl @HalRequestSoftwareInterrupt@4 +.func @HalRequestSoftwareInterrupt@4, @HalRequestSoftwareInterrupt@4 +@HalRequestSoftwareInterrupt@4: + + /* Get IRR mask */ + mov eax, 1 + shl eax, cl /* Disable interrupts */ pushf cli /* Set IRR and get IRQL */ - or [fs:KPCR_IRR], eax - mov ecx, [fs:KPCR_IRQL] + or PCR[KPCR_IRR], eax + mov ecx, PCR[KPCR_IRQL] /* Get software IRR mask */ - mov eax, [fs:KPCR_IRR] + mov eax, PCR[KPCR_IRR] and eax, 3 /* Get highest pending software interrupt and check if it's higher */ @@ -196,7 +212,7 @@ mov edx, 1 shl edx, cl cli - or [fs:KPCR_IDR], edx + or PCR[KPCR_IDR], edx /* Get the current mask */ xor eax, eax @@ -263,12 +279,12 @@ shl eax, cl not eax cli - and [fs:KPCR_IDR], eax + and PCR[KPCR_IDR], eax /* Get the current IRQL and mask the IRQs in the PIC */ - mov eax, [fs:KPCR_IRQL] + movzx eax, byte ptr PCR[KPCR_IRQL] mov eax, KiI8259MaskTable[eax*4] - or eax, [fs:KPCR_IDR] + or eax, PCR[KPCR_IDR] out 0x21, al shr eax, 8 out 0xA1, al @@ -281,7 +297,9 @@ Invalid: /* Fail, invalid IRQ */ +#if DBG int 3 +#endif xor eax, eax ret 12 .endfunc @@ -291,7 +309,7 @@ _HalBeginSystemInterrupt@12: /* Convert to IRQ and call the handler */ - mov edx, [esp+8] + movzx edx, byte ptr [esp+8] sub edx, PRIMARY_VECTOR_BASE jmp HalpSysIntHandler[edx*4] @@ -326,22 +344,22 @@ GenericIRQ: /* Return the current IRQL */ mov eax, [esp+12] - mov ecx, [fs:KPCR_IRQL] + movzx ecx, byte ptr PCR[KPCR_IRQL] mov [eax], cl /* Set the new IRQL */ movzx eax, byte ptr [esp+4] - mov [fs:KPCR_IRQL], eax + mov PCR[KPCR_IRQL], al /* Set IRQ mask in the PIC */ mov eax, KiI8259MaskTable[eax*4] - or eax, [fs:KPCR_IDR] + or eax, PCR[KPCR_IDR] out 0x21, al shr eax, 8 out 0xA1, al /* Check to which PIC the EOI was sent */ - mov eax, ebx + mov eax, edx cmp eax, 8 jnb Pic1 @@ -363,11 +381,13 @@ sti mov eax, 1 ret 12 - + +#if DBG InvalidIRQ: /* Dismiss it */ mov eax, 0 ret 12 +#endif .endfunc .globl _HalEndSystemInterrupt@8 @@ -376,12 +396,12 @@ /* Get the IRQL and check if it's a software interrupt */ movzx ecx, byte ptr [esp+4] - cmp dword ptr [fs:KPCR_IRQL], DISPATCH_LEVEL + cmp byte ptr PCR[KPCR_IRQL], DISPATCH_LEVEL jbe SkipMask2 /* Hardware interrupt, mask the appropriate IRQs in the PIC */ mov eax, KiI8259MaskTable[ecx*4] - or eax, [fs:KPCR_IDR] + or eax, PCR[KPCR_IDR] out 0x21, al shr eax, 8 out 0xA1, al @@ -389,8 +409,8 @@ SkipMask2: /* Set IRQL and check if there are pending software interrupts */ - mov [fs:KPCR_IRQL], ecx - mov eax, [fs:KPCR_IRR] + mov PCR[KPCR_IRQL], cl + mov eax, PCR[KPCR_IRR] mov al, SoftIntByteTable[eax] cmp al, cl ja DoCall @@ -411,15 +431,21 @@ /* Save flags since we'll disable interrupts */ pushf + /* Validate IRQL */ + movzx ecx, cl +#if DBG + cmp cl, PCR[KPCR_IRQL] + ja InvalidIrql +#endif + /* Disable interrupts and check if IRQL is below DISPATCH_LEVEL */ - movzx ecx, cl - cmp dword ptr [fs:KPCR_IRQL], DISPATCH_LEVEL + cmp byte ptr PCR[KPCR_IRQL], DISPATCH_LEVEL cli jbe SkipMask /* Clear interrupt masks since there's a pending hardware interrupt */ mov eax, KiI8259MaskTable[ecx*4] - or eax, [fs:KPCR_IDR] + or eax, PCR[KPCR_IDR] out 0x21, al shr eax, 8 out 0xA1, al @@ -427,8 +453,8 @@ SkipMask: /* Set the new IRQL and check if there's a pending software interrupt */ - mov [fs:KPCR_IRQL], ecx - mov eax, [fs:KPCR_IRR] + mov PCR[KPCR_IRQL], cl + mov eax, PCR[KPCR_IRR] mov al, SoftIntByteTable[eax] cmp al, cl ja DoCall3 @@ -436,6 +462,22 @@ /* Restore interrupts and return */ popf ret + +#if DBG +InvalidIrql: + /* Set HIGH_LEVEL */ + movzx eax, byte ptr PCR[KPCR_IRQL] + mov byte ptr PCR[KPCR_IRQL], HIGH_LEVEL + + /* Bugcheck the system */ + push 3 + push 0 + push ecx + push eax + push IRQL_NOT_LESS_OR_EQUAL + call _KeBugCheckEx@20 +#endif + DoCall3: /* There is, call it */ call SoftIntHandlerTable[eax*4] @@ -450,10 +492,19 @@ _@KfRaiseIrql@4: @KfRaiseIrql@4: - /* Get the IRQL and check if it's Software level only */ - mov eax, [fs:KPCR_IRQL] + /* Get the IRQL */ + xor eax, eax + mov al, PCR[KPCR_IRQL] movzx ecx, cl - cmp ecx, DISPATCH_LEVEL + +#if DBG + /* Validate it */ + cmp eax, ecx + ja InvalidKfRaise +#endif + + /* Check if it's in the software level */ + cmp cl, DISPATCH_LEVEL jbe SetIrql /* Save the current IRQL */ @@ -464,11 +515,11 @@ cli /* Set the new IRQL */ - mov [fs:KPCR_IRQL], cl + mov PCR[KPCR_IRQL], cl /* Mask the interrupts in the PIC */ mov eax, KiI8259MaskTable[ecx*4] - or eax, [fs:KPCR_IDR] + or eax, PCR[KPCR_IDR] out 0x21, al shr eax, 8 out 0xA1, al @@ -481,8 +532,22 @@ SetIrql: /* Set the IRQL and return */ - mov [fs:KPCR_IRQL], ecx - ret + mov PCR[KPCR_IRQL], cl + ret + +#if DBG +InvalidKfRaise: + /* Set to passive */ + mov byte ptr PCR[KPCR_IRQL], PASSIVE_LEVEL + + /* Bugcheck the system */ + push 9 + push 0 + push ecx + push eax + push IRQL_NOT_GREATER_OR_EQUAL + call _KeBugCheckEx@20 +#endif .endfunc .globl _KeGetCurrentIrql@0 @@ -490,7 +555,7 @@ _KeGetCurrentIrql@0: /* Return the IRQL */ - mov eax, [fs:KPCR_IRQL] + movzx eax, byte ptr PCR[KPCR_IRQL] ret .endfunc @@ -499,11 +564,29 @@ _KeRaiseIrqlToDpcLevel@0: /* Get the current IRQL */ - mov eax, [fs:KPCR_IRQL] + xor eax, eax + mov al, PCR[KPCR_IRQL] /* Set DISPATCH_LEVEL */ - mov dword ptr [fs:KPCR_IRQL], DISPATCH_LEVEL - ret + mov byte ptr PCR[KPCR_IRQL], DISPATCH_LEVEL + +#if DBG + /* Make sure we were not higher then dispatch */ + cmp al, DISPATCH_LEVEL + ja InvalidRaise +#endif + ret + +#if DBG +InvalidRaise: + /* Bugcheck the system */ + push 1 + push 0 + push DISPATCH_LEVEL + push eax + push IRQL_NOT_GREATER_OR_EQUAL + call _KeBugCheckEx@20 +#endif .endfunc .globl _KeRaiseIrqlToSynchLevel@0 @@ -516,16 +599,35 @@ /* Mask out interrupts */ mov eax, KiI8259MaskTable[DISPATCH_LEVEL*4] - or eax, [fs:KPCR_IDR] + or eax, PCR[KPCR_IDR] out 0x21, al shr eax, 8 out 0xA1, al /* Return the old IRQL, enable interrupts and set to DISPATCH */ - mov eax, [fs:KPCR_IRQL] - mov dword ptr [fs:KPCR_IRQL], DISPATCH_LEVEL + mov al, PCR[KPCR_IRQL] + mov byte ptr PCR[KPCR_IRQL], DISPATCH_LEVEL popf - ret + +#if DBG + /* Validate raise */ + cmp al, DISPATCH_LEVEL + ja InvalidSyRaise +#endif + + /* Return */ + ret + +#if DBG +InvalidSyRaise: + /* Bugcheck the system */ + push 2 + push 0 + push DISPATCH_LEVEL + push eax + push IRQL_NOT_GREATER_OR_EQUAL + call _KeBugCheckEx@20 +#endif .endfunc .globl _HalpApcInterrupt @@ -547,9 +649,9 @@ _HalpApcInterrupt2ndEntry: /* Save current IRQL and set to APC level */ - push [fs:KPCR_IRQL] - mov dword ptr [fs:KPCR_IRQL], APC_LEVEL - and dword ptr [fs:KPCR_IRR], ~(1 << APC_LEVEL) + push PCR[KPCR_IRQL] + mov dword ptr PCR[KPCR_IRQL], APC_LEVEL + and dword ptr PCR[KPCR_IRR], ~(1 << APC_LEVEL) /* Enable interrupts and check if we came from User/V86 mode */ sti @@ -594,9 +696,9 @@ _HalpDispatchInterrupt2ndEntry: /* Save current IRQL and set to DPC level */ - push [fs:KPCR_IRQL] - mov dword ptr [fs:KPCR_IRQL], DISPATCH_LEVEL - and dword ptr [fs:KPCR_IRR], ~(1 << DISPATCH_LEVEL) + push PCR[KPCR_IRQL] + mov dword ptr PCR[KPCR_IRQL], DISPATCH_LEVEL + and dword ptr PCR[KPCR_IRR], ~(1 << DISPATCH_LEVEL) /* Enable interrupts and let the kernel handle this */ sti @@ -614,20 +716,20 @@ /* Get the IRQL and check if we're in the software region */ movzx ecx, byte ptr [esp+4] - cmp dword ptr [fs:KPCR_IRQL], DISPATCH_LEVEL + cmp dword ptr PCR[KPCR_IRQL], DISPATCH_LEVEL jbe SoftwareInt /* Set the right mask in the PIC for the hardware IRQ */ mov eax, KiI8259MaskTable[ecx*4] - or eax, [fs:KPCR_IDR] + or eax, PCR[KPCR_IDR] out 0x21, al shr eax, 8 out 0xA1, al SoftwareInt: /* Check if there are pending software interrupts */ - mov [fs:KPCR_IRQL], ecx - mov eax, [fs:KPCR_IRR] + mov PCR[KPCR_IRQL], ecx + mov eax, PCR[KPCR_IRR] mov al, SoftIntByteTable[eax] cmp al, cl ja DoCall2 Modified: trunk/reactos/hal/halx86/generic/irql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irql.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/irql.c (original) +++ trunk/reactos/hal/halx86/generic/irql.c Tue Nov 28 11:11:14 2006 @@ -96,8 +96,8 @@ WRITE_PORT_UCHAR((PUCHAR)0x21, 0x1); WRITE_PORT_UCHAR((PUCHAR)0xa1, 0x1); /* Enable interrupts */ - WRITE_PORT_UCHAR((PUCHAR)0x21, pic_mask.master); - WRITE_PORT_UCHAR((PUCHAR)0xa1, pic_mask.slave); + WRITE_PORT_UCHAR((PUCHAR)0x21, 0xFF); + WRITE_PORT_UCHAR((PUCHAR)0xa1, 0xFF); /* We can now enable interrupts */ _enable(); @@ -305,7 +305,7 @@ KIRQL STDCALL KeRaiseIrqlToSynchLevel (VOID) { - return KfRaiseIrql (CLOCK2_LEVEL); + return KfRaiseIrql (DISPATCH_LEVEL); } Modified: trunk/reactos/hal/halx86/generic/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/systime… ============================================================================== --- trunk/reactos/hal/halx86/generic/systimer.S (original) +++ trunk/reactos/hal/halx86/generic/systimer.S Tue Nov 28 11:11:14 2006 @@ -10,8 +10,40 @@ #include <asm.h> #include <internal/i386/asmmacro.S> .intel_syntax noprefix +.extern _HalpCurrentTimeIncrement /* FUNCTIONS *****************************************************************/ + +.globl _KeStallExecutionProcessor@4 +.func KeStallExecutionProcessor@4 +_KeStallExecutionProcessor@4: + + /* Get the number of microseconds required */ + mov ecx, [esp+4] + jecxz Done + + /* Multiply by the stall factor */ + mov eax, fs:[KPCR_STALL_SCALE_FACTOR] + mul ecx + + /* Align to 16 bytes */ + .align 16 + + /* Jump to subtraction loop */ + jmp SubtractLoop + + /* Align to 16 bytes */ + .align 16 + + /* Subtract one count */ +SubtractLoop: + sub eax, 1 + jnz SubtractLoop + +Done: + /* Return */ + ret 4 +.endfunc .globl _HalpClockInterrupt@0 .func HalpClockInterrupt@0 @@ -35,7 +67,8 @@ jz Spurious /* Do a tick */ - mov eax, 100000 + mov eax, _HalpCurrentTimeIncrement + xor ebx, ebx jmp _KeUpdateSystemTime@0 Spurious: Modified: trunk/reactos/hal/halx86/generic/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/timer.c (original) +++ trunk/reactos/hal/halx86/generic/timer.c Tue Nov 28 11:11:14 2006 @@ -38,127 +38,146 @@ /* GLOBALS ******************************************************************/ -#define TMR_CTRL 0x43 /* I/O for control */ -#define TMR_CNT0 0x40 /* I/O for counter 0 */ -#define TMR_CNT1 0x41 /* I/O for counter 1 */ -#define TMR_CNT2 0x42 /* I/O for counter 2 */ - -#define TMR_SC0 0 /* Select channel 0 */ -#define TMR_SC1 0x40 /* Select channel 1 */ -#define TMR_SC2 0x80 /* Select channel 2 */ - -#define TMR_LOW 0x10 /* RW low byte only */ -#define TMR_HIGH 0x20 /* RW high byte only */ -#define TMR_BOTH 0x30 /* RW both bytes */ - -#define TMR_MD0 0 /* Mode 0 */ -#define TMR_MD1 0x2 /* Mode 1 */ -#define TMR_MD2 0x4 /* Mode 2 */ -#define TMR_MD3 0x6 /* Mode 3 */ -#define TMR_MD4 0x8 /* Mode 4 */ -#define TMR_MD5 0xA /* Mode 5 */ - -#define TMR_BCD 1 /* BCD mode */ - -#define TMR_LATCH 0 /* Latch command */ - -#define TMR_READ 0xF0 /* Read command */ -#define TMR_CNT 0x20 /* CNT bit (Active low, subtract it) */ -#define TMR_STAT 0x10 /* Status bit (Active low, subtract it) */ -#define TMR_CH2 0x8 /* Channel 2 bit */ -#define TMR_CH1 0x4 /* Channel 1 bit */ -#define TMR_CH0 0x2 /* Channel 0 bit */ - #define MILLISEC 10 /* Number of millisec between interrupts */ #define HZ (1000 / MILLISEC) /* Number of interrupts per second */ #define CLOCK_TICK_RATE 1193182 /* Clock frequency of the timer chip */ #define LATCH (CLOCK_TICK_RATE / HZ) /* Count to program into the timer chip */ #define PRECISION 8 /* Number of bits to calibrate for delay loop */ -static BOOLEAN UdelayCalibrated = FALSE; - -/* FUNCTIONS **************************************************************/ +/* GLOBALS *******************************************************************/ + +BOOLEAN HalpClockSetMSRate; +ULONG HalpCurrentTimeIncrement; +ULONG HalpCurrentRollOver; +ULONG HalpNextMSRate = 14; +ULONG HalpLargestClockMS = 15; + +LARGE_INTEGER HalpRolloverTable[15] = +{ + {{1197, 10032}}, + {{2394, 20064}}, + {{3591, 30096}}, + {{4767, 39952}}, + {{5964, 49984}}, + {{7161, 60016}}, + {{8358, 70048}}, + {{9555, 80080}}, + {{10731, 89936}}, + {{11949, 100144}}, + {{13125, 110000}}, + {{14322, 120032}}, + {{15519, 130064}}, + {{16695, 139920}}, + {{17892, 149952}} +}; + +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +HalpInitializeClock(VOID) +{ + PKPRCB Prcb = KeGetCurrentPrcb(); + ULONG Increment; + USHORT RollOver; + + /* Check the CPU Type */ + if (Prcb->CpuType <= 4) + { + /* 486's or equal can't go higher then 10ms */ + HalpLargestClockMS = 10; + HalpNextMSRate = 9; + } + + /* Get increment and rollover for the largest time clock ms possible */ + Increment= HalpRolloverTable[HalpLargestClockMS - 1].HighPart; + RollOver = (USHORT)HalpRolloverTable[HalpLargestClockMS - 1].LowPart; + + /* Set the maximum and minimum increment with the kernel */ + HalpCurrentTimeIncrement = Increment; + KeSetTimeIncrement(Increment, HalpRolloverTable[0].HighPart); + + /* Disable interrupts */ + _disable(); + + /* Set the rollover */ + __outbyte(TIMER_CONTROL_PORT, TIMER_SC0 | TIMER_BOTH | TIMER_MD2); + __outbyte(TIMER_DATA_PORT0, RollOver & 0xFF); + __outbyte(TIMER_DATA_PORT0, RollOver >> 8); + + /* Restore interrupts */ + _enable(); + + /* Save rollover and return */ + HalpCurrentRollOver = RollOver; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ /* - * NOTE: This function MUST NOT be optimized by the compiler! - * If it is, it obviously will not delay AT ALL, and the system - * will appear completely frozen at boot since - * HalpCalibrateStallExecution will never return. - * There are three options to stop optimization: - * 1. Use a volatile automatic variable. Making it delay quite a bit - * due to memory accesses, and keeping the code portable. However, - * as this involves memory access it depends on both the CPU cache, - * e.g. if the stack used is already in a cache line or not, and - * whether or not we're MP. If MP, another CPU could (probably would) - * also access RAM at the same time - making the delay imprecise. - * 2. Use compiler-specific #pragma's to disable optimization. - * 3. Use inline assembly, making it equally unportable as #2. - * For supported compilers we use inline assembler. For the others, - * portable plain C. - */ -DECLSPEC_NOINLINE VOID STDCALL -__KeStallExecutionProcessor(ULONG Loops) -{ - if (!Loops) - { - return; - } -#if defined(__GNUC__) - __asm__ __volatile__ ( - "mov %0, %%eax\n" - "ROSL1: dec %%eax\n" - "jnz ROSL1" : : "d" (Loops)); - -#elif defined(_MSC_VER) - __asm mov eax, Loops -ROSL1: - __asm dec eax - __asm jnz ROSL1 -#else - unsigned int target = Loops; - volatile unsigned int i; - for (i=0; i<target;i++); -#endif -} - + * @implemented + */ VOID -STDCALL -KeStallExecutionProcessor(ULONG Microseconds) -{ - PKIPCR Pcr = (PKIPCR)KeGetPcr(); - - if (Pcr->PrcbData.FeatureBits & KF_RDTSC) - { - LARGE_INTEGER EndCount, CurrentCount; - EndCount.QuadPart = (LONGLONG)__rdtsc(); - EndCount.QuadPart += Microseconds * (ULONGLONG)Pcr->PrcbData.MHz; - do - { - CurrentCount.QuadPart = (LONGLONG)__rdtsc(); - } - while (CurrentCount.QuadPart < EndCount.QuadPart); - } - else - { - __KeStallExecutionProcessor((Pcr->StallScaleFactor*Microseconds)/1000); - } -} - -static ULONG Read8254Timer(VOID) -{ - ULONG Count; - - /* Disable interrupts */ - _disable(); - - WRITE_PORT_UCHAR((PUCHAR) TMR_CTRL, TMR_SC0 | TMR_LATCH); - Count = READ_PORT_UCHAR((PUCHAR) TMR_CNT0); - Count |= READ_PORT_UCHAR((PUCHAR) TMR_CNT0) << 8; - - _enable(); - return Count; -} - +NTAPI +HalCalibratePerformanceCounter(IN volatile PLONG Count, + IN ULONGLONG NewCount) +{ + /* Disable interrupts */ + _disable(); + + /* Do a decrement for this CPU */ + //_InterlockedDecrement(Count); + InterlockedDecrement(Count); + + /* Wait for other CPUs */ + while (*Count); + + /* Bring interrupts back */ + _enable(); +} + +/* + * @implemented + */ +ULONG +NTAPI +HalSetTimeIncrement(IN ULONG Increment) +{ + /* Round increment to ms */ + Increment /= 10000; + + /* Normalize between our minimum (1 ms) and maximum (variable) setting */ + if (Increment > HalpLargestClockMS) Increment = HalpLargestClockMS; + if (Increment < 0) Increment = 1; + + /* Set the rate and tell HAL we want to change it */ + HalpNextMSRate = Increment; + HalpClockSetMSRate = TRUE; + + /* Return the increment */ + return HalpRolloverTable[Increment - 1].HighPart; +} + +/* STUFF *********************************************************************/ + +ULONG +FORCEINLINE +Read8254Timer(VOID) +{ + ULONG Count; + + /* Disable interrupts */ + _disable(); + + /* Set the rollover */ + __outbyte(TIMER_CONTROL_PORT, TIMER_SC0); + Count = __inbyte(TIMER_DATA_PORT0); + Count |= __inbyte(TIMER_DATA_PORT0) << 8; + + /* Restore interrupts and return count*/ + _enable(); + return Count; +} VOID WaitFor8254Wraparound(VOID) { @@ -183,20 +202,6 @@ while (Delta < 300); } -VOID -NTAPI -HalpInitializeClock(VOID) -{ - /* FIXME: Make dynamic */ - - /* Initialize the clock */ - WRITE_PORT_UCHAR((PUCHAR) TMR_CTRL, TMR_SC0 | TMR_BOTH | TMR_MD2); /* binary, mode 2, LSB/MSB, ch 0 */ - - /* Set the increment */ - WRITE_PORT_UCHAR((PUCHAR) TMR_CNT0, LATCH & 0xff); /* LSB */ - WRITE_PORT_UCHAR((PUCHAR) TMR_CNT0, LATCH >> 8); /* MSB */ -} - VOID HalpCalibrateStallExecution(VOID) { ULONG i; @@ -205,12 +210,6 @@ PKIPCR Pcr; LARGE_INTEGER StartCount, EndCount; - if (UdelayCalibrated) - { - return; - } - - UdelayCalibrated = TRUE; Pcr = (PKIPCR)KeGetPcr(); if (Pcr->PrcbData.FeatureBits & KF_RDTSC) @@ -242,7 +241,7 @@ WaitFor8254Wraparound(); - __KeStallExecutionProcessor(Pcr->StallScaleFactor); /* Do the delay */ + KeStallExecutionProcessor(Pcr->StallScaleFactor); /* Do the delay */ CurCount = Read8254Timer(); } @@ -267,7 +266,7 @@ WaitFor8254Wraparound(); - __KeStallExecutionProcessor(Pcr->StallScaleFactor); /* Do the delay */ + KeStallExecutionProcessor(Pcr->StallScaleFactor); /* Do the delay */ CurCount = Read8254Timer(); if (CurCount <= LATCH / 2) /* If a tick has passed, turn the */ @@ -294,19 +293,6 @@ for(;;); #endif } - - -VOID STDCALL -HalCalibratePerformanceCounter(ULONG Count) -{ - /* Disable interrupts */ - _disable(); - - __KeStallExecutionProcessor(Count); - - _enable(); -} - LARGE_INTEGER STDCALL @@ -360,12 +346,4 @@ return Value; } -ULONG -NTAPI -HalSetTimeIncrement(IN ULONG Increment) -{ - /* FIXME: TODO */ - return Increment; -} - /* EOF */ Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h (original) +++ trunk/reactos/hal/halx86/include/halp.h Tue Nov 28 11:11:14 2006 @@ -21,6 +21,13 @@ #define RTC_REGISTER_B 0x0B #define RTC_REG_A_UIP 0x80 #define RTC_REGISTER_CENTURY 0x32 + +/* Timer Registers and Ports */ +#define TIMER_CONTROL_PORT 0x43 +#define TIMER_DATA_PORT0 0x40 +#define TIMER_SC0 0 +#define TIMER_BOTH 0x30 +#define TIMER_MD2 0x4 /* Conversion functions */ #define BCD_INT(bcd) \ Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=2490… ============================================================================== --- trunk/reactos/include/ndk/asm.h (original) +++ trunk/reactos/include/ndk/asm.h Tue Nov 28 11:11:14 2006 @@ -19,6 +19,17 @@ #ifndef _ASM_H #define _ASM_H + +// +// PCR Access +// +#ifdef __ASM__ +#ifdef CONFIG_SMP +#define PCR fs: +#else +#define PCR ds:[0xFF000000] +#endif +#endif // // CPU Modes @@ -145,6 +156,7 @@ #define KPCR_IDT 0x38 #define KPCR_GDT 0x3C #define KPCR_TSS 0x40 +#define KPCR_STALL_SCALE_FACTOR 0x4C #define KPCR_SET_MEMBER 0x48 #define KPCR_NUMBER 0x51 #define KPCR_PRCB_DATA 0x120 @@ -489,6 +501,8 @@ #define STATUS_FLOAT_MULTIPLE_FAULTS 0xC00002B4 #define STATUS_FLOAT_MULTIPLE_TRAPS 0xC00002B5 #define APC_INDEX_MISMATCH 0x01 +#define IRQL_NOT_GREATER_OR_EQUAL 0x09 +#define IRQL_NOT_LESS_OR_EQUAL 0x0A #define TRAP_CAUSE_UNKNOWN 0x12 #define KMODE_EXCEPTION_NOT_HANDLED 0x13 #define IRQL_GT_ZERO_AT_SYSTEM_SERVICE 0x4A Modified: trunk/reactos/ntoskrnl/deprecated/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/deprecated/irq.c?… ============================================================================== --- trunk/reactos/ntoskrnl/deprecated/irq.c (original) +++ trunk/reactos/ntoskrnl/deprecated/irq.c Tue Nov 28 11:11:14 2006 @@ -177,231 +177,6 @@ } } -static VOID -KeIRQTrapFrameToTrapFrame(PKIRQ_TRAPFRAME IrqTrapFrame, - PKTRAP_FRAME TrapFrame) -{ - TrapFrame->SegGs = (USHORT)IrqTrapFrame->Gs; - TrapFrame->SegFs = (USHORT)IrqTrapFrame->Fs; - TrapFrame->SegEs = (USHORT)IrqTrapFrame->Es; - TrapFrame->SegDs = (USHORT)IrqTrapFrame->Ds; - TrapFrame->Eax = IrqTrapFrame->Eax; - TrapFrame->Ecx = IrqTrapFrame->Ecx; - TrapFrame->Edx = IrqTrapFrame->Edx; - TrapFrame->Ebx = IrqTrapFrame->Ebx; - TrapFrame->HardwareEsp = IrqTrapFrame->Esp; - TrapFrame->Ebp = IrqTrapFrame->Ebp; - TrapFrame->Esi = IrqTrapFrame->Esi; - TrapFrame->Edi = IrqTrapFrame->Edi; - TrapFrame->Eip = IrqTrapFrame->Eip; - TrapFrame->SegCs = IrqTrapFrame->Cs; - TrapFrame->EFlags = IrqTrapFrame->Eflags; -} - -static VOID -KeTrapFrameToIRQTrapFrame(PKTRAP_FRAME TrapFrame, - PKIRQ_TRAPFRAME IrqTrapFrame) -{ - IrqTrapFrame->Gs = TrapFrame->SegGs; - IrqTrapFrame->Fs = TrapFrame->SegFs; - IrqTrapFrame->Es = TrapFrame->SegEs; - IrqTrapFrame->Ds = TrapFrame->SegDs; - IrqTrapFrame->Eax = TrapFrame->Eax; - IrqTrapFrame->Ecx = TrapFrame->Ecx; - IrqTrapFrame->Edx = TrapFrame->Edx; - IrqTrapFrame->Ebx = TrapFrame->Ebx; - IrqTrapFrame->Esp = TrapFrame->HardwareEsp; - IrqTrapFrame->Ebp = TrapFrame->Ebp; - IrqTrapFrame->Esi = TrapFrame->Esi; - IrqTrapFrame->Edi = TrapFrame->Edi; - IrqTrapFrame->Eip = TrapFrame->Eip; - IrqTrapFrame->Cs = TrapFrame->SegCs; - IrqTrapFrame->Eflags = TrapFrame->EFlags; -} - -/* - * NOTE: On Windows this function takes exactly one parameter and EBP is - * guaranteed to point to KTRAP_FRAME. The function is used only - * by HAL, so there's no point in keeping that prototype. - * - * @implemented - */ -VOID -STDCALL -KeUpdateRunTime(IN PKTRAP_FRAME TrapFrame, - IN KIRQL Irql) -{ - PKPRCB Prcb = KeGetCurrentPrcb(); - PKTHREAD CurrentThread; - PKPROCESS CurrentProcess; - - /* Make sure we don't go further if we're in early boot phase. */ - if (!(Prcb) || !(Prcb->CurrentThread)) return; - - /* Get the current thread and process */ - CurrentThread = Prcb->CurrentThread; - CurrentProcess = CurrentThread->ApcState.Process; - - /* Check if we came from user mode */ - if (TrapFrame->PreviousPreviousMode != KernelMode) - { - /* Update user times */ - CurrentThread->UserTime++; - InterlockedIncrement((PLONG)&CurrentProcess->UserTime); - Prcb->UserTime++; - } - else - { - /* Check IRQ */ - if (Irql > DISPATCH_LEVEL) - { - /* This was an interrupt */ - Prcb->InterruptTime++; - } - else if ((Irql < DISPATCH_LEVEL) || !(Prcb->DpcRoutineActive)) - { - /* This was normal kernel time */ - CurrentThread->KernelTime++; - InterlockedIncrement((PLONG)&CurrentProcess->KernelTime); - } - else if (Irql == DISPATCH_LEVEL) - { - /* This was DPC time */ - Prcb->DpcTime++; - } - - /* Update CPU kernel time in all cases */ - Prcb->KernelTime++; - } - - /* Set the last DPC Count and request rate */ - Prcb->DpcLastCount = Prcb->DpcData[0].DpcCount; - Prcb->DpcRequestRate = ((Prcb->DpcData[0].DpcCount - Prcb->DpcLastCount) + - Prcb->DpcRequestRate) / 2; - - /* Check if we should request a DPC */ - if ((Prcb->DpcData[0].DpcQueueDepth) && !(Prcb->DpcRoutineActive)) - { - /* Request one */ - HalRequestSoftwareInterrupt(DISPATCH_LEVEL); - - /* Update the depth if needed */ - if ((Prcb->DpcRequestRate < KiIdealDpcRate) && - (Prcb->MaximumDpcQueueDepth > 1)) - { - /* Decrease the maximum depth by one */ - Prcb->MaximumDpcQueueDepth--; - } - } - else - { - /* Decrease the adjustment threshold */ - if (!(--Prcb->AdjustDpcThreshold)) - { - /* We've hit 0, reset it */ - Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; - - /* Check if we've hit queue maximum */ - if (KiMaximumDpcQueueDepth != Prcb->MaximumDpcQueueDepth) - { - /* Increase maximum by one */ - Prcb->MaximumDpcQueueDepth++; - } - } - } - - /* - * If we're at end of quantum request software interrupt. The rest - * is handled in KiDispatchInterrupt. - * - * NOTE: If one stays at DISPATCH_LEVEL for a long time the DPC routine - * which checks for quantum end will not be executed and decrementing - * the quantum here can result in overflow. This is not a problem since - * we don't care about the quantum value anymore after the QuantumEnd - * flag is set. - */ - if ((CurrentThread->Quantum -= 3) <= 0) - { - Prcb->QuantumEnd = TRUE; - HalRequestSoftwareInterrupt(DISPATCH_LEVEL); - } -} - - -/* - * NOTE: On Windows this function takes exactly zero parameters and EBP is - * guaranteed to point to KTRAP_FRAME. Also [esp+0] contains an IRQL. - * The function is used only by HAL, so there's no point in keeping - * that prototype. - * - * @implemented - */ -VOID -STDCALL -KeUpdateSystemTime(IN PKTRAP_FRAME TrapFrame, - IN KIRQL Irql, - IN ULONG Increment) -{ - LONG OldOffset; - LARGE_INTEGER Time; - ASSERT(KeGetCurrentIrql() == PROFILE_LEVEL); - if (!KiClockSetupComplete) return; - - /* Update interrupt time */ - Time.LowPart = SharedUserData->InterruptTime.LowPart; - Time.HighPart = SharedUserData->InterruptTime.High1Time; - Time.QuadPart += Increment; - SharedUserData->InterruptTime.High2Time = Time.u.HighPart; - SharedUserData->InterruptTime.LowPart = Time.u.LowPart; - SharedUserData->InterruptTime.High1Time = Time.u.HighPart; - - /* Increase the tick offset */ - KiTickOffset -= Increment; - OldOffset = KiTickOffset; - - /* Check if this isn't a tick yet */ - if (KiTickOffset > 0) - { - /* Expire timers */ - KeInsertQueueDpc(&KiExpireTimerDpc, (PVOID)TrapFrame->Eip, 0); - } - else - { - /* Setup time structure for system time */ - Time.LowPart = SharedUserData->SystemTime.LowPart; - Time.HighPart = SharedUserData->SystemTime.High1Time; - Time.QuadPart += KeTimeAdjustment; - SharedUserData->SystemTime.High2Time = Time.HighPart; - SharedUserData->SystemTime.LowPart = Time.LowPart; - SharedUserData->SystemTime.High1Time = Time.HighPart; - - /* Setup time structure for tick time */ - Time.LowPart = KeTickCount.LowPart; - Time.HighPart = KeTickCount.High1Time; - Time.QuadPart += 1; - KeTickCount.High2Time = Time.HighPart; - KeTickCount.LowPart = Time.LowPart; - KeTickCount.High1Time = Time.HighPart; - SharedUserData->TickCount.High2Time = Time.HighPart; - SharedUserData->TickCount.LowPart = Time.LowPart; - SharedUserData->TickCount.High1Time = Time.HighPart; - - /* Update tick count in shared user data as well */ - SharedUserData->TickCountLowDeprecated++; - - /* Queue a DPC that will expire timers */ - KeInsertQueueDpc(&KiExpireTimerDpc, (PVOID)TrapFrame->Eip, 0); - } - - /* Update process and thread times */ - if (OldOffset <= 0) - { - /* This was a tick, calculate the next one */ - KiTickOffset += KeMaximumIncrement; - KeUpdateRunTime(TrapFrame, Irql); - } -} - VOID STDCALL KiInterruptDispatch2 (ULONG vector, KIRQL old_level) /* @@ -453,9 +228,7 @@ */ { KIRQL old_level; - KTRAP_FRAME KernelTrapFrame; PKTHREAD CurrentThread; - PKTRAP_FRAME OldTrapFrame=NULL; /* * At this point we have interrupts disabled, nothing has been done to @@ -482,20 +255,12 @@ */ _enable(); -#ifndef CONFIG_SMP - if (VECTOR2IRQ(vector) == 0) - { - KeIRQTrapFrameToTrapFrame(Trapframe, &KernelTrapFrame); - KeUpdateSystemTime(&KernelTrapFrame, old_level, 100000); - } - else -#endif - { + ASSERT (VECTOR2IRQ(vector) != 0); + /* * Actually call the ISR. */ KiInterruptDispatch2(vector, old_level); - } /* * End the system interrupt. @@ -514,23 +279,14 @@ ((PETHREAD)CurrentThread)->Cid.UniqueThread, Trapframe->Cs, CurrentThread->TrapFrame ? CurrentThread->TrapFrame->SegCs : 0); - if (CurrentThread->TrapFrame == NULL) - { - OldTrapFrame = CurrentThread->TrapFrame; - KeIRQTrapFrameToTrapFrame(Trapframe, &KernelTrapFrame); - CurrentThread->TrapFrame = &KernelTrapFrame; - } + ASSERT (CurrentThread->TrapFrame); _enable(); KiDeliverApc(UserMode, NULL, NULL); _disable(); ASSERT(KeGetCurrentThread() == CurrentThread); - if (CurrentThread->TrapFrame == &KernelTrapFrame) - { - KeTrapFrameToIRQTrapFrame(&KernelTrapFrame, Trapframe); - CurrentThread->TrapFrame = OldTrapFrame; - } + ASSERT (CurrentThread->TrapFrame); } KeLowerIrql(PASSIVE_LEVEL); } Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irq.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irq.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/irq.c Tue Nov 28 11:11:14 2006 @@ -226,7 +226,7 @@ /* Set the system affinity and acquire the dispatcher lock */ KeSetSystemAffinityThread(1 << Number); - OldIrql = KeAcquireDispatcherDatabaseLock(); + OldIrql = KiAcquireDispatcherLock(); /* Check if it's already been connected */ if (!Interrupt->Connected) @@ -272,7 +272,7 @@ } /* Unlock the dispatcher and revert affinity */ - KeReleaseDispatcherDatabaseLock(OldIrql); + KiReleaseDispatcherLock(OldIrql); KeRevertToUserAffinityThread(); /* Return to caller */ @@ -296,7 +296,7 @@ KeSetSystemAffinityThread(1 << Interrupt->Number); /* Lock the dispatcher */ - OldIrql = KeAcquireDispatcherDatabaseLock(); + OldIrql = KiAcquireDispatcherLock(); /* Check if it's actually connected */ State = Interrupt->Connected; @@ -354,7 +354,7 @@ } /* Unlock the dispatcher and revert affinity */ - KeReleaseDispatcherDatabaseLock(OldIrql); + KiReleaseDispatcherLock(OldIrql); KeRevertToUserAffinityThread(); /* Return to caller */

1 0

[jimtabor] 24907: Add Wine defines for disk and memory meta files.
by jimtabor＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: jimtabor Date: Tue Nov 28 10:47:07 2006 New Revision: 24907 URL: http://svn.reactos.org/svn/reactos?rev=24907&view=rev Log: Add Wine defines for disk and memory meta files. Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h trunk/reactos/dll/win32/gdi32/objects/metafile.c Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h Tue Nov 28 10:47:07 2006 @@ -25,6 +25,9 @@ /* DEFINES *******************************************************************/ #define HANDLE_LIST_INC 20 + +#define METAFILE_MEMORY 1 +#define METAFILE_DISK 2 /* TYPES *********************************************************************/ Modified: trunk/reactos/dll/win32/gdi32/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/me… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/metafile.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/metafile.c Tue Nov 28 10:47:07 2006 @@ -254,10 +254,10 @@ return NULL; } EmfDC.hFile = hFile; - EmfDC.iType = 2; + EmfDC.iType = METAFILE_DISK; } else - EmfDC.iType = 1; + EmfDC.iType = METAFILE_MEMORY; return mDC; }

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