Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 67571: Revert NTAPI changes. MS uses stdcall by default (/gz), we don't and need to explicitly add this in the headers
by gedmurphy＠svn.reactos.org 05 May '15

05 May '15

Author: gedmurphy Date: Tue May 5 22:30:50 2015 New Revision: 67571 URL: http://svn.reactos.org/svn/reactos?rev=67571&view=rev Log: Revert NTAPI changes. MS uses stdcall by default (/gz), we don't and need to explicitly add this in the headers Modified: trunk/reactos/include/ddk/ntifs.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=67… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Tue May 5 22:30:50 2015 @@ -4890,12 +4890,12 @@ } FS_FILTER_CALLBACK_DATA, *PFS_FILTER_CALLBACK_DATA; typedef NTSTATUS -(*PFS_FILTER_CALLBACK) ( +(NTAPI *PFS_FILTER_CALLBACK) ( _In_ PFS_FILTER_CALLBACK_DATA Data, _Out_ PVOID *CompletionContext); typedef VOID -(*PFS_FILTER_COMPLETION_CALLBACK) ( +(NTAPI *PFS_FILTER_COMPLETION_CALLBACK) ( _In_ PFS_FILTER_CALLBACK_DATA Data, _In_ NTSTATUS OperationStatus, _In_ PVOID CompletionContext);

1 0

[dreimer] 67570: [RC] Truncate some too long strings in resources. Some I cant't cut down because of it's language were marked as too long for translators to fix. VMWInst skipped, it should die any...
by dreimer＠svn.reactos.org 05 May '15

05 May '15

Author: dreimer Date: Tue May 5 21:00:44 2015 New Revision: 67570 URL: http://svn.reactos.org/svn/reactos?rev=67570&view=rev Log: [RC] Truncate some too long strings in resources. Some I cant't cut down because of it's language were marked as too long for translators to fix. VMWInst skipped, it should die anyway. Modified: trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc trunk/reactos/base/applications/notepad/lang/bg-BG.rc trunk/reactos/base/applications/notepad/lang/cs-CZ.rc trunk/reactos/base/applications/notepad/lang/da-DK.rc trunk/reactos/base/applications/notepad/lang/de-DE.rc trunk/reactos/base/applications/notepad/lang/el-GR.rc trunk/reactos/base/applications/notepad/lang/en-US.rc trunk/reactos/base/applications/notepad/lang/es-ES.rc trunk/reactos/base/applications/notepad/lang/eu-ES.rc trunk/reactos/base/applications/notepad/lang/fi-FI.rc trunk/reactos/base/applications/notepad/lang/fr-FR.rc trunk/reactos/base/applications/notepad/lang/he-IL.rc trunk/reactos/base/applications/notepad/lang/hu-HU.rc trunk/reactos/base/applications/notepad/lang/hy-AM.rc trunk/reactos/base/applications/notepad/lang/id-ID.rc trunk/reactos/base/applications/notepad/lang/it-IT.rc trunk/reactos/base/applications/notepad/lang/ja-JP.rc trunk/reactos/base/applications/notepad/lang/lt-LT.rc trunk/reactos/base/applications/notepad/lang/nl-NL.rc trunk/reactos/base/applications/notepad/lang/no-NO.rc trunk/reactos/base/applications/notepad/lang/pl-PL.rc trunk/reactos/base/applications/notepad/lang/pt-BR.rc trunk/reactos/base/applications/notepad/lang/pt-PT.rc trunk/reactos/base/applications/notepad/lang/ro-RO.rc trunk/reactos/base/applications/notepad/lang/ru-RU.rc trunk/reactos/base/applications/notepad/lang/sk-SK.rc trunk/reactos/base/applications/notepad/lang/sl-SI.rc trunk/reactos/base/applications/notepad/lang/sq-AL.rc trunk/reactos/base/applications/notepad/lang/sv-SE.rc trunk/reactos/base/applications/notepad/lang/th-TH.rc trunk/reactos/base/applications/notepad/lang/tr-TR.rc trunk/reactos/base/applications/notepad/lang/uk-UA.rc trunk/reactos/base/applications/notepad/lang/uz-UZ.rc trunk/reactos/base/applications/notepad/lang/zh-CN.rc trunk/reactos/dll/cpl/intl/lang/it-IT.rc trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc trunk/reactos/dll/win32/rasdlg/lang/de-DE.rc trunk/reactos/dll/win32/tapiui/lang/sq-AL.rc Modified: trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -24,7 +24,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Acest instrument oferÄ informaÈii detaliate despre componentele ReactX Èi modulele-pilot instalate Ã®n sistem. De asemenea, vÄ permite testarea funcÈionalitÄÈilor, diagnosticarea problemelor, precum Èi modificarea configuraÈiei de sistem pentru obÈinerea de rezultate optime.", -1, 10, 10, 443, 17 + LTEXT "Acest instrument oferÄ informaÈii detaliate despre componentele ReactX Èi modulele-pilot instalate Ã®n sistem.", -1, 10, 10, 443, 17 LTEXT "DacÄ aveÈi la cunoÈtinÈÄ careva probleme la o anumitÄ categorie, mergeÈi la compartimentul corespunzÄtor de mai sus. Altfel, puteÈi utiliza butonul âUrmÄtorul compartimentâ de mai jos pentru a trece secvenÈial prin fiecare categorie.", -1, 10, 30, 443, 25 GROUPBOX "InformaÈii despre sistem", -1, 10, 55, 443, 130, SS_RIGHT LTEXT "Data/Ora curentÄ:", -1, 70, 70, 80, 10, SS_RIGHT Modified: trunk/reactos/base/applications/notepad/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/bg-BG.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "ÐÐ° ÐÐµÐ»ÐµÐ¶Ð½Ð¸ÐºÐ° Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ÐÐµÐ»ÐµÐ¶Ð½Ð¸Ðº Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡, Ð²1,0\r\nÐÑÐ·Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´ÑÑÐ²ÐµÐ½Ð¾ Ð¿ÑÐ°Ð²Ð¾ 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\nÐÑÐ·Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´ÑÑÐ²ÐµÐ½Ð¾ Ð¿ÑÐ°Ð²Ð¾ 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\nÐÑÐ·Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´ÑÑÐ²ÐµÐ½Ð¾ Ð¿ÑÐ°Ð²Ð¾ 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\nÐÑÐ·Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´ÑÑÐ²ÐµÐ½Ð¾ Ð¿ÑÐ°Ð²Ð¾ 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ÐÐµÐ»ÐµÐ¶Ð½Ð¸Ðº Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡, Ð²1,0\r\nÐÑÐ·Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´ÑÑÐ²ÐµÐ½Ð¾ Ð¿ÑÐ°Ð²Ð¾ 1997,98 Marcel Baur\r\nÐÑÐ·Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´ÑÑÐ²ÐµÐ½Ð¾ Ð¿ÑÐ°Ð²Ð¾ 2000 Mike McCormack\r\nÐÑÐ·Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´ÑÑÐ²ÐµÐ½Ð¾ Ð¿ÑÐ°Ð²Ð¾ 2002 Sylvain Petreolle\r\nÐÑÐ·Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´ÑÑÐ²ÐµÐ½Ð¾ Ð¿ÑÐ°Ð²Ð¾ 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "ÐÐ°ÑÐ²Ð°ÑÑÐ½Ðµ", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 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 [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/cs-CZ.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ 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", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "ZavÅÃt", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/da-DK.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "About 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", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "Close", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/de-DE.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "Ãber 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", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "SchlieÃen", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/el-GR.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "About 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", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "Close", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/en-US.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "About 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", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "Close", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/es-ES.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "Acerca de Bloc de notas de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Bloc de notas de ReactOS 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", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "Bloc de notas de ReactOS v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "Cerrar", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/eu-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/eu-ES.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "ReactOS ohar-blokari buruz" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ReactOS-en ohar-bloka 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", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ReactOS-en ohar-bloka v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "Itxi", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/fi-FI.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "About 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", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "Close", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/fr-FR.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "About 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", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "Fermer", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/he-IL.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "×××××ª ×¤× ×§×¡ ××¨×©××××ª ×©× ReactOS" 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", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "×¡×××¨", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/hu-HU.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "About 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", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "Close", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/hy-AM.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/hy-AM.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/hy-AM.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "About 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", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "Ô¾Õ¡Õ®Õ¯Õ¥Õ¬", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/id-ID.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "Tentang ReactOS Notepad" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ReactOS Notepad v1.0\r\nHak Cipta 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\nHak Cipta 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\nHak Cipta 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ReactOS Notepad v1.0\r\nHak Cipta 1997,98 Marcel Baur\r\nHak Cipta 2000 Mike McCormack\r\nHak Cipta 2002 Sylvain Petreolle\r\nHak Cipta 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "Close", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/it-IT.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "Informazioni su blocco note ReactOS" 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", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "Chiudi", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/ja-JP.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "ReactOS ã¡ã¢å¸³ã«ã¤ãã¦" FONT 9, "MS UI Gothic" BEGIN - CONTROL "ReactOS ã¡ã¢å¸³ 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", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ReactOS ã¡ã¢å¸³ v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "éãã", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/lt-LT.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "Apie ReactOS Notepad" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ReactOS Notepad v1.0\r\n(C) 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\n(C) 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\n(C) 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\n(C) 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 238, 39 + CONTROL "ReactOS Notepad v1.0\r\n(C) 1997,98 Marcel Baur\r\n(C) 2000 Mike McCormack\r\n(C) 2002 Sylvain Petreolle\r\n(C) 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 238, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "UÅ¾verti", IDOK, 123, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/nl-NL.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "About 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", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "Close", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/no-NO.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "Om ReactOS Notisblokk" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ReactOS Notisblokk v1.0\r\nenerett 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\nEnerett 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\nEnerett 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\nEnerett 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ReactOS Notisblokk v1.0\r\nEnerett 1997,98 Marcel Baur\r\nEnerett 2000 Mike McCormack\r\nEnerett 2002 Sylvain Petreolle\r\nEnerett 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "Avslutt", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/pl-PL.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "Notatnik ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Notatnik ReactOS 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 ", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "Notatnik ReactOS v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "Zamknij", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/pt-BR.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "Sobre Notepad ReactOS" 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", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "Fechar", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/pt-PT.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "Sobre Notepad ReactOS" 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", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "Fechar", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/ro-RO.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -140,7 +140,7 @@ CAPTION "Despre CarneÈelul ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "CarneÈelul ReactOS v1.0\r\nDrept de autor 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\nDrept de autor 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\nDrept de autor 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\nDrept de autor 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 242, 39 + CONTROL "CarneÈelul ReactOS v1.0\r\nDrept de autor 1997,98 Marcel Baur\r\nDrept de autor 2000 Mike McCormack\r\nDrept de autor 2002 Sylvain Petreolle\r\nDrept de autor 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 242, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "Ã&nchide", IDOK, 119, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/ru-RU.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ ÐÐ»Ð¾ÐºÐ½Ð¾Ñ ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ÐÐ»Ð¾ÐºÐ½Ð¾Ñ ReactOS 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 ", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ÐÐ»Ð¾ÐºÐ½Ð¾Ñ ReactOS v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "ÐÐ°ÐºÑÑÑÑ", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/sk-SK.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -143,7 +143,7 @@ CAPTION "Äo je PoznÃ¡mkovÃ½ blok systÃ©mu ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "PoznÃ¡mkovÃ½ blok systÃ©mu ReactOS 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\nPreklad 2007 Kario <kario(a)szm.sk>\r\n ", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "PoznÃ¡mkovÃ½ blok systÃ©mu ReactOS v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "ZavrieÅ¥", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/sl-SI.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "About 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", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "Close", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/sq-AL.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -139,7 +139,7 @@ CAPTION "Rreth 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", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "Mbyll", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/sv-SE.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "Om ReactOS Anteckningar" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ReactOS Anteckningar 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 ", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ReactOS Anteckningar v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "StÃ¤ng", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/th-TH.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "About 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", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "Close", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/tr-TR.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -137,7 +137,7 @@ CAPTION "Not Defteri Ãzerine" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Not Defteri - SÃ¼rÃ¼m: 1.0\r\nTelif HaklarÄ±:\r\n1997,98 - Marcel Baur (mbaur(a)g26.ethz.ch)\r\n2000 - Mike McCormack (Mike_McCormack(a)looksmart.com.au)\r\n2002 - Sylvain Petreolle (spetreolle(a)yahoo.fr)\r\n2002 - Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "Not Defteri - SÃ¼rÃ¼m: 1.0\r\nTelif HaklarÄ±:\r\n1997,98 - Marcel Baur\r\n2000 - Mike McCormack\r\n2002 - Sylvain Petreolle\r\n2002 - Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "Kapat", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/uk-UA.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "ÐÑÐ¾ ÐÐ»Ð¾ÐºÐ½Ð¾Ñ ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ÐÐ»Ð¾ÐºÐ½Ð¾Ñ ReactOS 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 ", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ÐÐ»Ð¾ÐºÐ½Ð¾Ñ ReactOS v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "ÐÐ°ÐºÑÐ¸ÑÐ¸", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/uz-UZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/uz-UZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/uz-UZ.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ ÐÐ»Ð¾ÐºÐ½Ð¾Ñ ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ÐÐ»Ð¾ÐºÐ½Ð¾Ñ ReactOS 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 ", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ÐÐ»Ð¾ÐºÐ½Ð¾Ñ ReactOS v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "ÐÐ°ÐºÑÑÑÑ", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/base/applications/notepad/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/zh-CN.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -135,7 +135,7 @@ CAPTION "å³äº ReactOS è®°äºæ¬" FONT 9, "MS Shell Dlg" BEGIN - CONTROL "ReactOS è®°äºæ¬ v1.0\r\nçæ 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\nçæ 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\nçæ 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\nçæ 2002 Andriy Palamarchuk\r\n ", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ReactOS è®°äºæ¬ v1.0\r\nçæ 1997,98 Marcel Baur\r\nçæ 2000 Mike McCormack\r\nçæ 2002 Sylvain Petreolle\r\nçæ 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "éæ", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "å³é", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 Modified: trunk/reactos/dll/cpl/intl/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/it-IT.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -49,7 +49,7 @@ BEGIN GROUPBOX "Lingua per programmi non Unicode", -1, 5, 5, 234, 90 COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "In base a questa impostazione di sistema Ã¨ possibile visualizzare menÃ¹ e finestre di dialogo di programmi non Unicode nella lingua di origine. I programmi Unicode resteranno invariati, ma l'impostazione verrÃ applicata per tutti gli utenti che utilizzano il computer.", -1, 14, 18, 223, 33 + LTEXT "In base a questa impostazione di sistema Ã¨ possibile visualizzare menÃ¹ e finestre di dialogo di programmi non Unicode nella lingua di origine. I programmi Unicode resteranno invariati, ma l'impostazione verrÃ applicata per tutti gli utenti che utilizzano il computer.", -1, 14, 18, 223, 33 //TOO LONG, MAX 256 CHARS ALLOWED LTEXT "Selezionare una lingua per i programmi non Unicode da utilizzare:", -1, 14, 55, 223, 18 GROUPBOX "Tabella di conversione di tabelle codici", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 Modified: trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -130,7 +130,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON - LTEXT "Î£ÏÎ± ÏÏÎ¿ÏÎ¯Î» ÏÏÎ®ÏÏÎ· Î±ÏÎ¿Î¸Î·ÎºÎµÏÎ¿Î½ÏÎ±Î¹ ÏÏÎ¸Î¼Î¯ÏÎµÎ¹Ï Î³Î¹Î± ÏÎ·Î½ ÎµÏÎ¹ÏÎ¬Î½ÎµÎ¹Î± ÎµÏÎ³Î±ÏÎ¯Î±Ï ÎºÎ±Î¹ Î¬Î»Î»ÎµÏ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ ÏÏÎµÏÎ¹ÎºÎÏ Î¼Îµ ÏÎ¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï ÏÏÎ®ÏÏÎ· ÏÎ±Ï. ÎÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± Î´Î·Î¼Î¹Î¿ÏÏÎ³Î®ÏÎµÏÎµ ÎÎ½Î± Î´Î¹Î±ÏÎ¿ÏÎµÏÎ¹ÎºÏ ÏÏÎ¿ÏÎ¯Î» Î³Î¹Î± ÎºÎ¬Î¸Îµ ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎ® ÏÎ¿Ï ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹ÎµÎ¯ÏÎµ Î® Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÎµÏÎ¹Î»ÎÎ¾ÎµÏÎµ ÎÎ½Î± ÏÏÎ¿ÏÎ¯Î» ÏÎµÏÎ¹Î±Î³ÏÎ³Î®Ï ÏÎ¿ Î¿ÏÎ¿Î¯Î¿ ÎµÎ¯Î½Î±Î¹ ÏÎ¿ Î¯Î´Î¹Î¿ ÏÎµ ÎºÎ¬Î¸Îµ ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎ® ÏÎ¿Ï ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹ÎµÎ¯ÏÎµ.", IDC_STATIC, 40, 3, 204, 40 + LTEXT "Î£ÏÎ± ÏÏÎ¿ÏÎ¯Î» ÏÏÎ®ÏÏÎ· Î±ÏÎ¿Î¸Î·ÎºÎµÏÎ¿Î½ÏÎ±Î¹ ÏÏÎ¸Î¼Î¯ÏÎµÎ¹Ï Î³Î¹Î± ÏÎ·Î½ ÎµÏÎ¹ÏÎ¬Î½ÎµÎ¹Î± ÎµÏÎ³Î±ÏÎ¯Î±Ï ÎºÎ±Î¹ Î¬Î»Î»ÎµÏ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ ÏÏÎµÏÎ¹ÎºÎÏ Î¼Îµ ÏÎ¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï ÏÏÎ®ÏÏÎ· ÏÎ±Ï. ÎÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± Î´Î·Î¼Î¹Î¿ÏÏÎ³Î®ÏÎµÏÎµ ÎÎ½Î± Î´Î¹Î±ÏÎ¿ÏÎµÏÎ¹ÎºÏ ÏÏÎ¿ÏÎ¯Î» Î³Î¹Î± ÎºÎ¬Î¸Îµ ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎ® ÏÎ¿Ï ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹ÎµÎ¯ÏÎµ Î® Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÎµÏÎ¹Î»ÎÎ¾ÎµÏÎµ ÎÎ½Î± ÏÏÎ¿ÏÎ¯Î» ÏÎµÏÎ¹Î±Î³ÏÎ³Î®Ï ÏÎ¿ Î¿ÏÎ¿Î¯Î¿ ÎµÎ¯Î½Î±Î¹ ÏÎ¿ Î¯Î´Î¹Î¿ ÏÎµ ÎºÎ¬Î¸Îµ ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎ® ÏÎ¿Ï ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹ÎµÎ¯ÏÎµ.", IDC_STATIC, 40, 3, 204, 40 //TOO LONG, MAX 256 CHARS ALLOWED LTEXT "ÎÏÎ¿&Î¸Î·ÎºÎµÏÎ¼ÎÎ½Î± ÏÏÎ¿ÏÎ¯Î» ÏÎµ Î±ÏÏÏÎ½ ÏÎ¿Î½ ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎ®:", IDC_STATIC, 16, 51, 204, 9 CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 6, 66, 244, 85, WS_EX_CLIENTEDGE Modified: trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/nl-NL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -130,7 +130,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON - LTEXT "In gebruikersprofielen liggen instellingen voor het bureaublad en andere informatie over uw gebruikerssessie opgeslagen. U kunt op elke computer die u gebruikt een ander profiel maken, of kiezen voor een zwevend profiel dat op elke computer die u gebruikt hetzelfde is.", IDC_STATIC, 40, 11, 211, 35 + LTEXT "In gebruikersprofielen liggen instellingen voor het bureaublad en andere informatie over uw gebruikerssessie opgeslagen. U kunt op elke computer die u gebruikt een ander profiel maken, of kiezen voor een zwevend profiel dat op elke computer die u gebruikt hetzelfde is.", IDC_STATIC, 40, 11, 211, 35 //TOO LONG, MAX 256 CHARS ALLOWED LTEXT "&Profielen die op deze computer zijn opgeslagen:", IDC_STATIC, 16, 51, 204, 9 CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 6, 66, 244, 85, WS_EX_CLIENTEDGE Modified: trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -138,7 +138,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON - LTEXT "PouÅ¾ÃvateÄ¾skÃ© profily obsahujÃº nastavenia pracovnej plochy a inÃ© informÃ¡cie tÃ½kajÃºce sa pouÅ¾ÃvateÄ¾skÃ©ho konta. Na kaÅ¾dom pouÅ¾Ãvanom poÄÃtaÄi je moÅ¾nÃ© vytvoriÅ¥ inÃ½ profil alebo je moÅ¾nÃ© vybraÅ¥ zdieÄ¾anÃ½ profil, ktorÃ½ je rovnakÃ½ na vÅ¡etkÃ½ch pouÅ¾ÃvanÃ½ch poÄÃtaÄoch.", IDC_STATIC, 40, 11, 204, 44 + LTEXT "PouÅ¾ÃvateÄ¾skÃ© profily obsahujÃº nastavenia pracovnej plochy a inÃ© informÃ¡cie tÃ½kajÃºce sa pouÅ¾ÃvateÄ¾skÃ©ho konta. Na kaÅ¾dom pouÅ¾Ãvanom poÄÃtaÄi je moÅ¾nÃ© vytvoriÅ¥ inÃ½ profil alebo je moÅ¾nÃ© vybraÅ¥ zdieÄ¾anÃ½ profil, ktorÃ½ je rovnakÃ½ na vÅ¡etkÃ½ch pouÅ¾ÃvanÃ½ch poÄÃtaÄoch.", IDC_STATIC, 40, 11, 204, 44 //TOO LONG, MAX 256 CHARS ALLOWED LTEXT "&Profily uloÅ¾enÃ© na tomto poÄÃtaÄi:", IDC_STATIC, 16, 51, 204, 9 CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 6, 66, 244, 85, WS_EX_CLIENTEDGE Modified: trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sq-AL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -130,7 +130,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON - LTEXT "Profilet e pÃ«rdoruesve pÃ«rmbajnÃ« parametrat e desktop-it dhe informacione tÃ« tjera nÃ« lidhje me hyrjen tuaj. NjÃ« profil i ndryshÃ«m mund tÃ« krijohet nÃ« Ã§do kompjuter qÃ« ju pÃ«rdorni, ose ju mund tÃ« zgjidhni njÃ« profil kryesorÃ« qÃ« Ã«shtÃ« i njÃ«jtÃ« nÃ« Ã§do kompjuter qÃ« ju pÃ«rdorni.", IDC_STATIC, 40, 11, 211, 35 + LTEXT "Profilet e pÃ«rdoruesve pÃ«rmbajnÃ« parametrat e desktop-it dhe informacione tÃ« tjera nÃ« lidhje me hyrjen tuaj. NjÃ« profil i ndryshÃ«m mund tÃ« krijohet nÃ« Ã§do kompjuter qÃ« ju pÃ«rdorni, ose ju mund tÃ« zgjidhni njÃ« profil kryesorÃ« qÃ« Ã«shtÃ« i njÃ«jtÃ« nÃ« Ã§do kompjuter qÃ« ju pÃ«rdorni.", IDC_STATIC, 40, 11, 211, 35 //TOO LONG, MAX 256 CHARS ALLOWED LTEXT "Profilet e ruajtura nÃ« kÃ«tÃ« kompjuter:", IDC_STATIC, 16, 51, 204, 9 CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 6, 66, 244, 85, WS_EX_CLIENTEDGE Modified: trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -138,7 +138,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON - LTEXT "ÐÑÐ¾ÑÑÐ»Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÑÐ² Ð¼ÑÑÑÑÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¸ ÑÐ¾Ð±Ð¾ÑÐ¾Ð³Ð¾ ÑÑÐ¾Ð»Ð° ÑÐ° ÑÐ½ÑÑ Ð²ÑÐ´Ð¾Ð¼Ð¾ÑÑÑ ÑÑÐ¾ÑÐ¾Ð²Ð½Ð¾ Ð¾Ð±Ð»ÑÐºÐ¾Ð²Ð¸Ñ Ð·Ð°Ð¿Ð¸ÑÑÐ² ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÑÐ². ÐÐ¸ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÑÐ²Ð¾ÑÐ¸ÑÐ¸ Ð¾ÐºÑÐµÐ¼Ñ Ð¿ÑÐ¾ÑÑÐ»Ñ Ð´Ð»Ñ ÐºÐ¾Ð¶Ð½Ð¾Ð³Ð¾ Ð· ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑÑÐ², Ð½Ð° ÑÐºÐ¸Ñ Ð²Ð¸ Ð¿ÑÐ°ÑÑÑÑÐµ, Ð°Ð±Ð¾ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÐ²Ð°ÑÐ¸ Ð¾Ð´Ð¸Ð½ ÑÐ¿ÑÐ»ÑÐ½Ð¸Ð¹ Ð¿ÑÐ¾ÑÑÐ»Ñ Ð´Ð»Ñ Ð²ÑÑÑ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑÑÐ².", IDC_STATIC, 40, 11, 204, 39 + LTEXT "ÐÑÐ¾ÑÑÐ»Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÑÐ² Ð¼ÑÑÑÑÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¸ ÑÐ¾Ð±Ð¾ÑÐ¾Ð³Ð¾ ÑÑÐ¾Ð»Ð° ÑÐ° ÑÐ½ÑÑ Ð²ÑÐ´Ð¾Ð¼Ð¾ÑÑÑ ÑÑÐ¾ÑÐ¾Ð²Ð½Ð¾ Ð¾Ð±Ð»ÑÐºÐ¾Ð²Ð¸Ñ Ð·Ð°Ð¿Ð¸ÑÑÐ² ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÑÐ². ÐÐ¸ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÑÐ²Ð¾ÑÐ¸ÑÐ¸ Ð¾ÐºÑÐµÐ¼Ñ Ð¿ÑÐ¾ÑÑÐ»Ñ Ð´Ð»Ñ ÐºÐ¾Ð¶Ð½Ð¾Ð³Ð¾ Ð· ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑÑÐ², Ð½Ð° ÑÐºÐ¸Ñ Ð²Ð¸ Ð¿ÑÐ°ÑÑÑÑÐµ, Ð°Ð±Ð¾ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÐ²Ð°ÑÐ¸ Ð¾Ð´Ð¸Ð½ ÑÐ¿ÑÐ»ÑÐ½Ð¸Ð¹ Ð¿ÑÐ¾ÑÑÐ»Ñ Ð´Ð»Ñ Ð²ÑÑÑ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑÑÐ².", IDC_STATIC, 40, 11, 204, 39 //TOO LONG, MAX 256 CHARS ALLOWED LTEXT "ÐÑÐ¾ÑÑÐ»Ñ, ÑÐºÑ Ð·Ð±ÐµÑÑÐ³Ð°ÑÑÑÑÑ Ð½Ð° ÑÑÐ¾Ð¼Ñ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑÑ:", IDC_STATIC, 16, 51, 204, 9 CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 6, 66, 244, 85, WS_EX_CLIENTEDGE Modified: trunk/reactos/dll/win32/rasdlg/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/rasdlg/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasdlg/lang/de-DE.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -41,10 +41,10 @@ ICON 32516, 1031, 7, 7, 20, 20 LTEXT "Eine oder mehrere Leitungen konnten keine Verbindung herstellen.", 1033, 37, 8, 216, 20 CONTROL "", 1032, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x00008401, 37, 83, 224, 136 - AUTOCHECKBOX "&Fehlgeschlagene Leitungen zukÃ¼nftig nicht mehr verwenden.", 1030, 38, 226, 222, 10 + AUTOCHECKBOX "&Fehlgeschlagene Leitungen zukÃ¼nftig nicht verwenden.", 1030, 38, 226, 222, 10 DEFPUSHBUTTON "&Annehmen", 1, 135, 242, 60, 14 PUSHBUTTON "A&uflegen", 2, 201, 242, 60, 14 - LTEXT "Wenn nur eine Verbindung aufgebaut werden konnte, dann ist der Server vermutlich nicht fÃ¼r Mehrfachverbindungen ausgelegt. Aktivieren Sie das KontrollkÃ¤stchen Fehlgeschlagene Leitungen zukÃ¼nftig nicht verwenden, um unnÃ¶tige VerbindungsgebÃ¼hren zu vermeiden.", -1, 37, 36, 224, 44 + LTEXT "Wenn nur eine nur einzige Leitung verbunden ist, ist der Server nicht zum Multi-Link-Anrufe annehmen ausgelegt. Aktivieren Sie das KontrollkÃ¤stchen 'Fehlgeschlagene Leitungen zukÃ¼nftig nicht verwenden', um unnÃ¶tige Verbindungskosten zu vermeiden.", -1, 37, 36, 224, 44 END 105 DIALOGEX 0, 0, 261, 253 @@ -706,7 +706,7 @@ LTEXT "Telefonnummer unten eingeben. ", -1, 7, 4, 306, 14 LTEXT "&Telefonnummer:", 1308, 7, 19, 130, 8 EDITTEXT 1304, 7, 30, 304, 14, ES_AUTOHSCROLL - LTEXT "Sie mÃ¼ssen eventuell eine 1 bzw. eine Vorwahl oder beides einbeziehen. WÃ¤hlen Sie die Telefonnummer auf Ihrem Telefon, wenn Sie sich nicht sicher sind, ob diese zusÃ¤tzlichen Nummern erforderlich sind. Die gewÃ¤hlte Nummer ist korrekt, wenn Sie bei dem Telefonanruf einen Modemton hÃ¶ren.", -1, 20, 50, 291, 53 + LTEXT "Sie mÃ¼ssen eventuell eine ""1"", eine Vorwahl oder beides einbeziehen. Wenn Sie nicht sicher sind, ob zusÃ¤tzliche Nummern erforderlich sind, wÃ¤hlen Sie die Telefonnummer auf Ihrem Telefon. Wenn Sie ein Modem hÃ¶ren, ist die gewÃ¤hlte Nummer richtig.", -1, 20, 50, 291, 53 END 169 DIALOGEX 6, 18, 235, 135 Modified: trunk/reactos/dll/win32/tapiui/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/sq-A… ============================================================================== --- trunk/reactos/dll/win32/tapiui/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapiui/lang/sq-AL.rc [iso-8859-1] Tue May 5 21:00:44 2015 @@ -159,7 +159,7 @@ BEGIN LTEXT "Numri hyrÃ«s pÃ«r &thirrje lokale:", -1, 7, 7, 238, 8 EDITTEXT 1008, 7, 18, 140, 14, ES_AUTOHSCROLL - LTEXT "PÃ«rdorni butonat mÃ« poshtÃ« pÃ«r tÃ« hyrÃ« nÃ« hapat formues numrit pÃ«r tÃ« bÃ«rÃ« thirrje lokale. Shkruani kÃ«to hapa nÃ« mÃ«nyrÃ« tÃ« saktÃ« si ato qÃ« shfaqen nÃ« kartÃ«n tuaj tÃ« quajtur. PÃ«r tÃ« bÃ«rÃ« thirrje lokale pa pÃ«rdorur kartÃ«n tuaj tÃ« quajtur, lÃ«re kÃ«tÃ« seksion bosh.", 2000, 7, 40, 238, 24 + LTEXT "PÃ«rdorni butonat mÃ« poshtÃ« pÃ«r tÃ« hyrÃ« nÃ« hapat formues numrit pÃ«r tÃ« bÃ«rÃ« thirrje lokale. Shkruani kÃ«to hapa nÃ« mÃ«nyrÃ« tÃ« saktÃ« si ato qÃ« shfaqen nÃ« kartÃ«n tuaj tÃ« quajtur.", 2000, 7, 40, 238, 24 LTEXT "Hapat thirrÃ«s pÃ«r kartÃ«n telefonuese:", -1, 7, 72, 238, 8 CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE PUSHBUTTON "LÃ«viz &Lart", 1022, 195, 83, 50, 14

1 0

[aandrejevic] 67569: [NTVDM] Fix INT 16h, AH=01h/11h.
by aandrejevic＠svn.reactos.org 05 May '15

05 May '15

Author: aandrejevic Date: Tue May 5 20:49:09 2015 New Revision: 67569 URL: http://svn.reactos.org/svn/reactos?rev=67569&view=rev Log: [NTVDM] Fix INT 16h, AH=01h/11h. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] Tue May 5 20:49:09 2015 @@ -122,18 +122,19 @@ { /* There is a character, clear ZF and return it */ Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_ZF; + + if (getAH() == 0x01 && LOBYTE(Character) == 0xE0) + { + /* Clear the extended code */ + Character &= 0xFF00; + } + setAX(Character); } else { /* No character, set ZF */ Stack[STACK_FLAGS] |= EMULATOR_FLAG_ZF; - } - - if (getAH() == 0x01 && LOBYTE(Character) == 0xE0) - { - /* Clear the extended code */ - Character &= 0xFF00; } break;

1 0

[tkreuzer] 67568: [NTOSKRNL/FREELDR/NDK] - "equalize" internal arch specific Mm headers - Move some definitions into more appropriate locations
by tkreuzer＠svn.reactos.org 05 May '15

05 May '15

Author: tkreuzer Date: Tue May 5 20:36:07 2015 New Revision: 67568 URL: http://svn.reactos.org/svn/reactos?rev=67568&view=rev Log: [NTOSKRNL/FREELDR/NDK] - "equalize" internal arch specific Mm headers - Move some definitions into more appropriate locations Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h trunk/reactos/include/ndk/arm/mmtypes.h trunk/reactos/ntoskrnl/include/internal/amd64/mm.h trunk/reactos/ntoskrnl/include/internal/arm/mm.h trunk/reactos/ntoskrnl/include/internal/i386/mm.h trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/amd64/init.c trunk/reactos/ntoskrnl/mm/arm/stubs.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/i386/pagepae.c Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h [iso-8859-1] Tue May 5 20:36:07 2015 @@ -38,3 +38,30 @@ { DbgBreakPoint(); } + +typedef struct _PAGE_TABLE_ARM +{ + HARDWARE_PTE_ARMV6 Pte[1024]; +} PAGE_TABLE_ARM, *PPAGE_TABLE_ARM; +C_ASSERT(sizeof(PAGE_TABLE_ARM) == PAGE_SIZE); + +typedef struct _PAGE_DIRECTORY_ARM +{ + union + { + HARDWARE_PDE_ARMV6 Pde[4096]; + HARDWARE_LARGE_PTE_ARMV6 Pte[4096]; + }; +} PAGE_DIRECTORY_ARM, *PPAGE_DIRECTORY_ARM; +C_ASSERT(sizeof(PAGE_DIRECTORY_ARM) == (4 * PAGE_SIZE)); + +// FIXME: sync with NDK +typedef enum _ARM_DOMAIN +{ + FaultDomain, + ClientDomain, + InvalidDomain, + ManagerDomain +} ARM_DOMAIN; + +#define PDE_SHIFT 20 Modified: trunk/reactos/include/ndk/arm/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/mmtypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/arm/mmtypes.h [iso-8859-1] Tue May 5 20:36:07 2015 @@ -83,7 +83,7 @@ ULONG NoExecute:1; ULONG Domain:4; ULONG Ecc:1; - ULONG Sbo:1; + ULONG Sbo:1; // ULONG Accessed:1;? ULONG Owner:1; ULONG CacheAttributes:3; ULONG ReadOnly:1; @@ -100,7 +100,7 @@ ULONG Valid:1; ULONG Buffered:1; ULONG Cached:1; - ULONG Sbo:1; + ULONG Sbo:1; // ULONG Accessed:1;? ULONG Owner:1; ULONG CacheAttributes:3; ULONG ReadOnly:1; Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Tue May 5 20:36:07 2015 @@ -6,7 +6,6 @@ #define _MI_PAGING_LEVELS 4 /* Memory layout base addresses */ -#define MI_LOWEST_VAD_ADDRESS (PVOID)0x0000000000010000ULL #define MI_USER_PROBE_ADDRESS (PVOID)0x000007FFFFFF0000ULL #define MI_DEFAULT_SYSTEM_RANGE_START (PVOID)0xFFFF080000000000ULL #define MI_REAL_SYSTEM_RANGE_START 0xFFFF800000000000ULL @@ -20,17 +19,19 @@ #define MI_SESSION_SPACE_END 0xFFFFF97FFFFFFFFFULL #define MM_SYSTEM_SPACE_START 0xFFFFF98000000000ULL #define MI_PFN_DATABASE 0xFFFFFA8000000000ULL +#define MI_DEBUG_MAPPING (PVOID)0xFFFFFFFF80000000ULL // FIXME #define MI_NONPAGED_POOL_END (PVOID)0xFFFFFFFFFFBFFFFFULL #define MI_HIGHEST_SYSTEM_ADDRESS (PVOID)0xFFFFFFFFFFFFFFFFULL +#define MmSystemRangeStart ((PVOID)MI_REAL_SYSTEM_RANGE_START) /* WOW64 address definitions */ #define MM_HIGHEST_USER_ADDRESS_WOW64 0x7FFEFFFF #define MM_SYSTEM_RANGE_START_WOW64 0x80000000 -#define MI_DEBUG_MAPPING (PVOID)0xFFFFFFFF80000000ULL // FIXME -#define MI_NON_PAGED_SYSTEM_START_MIN MM_SYSTEM_SPACE_START // FIXME -#define MI_SYSTEM_PTE_START MM_SYSTEM_SPACE_START -#define MI_SYSTEM_PTE_END (MI_SYSTEM_PTE_START + MI_NUMBER_SYSTEM_PTES * PAGE_SIZE - 1) +/* Misc address definitions */ +//#define MI_NON_PAGED_SYSTEM_START_MIN MM_SYSTEM_SPACE_START // FIXME +//#define MI_SYSTEM_PTE_START MM_SYSTEM_SPACE_START +//#define MI_SYSTEM_PTE_END (MI_SYSTEM_PTE_START + MI_NUMBER_SYSTEM_PTES * PAGE_SIZE - 1) #define MI_SYSTEM_PTE_BASE (PVOID)MiAddressToPte(KSEG0_BASE) #define MM_HIGHEST_VAD_ADDRESS (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE)) #define MI_MAPPING_RANGE_START HYPER_SPACE @@ -40,64 +41,42 @@ #define MI_WORKING_SET_LIST (MI_VAD_BITMAP + PAGE_SIZE) /* Memory sizes */ -#define MI_MIN_PAGES_FOR_NONPAGED_POOL_TUNING ((255*1024*1024) >> PAGE_SHIFT) -#define MI_MIN_PAGES_FOR_SYSPTE_TUNING ((19*1024*1024) >> PAGE_SHIFT) -#define MI_MIN_PAGES_FOR_SYSPTE_BOOST ((32*1024*1024) >> PAGE_SHIFT) -#define MI_MIN_PAGES_FOR_SYSPTE_BOOST_BOOST ((256*1024*1024) >> PAGE_SHIFT) -#define MI_MIN_INIT_PAGED_POOLSIZE (32 * 1024 * 1024) -#define MI_MAX_INIT_NONPAGED_POOL_SIZE (128ULL * 1024 * 1024 * 1024) -#define MI_MAX_NONPAGED_POOL_SIZE (128ULL * 1024 * 1024 * 1024) -#define MI_SYSTEM_VIEW_SIZE (16 * 1024 * 1024) -#define MI_MIN_SECONDARY_COLORS 8 -#define MI_SECONDARY_COLORS 64 -#define MI_MAX_SECONDARY_COLORS 1024 -#define MI_MIN_ALLOCATION_FRAGMENT (4 * _1KB) -#define MI_ALLOCATION_FRAGMENT (64 * _1KB) -#define MI_MAX_ALLOCATION_FRAGMENT (2 * _1MB) -#define MI_SESSION_WORKING_SET_SIZE (4 * 1024 * 1024) -#define MI_SESSION_VIEW_SIZE (20 * 1024 * 1024) -#define MI_SESSION_POOL_SIZE (16 * 1024 * 1024) -#define MI_SESSION_IMAGE_SIZE (8 * 1024 * 1024) -#define MI_SESSION_SIZE (MI_SESSION_VIEW_SIZE + \ - MI_SESSION_POOL_SIZE + \ - MI_SESSION_IMAGE_SIZE + \ - MI_SESSION_WORKING_SET_SIZE) - -#define MmSystemRangeStart ((PVOID)MI_REAL_SYSTEM_RANGE_START) +#define MI_MIN_PAGES_FOR_NONPAGED_POOL_TUNING ((255 * _1MB) >> PAGE_SHIFT) +#define MI_MIN_PAGES_FOR_SYSPTE_TUNING ((19 * _1MB) >> PAGE_SHIFT) +#define MI_MIN_PAGES_FOR_SYSPTE_BOOST ((32 * _1MB) >> PAGE_SHIFT) +#define MI_MIN_PAGES_FOR_SYSPTE_BOOST_BOOST ((256 * _1MB) >> PAGE_SHIFT) +#define MI_MIN_INIT_PAGED_POOLSIZE (32 * _1MB) +#define MI_MAX_INIT_NONPAGED_POOL_SIZE (128ULL * 1024 * 1024 * 1024) +#define MI_MAX_NONPAGED_POOL_SIZE (128ULL * 1024 * 1024 * 1024) +#define MI_SYSTEM_VIEW_SIZE (16 * _1MB) +#define MI_SESSION_VIEW_SIZE (20 * _1MB) +#define MI_SESSION_POOL_SIZE (16 * _1MB) +#define MI_SESSION_IMAGE_SIZE (8 * _1MB) +#define MI_SESSION_WORKING_SET_SIZE (4 * _1MB) +#define MI_SESSION_SIZE (MI_SESSION_VIEW_SIZE + \ + MI_SESSION_POOL_SIZE + \ + MI_SESSION_IMAGE_SIZE + \ + MI_SESSION_WORKING_SET_SIZE) +#define MI_MIN_ALLOCATION_FRAGMENT (4 * _1KB) +#define MI_ALLOCATION_FRAGMENT (64 * _1KB) +#define MI_MAX_ALLOCATION_FRAGMENT (2 * _1MB) /* Misc constants */ -#define MI_NUMBER_SYSTEM_PTES 22000 -#define MI_MAX_FREE_PAGE_LISTS 4 -#define MI_HYPERSPACE_PTES (256 - 1) -#define MI_ZERO_PTES (32) -/* FIXME - different architectures have different cache line sizes... */ -#define MI_MAX_ZERO_BITS 53 - -/* Helper macros */ -#define IS_ALIGNED(addr, align) (((ULONG64)(addr) & (align - 1)) == 0) -#define IS_PAGE_ALIGNED(addr) IS_ALIGNED(addr, PAGE_SIZE) - -#define MiIsPteOnPdeBoundary(PointerPte) \ - ((((ULONG_PTR)PointerPte) & (PAGE_SIZE - 1)) == 0) -#define MiIsPteOnPpeBoundary(PointerPte) \ - ((((ULONG_PTR)PointerPte) & (PDE_PER_PAGE * PAGE_SIZE - 1)) == 0) -#define MiIsPteOnPxeBoundary(PointerPte) \ - ((((ULONG_PTR)PointerPte) & (PPE_PER_PAGE * PDE_PER_PAGE * PAGE_SIZE - 1)) == 0) +#define MM_PTE_SOFTWARE_PROTECTION_BITS 5 +#define MI_MIN_SECONDARY_COLORS 8 +#define MI_SECONDARY_COLORS 64 +#define MI_MAX_SECONDARY_COLORS 1024 +#define MI_NUMBER_SYSTEM_PTES 22000 +#define MI_MAX_FREE_PAGE_LISTS 4 +#define MI_HYPERSPACE_PTES (256 - 1) +#define MI_ZERO_PTES (32) +#define MI_MAX_ZERO_BITS 53 +#define SESSION_POOL_LOOKASIDES 21 /* MMPTE related defines */ #define MM_EMPTY_PTE_LIST ((ULONG64)0xFFFFFFFF) #define MM_EMPTY_LIST ((ULONG_PTR)-1) -#define ADDR_TO_PAGE_TABLE(v) ((ULONG)(((ULONG_PTR)(v)) / (512 * PAGE_SIZE))) -#define ADDR_TO_PDE_OFFSET(v) ((ULONG)((((ULONG_PTR)(v)) / (512 * PAGE_SIZE)))) -#define ADDR_TO_PTE_OFFSET(v) ((ULONG)((((ULONG_PTR)(v)) % (512 * PAGE_SIZE)) / PAGE_SIZE)) - -#define MiGetPdeOffset ADDR_TO_PDE_OFFSET - -#define VAtoPXI(va) ((((ULONG64)va) >> PXI_SHIFT) & 0x1FF) -#define VAtoPPI(va) ((((ULONG64)va) >> PPI_SHIFT) & 0x1FF) -#define VAtoPDI(va) ((((ULONG64)va) >> PDI_SHIFT) & 0x1FF) -#define VAtoPTI(va) ((((ULONG64)va) >> PTI_SHIFT) & 0x1FF) /* Easy accessing PFN in PTE */ #define PFN_FROM_PTE(v) ((v)->u.Hard.PageFrameNumber) @@ -105,7 +84,7 @@ #define PFN_FROM_PPE(v) ((v)->u.Hard.PageFrameNumber) #define PFN_FROM_PXE(v) ((v)->u.Hard.PageFrameNumber) -// FIXME, only copied from x86 +/* Macros for portable PTE modification */ #define MI_MAKE_LOCAL_PAGE(x) ((x)->u.Hard.Global = 0) #define MI_MAKE_DIRTY_PAGE(x) ((x)->u.Hard.Dirty = 1) #define MI_MAKE_ACCESSED_PAGE(x) ((x)->u.Hard.Accessed = 1) @@ -128,16 +107,42 @@ #endif /* On x64, these are the same */ -#define MMPDE MMPTE -#define PMMPDE PMMPTE -#define MMPPE MMPTE -#define PMMPPE PMMPTE -#define MMPXE MMPTE -#define PMMPXE PMMPTE #define MI_WRITE_VALID_PPE MI_WRITE_VALID_PTE - #define ValidKernelPpe ValidKernelPde +/* Convert an address to a corresponding PTE */ +PMMPTE +FORCEINLINE +_MiAddressToPte(PVOID Address) +{ + ULONG64 Offset = (ULONG64)Address >> (PTI_SHIFT - 3); + Offset &= 0xFFFFFFFFFULL << 3; + return (PMMPTE)(PTE_BASE + Offset); +} +#define MiAddressToPte(x) _MiAddressToPte((PVOID)(x)) + +/* Convert an address to a corresponding PDE */ +PMMPTE +FORCEINLINE +_MiAddressToPde(PVOID Address) +{ + ULONG64 Offset = (ULONG64)Address >> (PDI_SHIFT - 3); + Offset &= 0x7FFFFFF << 3; + return (PMMPTE)(PDE_BASE + Offset); +} +#define MiAddressToPde(x) _MiAddressToPde((PVOID)(x)) + +/* Convert an address to a corresponding PPE */ +PMMPTE +FORCEINLINE +MiAddressToPpe(PVOID Address) +{ + ULONG64 Offset = (ULONG64)Address >> (PPI_SHIFT - 3); + Offset &= 0x3FFFF << 3; + return (PMMPTE)(PPE_BASE + Offset); +} + +/* Convert an address to a corresponding PXE */ PMMPTE FORCEINLINE MiAddressToPxe(PVOID Address) @@ -147,35 +152,7 @@ return (PMMPTE)(PXE_BASE + Offset); } -PMMPTE -FORCEINLINE -MiAddressToPpe(PVOID Address) -{ - ULONG64 Offset = (ULONG64)Address >> (PPI_SHIFT - 3); - Offset &= 0x3FFFF << 3; - return (PMMPTE)(PPE_BASE + Offset); -} - -PMMPTE -FORCEINLINE -_MiAddressToPde(PVOID Address) -{ - ULONG64 Offset = (ULONG64)Address >> (PDI_SHIFT - 3); - Offset &= 0x7FFFFFF << 3; - return (PMMPTE)(PDE_BASE + Offset); -} -#define MiAddressToPde(x) _MiAddressToPde((PVOID)(x)) - -PMMPTE -FORCEINLINE -_MiAddressToPte(PVOID Address) -{ - ULONG64 Offset = (ULONG64)Address >> (PTI_SHIFT - 3); - Offset &= 0xFFFFFFFFFULL << 3; - return (PMMPTE)(PTE_BASE + Offset); -} -#define MiAddressToPte(x) _MiAddressToPte((PVOID)(x)) - +/* Convert an address to a corresponding PTE offset/index */ ULONG FORCEINLINE MiAddressToPti(PVOID Address) @@ -184,14 +161,24 @@ } #define MiAddressToPteOffset(x) MiAddressToPti(x) // FIXME: bad name +/* Convert an address to a corresponding PDE offset/index */ ULONG FORCEINLINE +MiAddressToPdi(PVOID Address) +{ + return ((((ULONG64)Address) >> PDI_SHIFT) & 0x1FF); +} +#define MiAddressToPdeOffset(x) MiAddressToPdi(x) +#define MiGetPdeOffset(x) MiAddressToPdi(x) + +/* Convert an address to a corresponding PXE offset/index */ +ULONG +FORCEINLINE MiAddressToPxi(PVOID Address) { return ((((ULONG64)Address) >> PXI_SHIFT) & 0x1FF); } - /* Convert a PTE into a corresponding address */ PVOID FORCEINLINE @@ -201,6 +188,7 @@ return (PVOID)(((LONG64)PointerPte << 25) >> 16); } +/* Convert a PDE into a corresponding address */ PVOID FORCEINLINE MiPdeToAddress(PMMPTE PointerPde) @@ -209,6 +197,7 @@ return (PVOID)(((LONG64)PointerPde << 34) >> 16); } +/* Convert a PPE into a corresponding address */ PVOID FORCEINLINE MiPpeToAddress(PMMPTE PointerPpe) @@ -217,12 +206,76 @@ return (PVOID)(((LONG64)PointerPpe << 43) >> 16); } +/* Convert a PXE into a corresponding address */ PVOID FORCEINLINE MiPxeToAddress(PMMPTE PointerPxe) { /* Use signed math */ return (PVOID)(((LONG64)PointerPxe << 52) >> 16); +} + +/* Translate between P*Es */ +#define MiPdeToPte(_Pde) ((PMMPTE)MiPteToAddress(_Pde)) +#define MiPteToPde(_Pte) ((PMMPDE)MiAddressToPte(_Pte)) +#define MiPdeToPpe(_Pde) ((PMMPPE)MiAddressToPte(_Pde)) + +/* Check P*E boundaries */ +#define MiIsPteOnPdeBoundary(PointerPte) \ + ((((ULONG_PTR)PointerPte) & (PAGE_SIZE - 1)) == 0) +#define MiIsPteOnPpeBoundary(PointerPte) \ + ((((ULONG_PTR)PointerPte) & (PDE_PER_PAGE * PAGE_SIZE - 1)) == 0) +#define MiIsPteOnPxeBoundary(PointerPte) \ + ((((ULONG_PTR)PointerPte) & (PPE_PER_PAGE * PDE_PER_PAGE * PAGE_SIZE - 1)) == 0) + +// +// Decodes a Prototype PTE into the underlying PTE +// +#define MiProtoPteToPte(x) \ + (PMMPTE)(((LONG64)(x)->u.Long) >> 16) /* Sign extend 48 bits */ + +// +// Decodes a Prototype PTE into the underlying PTE +// +#define MiSubsectionPteToSubsection(x) \ + (PMMPTE)((x)->u.Subsect.SubsectionAddress >> 16) + +FORCEINLINE +VOID +MI_MAKE_SUBSECTION_PTE(IN PMMPTE NewPte, + IN PVOID Segment) +{ + ASSERT(FALSE); +} + +FORCEINLINE +VOID +MI_MAKE_PROTOTYPE_PTE(IN PMMPTE NewPte, + IN PMMPTE PointerPte) +{ + /* Store the Address */ + NewPte->u.Long = (ULONG64)PointerPte << 16; + + /* Mark this as a prototype PTE */ + NewPte->u.Proto.Prototype = 1; + + ASSERT(MiProtoPteToPte(NewPte) == PointerPte); +} + +FORCEINLINE +BOOLEAN +MI_IS_MAPPED_PTE(PMMPTE PointerPte) +{ + /// FIXME + __debugbreak(); + return ((PointerPte->u.Long & 0xFFFFFC01) != 0); +} + +VOID +FORCEINLINE +MmInitGlobalKernelPageDirectory(VOID) +{ + /* Nothing to do */ } BOOLEAN @@ -234,54 +287,3 @@ (MiAddressToPde(Address)->u.Hard.Valid)); } -#define MiPdeToPte(PDE) ((PMMPTE)MiPteToAddress(PDE)) -#define MiPteToPde(PTE) ((PMMPDE)MiAddressToPte(PTE)) -#define MiPdeToPpe(Pde) ((PMMPPE)MiAddressToPte(Pde)) - -/* Sign extend 48 bits */ -#define MiProtoPteToPte(x) (PMMPTE)(((LONG64)(x)->u.Long) >> 16) - -// -// Decodes a Prototype PTE into the underlying PTE -// -#define MiSubsectionPteToSubsection(x) \ - (PMMPTE)((x)->u.Subsect.SubsectionAddress >> 16) - -FORCEINLINE -VOID -MI_MAKE_SUBSECTION_PTE(IN PMMPTE NewPte, - IN PVOID Segment) -{ - ASSERT(FALSE); -} - -FORCEINLINE -VOID -MI_MAKE_PROTOTYPE_PTE(IN PMMPTE NewPte, - IN PMMPTE PointerPte) -{ - /* Store the Address */ - NewPte->u.Long = (ULONG64)PointerPte << 16; - - /* Mark this as a prototype PTE */ - NewPte->u.Proto.Prototype = 1; - - ASSERT(MiProtoPteToPte(NewPte) == PointerPte); -} - -FORCEINLINE -BOOLEAN -MI_IS_MAPPED_PTE(PMMPTE PointerPte) -{ - /// FIXME - __debugbreak(); - return ((PointerPte->u.Long & 0xFFFFFC01) != 0); -} - -VOID -FORCEINLINE -MmInitGlobalKernelPageDirectory(VOID) -{ - /* Nothing to do */ -} - Modified: trunk/reactos/ntoskrnl/include/internal/arm/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] Tue May 5 20:36:07 2015 @@ -5,157 +5,147 @@ #define _MI_PAGING_LEVELS 2 -#define PDE_SHIFT 20 +/* Memory layout base addresses */ +#define MI_USER_PROBE_ADDRESS (PVOID)0x7FFF0000 +#define MI_DEFAULT_SYSTEM_RANGE_START (PVOID)0x80000000 +#define HYPER_SPACE 0xC0500000 +#define HYPER_SPACE_END 0xC08FFFFF +#define MI_SYSTEM_CACHE_WS_START (PVOID)0xC0C00000 +#define MI_PAGED_POOL_START (PVOID)0xE1000000 +#define MI_NONPAGED_POOL_END (PVOID)0xFFBE0000 +#define MI_DEBUG_MAPPING (PVOID)0xFFBFF000 + +#define PTE_BASE 0xC0000000 +#define PDE_BASE 0xC0400000 +#define PDE_TOP 0xC04FFFFF +#define PTE_TOP 0xC03FFFFF + +#define PTE_PER_PAGE 256 +#define PDE_PER_PAGE 4096 +#define PPE_PER_PAGE 1 + +/* Misc address definitions */ +#define MI_SYSTEM_PTE_BASE (PVOID)MiAddressToPte(NULL) +#define MM_HIGHEST_VAD_ADDRESS \ + (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE)) +#define MI_MAPPING_RANGE_START ((ULONG)HYPER_SPACE) +#define MI_MAPPING_RANGE_END (MI_MAPPING_RANGE_START + \ + MI_HYPERSPACE_PTES * PAGE_SIZE) +#define MI_DUMMY_PTE (PMMPTE)(MI_MAPPING_RANGE_END + \ + PAGE_SIZE) +#define MI_VAD_BITMAP (PMMPTE)(MI_DUMMY_PTE + \ + PAGE_SIZE) +#define MI_WORKING_SET_LIST (PMMPTE)(MI_VAD_BITMAP + \ + PAGE_SIZE) + +/* Memory sizes */ +#define MI_MIN_PAGES_FOR_NONPAGED_POOL_TUNING ((255 * _1MB) >> PAGE_SHIFT) +#define MI_MIN_PAGES_FOR_SYSPTE_TUNING ((19 * _1MB) >> PAGE_SHIFT) +#define MI_MIN_PAGES_FOR_SYSPTE_BOOST ((32 * _1MB) >> PAGE_SHIFT) +#define MI_MIN_PAGES_FOR_SYSPTE_BOOST_BOOST ((256 * _1MB) >> PAGE_SHIFT) +#define MI_MIN_INIT_PAGED_POOLSIZE (32 * _1MB) +#define MI_MAX_INIT_NONPAGED_POOL_SIZE (128 * _1MB) +#define MI_MAX_NONPAGED_POOL_SIZE (128 * _1MB) +#define MI_SYSTEM_VIEW_SIZE (32 * _1MB) +#define MI_SESSION_VIEW_SIZE (48 * _1MB) +#define MI_SESSION_POOL_SIZE (16 * _1MB) +#define MI_SESSION_IMAGE_SIZE (8 * _1MB) +#define MI_SESSION_WORKING_SET_SIZE (4 * _1MB) +#define MI_SESSION_SIZE (MI_SESSION_VIEW_SIZE + \ + MI_SESSION_POOL_SIZE + \ + MI_SESSION_IMAGE_SIZE + \ + MI_SESSION_WORKING_SET_SIZE) +#define MI_MIN_ALLOCATION_FRAGMENT (4 * _1KB) +#define MI_ALLOCATION_FRAGMENT (64 * _1KB) +#define MI_MAX_ALLOCATION_FRAGMENT (2 * _1MB) + +/* Misc constants */ +#define MM_PTE_SOFTWARE_PROTECTION_BITS 6 +#define MI_MIN_SECONDARY_COLORS 8 +#define MI_SECONDARY_COLORS 64 +#define MI_MAX_SECONDARY_COLORS 1024 +#define MI_MAX_FREE_PAGE_LISTS 4 +#define MI_HYPERSPACE_PTES (256 - 1) /* Dee PDR definition */ +#define MI_ZERO_PTES (32) /* Dee PDR definition */ +#define MI_MAX_ZERO_BITS 21 +#define SESSION_POOL_LOOKASIDES 26 // CHECKME + +/* MMPTE related defines */ +#define MM_EMPTY_PTE_LIST ((ULONG)0xFFFFF) +#define MM_EMPTY_LIST ((ULONG_PTR)-1) + + +/* Easy accessing PFN in PTE */ +#define PFN_FROM_PTE(v) ((v)->u.Hard.PageFrameNumber) + +/* Macros for portable PTE modification */ +#define MI_MAKE_LOCAL_PAGE(x) ((x)->u.Hard.NonGlobal = 1) +#define MI_MAKE_DIRTY_PAGE(x) +#define MI_MAKE_ACCESSED_PAGE(x) +#define MI_PAGE_DISABLE_CACHE(x) ((x)->u.Hard.Cached = 0) +#define MI_PAGE_WRITE_THROUGH(x) ((x)->u.Hard.Buffered = 0) +#define MI_PAGE_WRITE_COMBINED(x) ((x)->u.Hard.Buffered = 1) +#define MI_IS_PAGE_LARGE(x) FALSE +#define MI_IS_PAGE_WRITEABLE(x) ((x)->u.Hard.ReadOnly == 0) +#define MI_IS_PAGE_COPY_ON_WRITE(x)FALSE +#define MI_IS_PAGE_DIRTY(x) TRUE +#define MI_MAKE_OWNER_PAGE(x) ((x)->u.Hard.Owner = 1) +#define MI_MAKE_WRITE_PAGE(x) ((x)->u.Hard.ReadOnly = 0) + +/* Convert an address to a corresponding PTE */ +#define MiAddressToPte(x) \ + ((PMMPTE)(PTE_BASE + (((ULONG)(x) >> 12) << 2))) + +/* Convert an address to a corresponding PDE */ +#define MiAddressToPde(x) \ + ((PMMPDE)(PDE_BASE + (((ULONG)(x) >> 20) << 2))) + +/* Convert an address to a corresponding PTE offset/index */ +#define MiAddressToPteOffset(x) \ + ((((ULONG)(x)) << 12) >> 24) + +/* Convert an address to a corresponding PDE offset/index */ +#define MiAddressToPdeOffset(x) \ + (((ULONG)(x)) >> 20) +#define MiGetPdeOffset MiAddressToPdeOffset + +/* Convert a PTE/PDE into a corresponding address */ +#define MiPteToAddress(_Pte) ((PVOID)((ULONG)(_Pte) << 10)) +#define MiPdeToAddress(_Pde) ((PVOID)((ULONG)(_Pde) << 18)) + +/* Translate between P*Es */ +#define MiPdeToPte(_Pde) ((PMMPTE)0) /* FIXME */ +#define MiPteToPde(_Pte) ((PMMPDE)0) /* FIXME */ + +/* Check P*E boundaries */ +#define MiIsPteOnPdeBoundary(PointerPte) \ + ((((ULONG_PTR)PointerPte) & (PAGE_SIZE - 1)) == 0) // -// Number of bits corresponding to the area that a coarse page table entry represents (4KB) +// Decodes a Prototype PTE into the underlying PTE // -#define PTE_SHIFT 12 -#define PTE_SIZE (1 << PTE_SHIFT) +#define MiProtoPteToPte(x) \ + (PMMPTE)((ULONG_PTR)MmPagedPoolStart + \ + (((x)->u.Proto.ProtoAddressHigh << 9) | (x)->u.Proto.ProtoAddressLow << 2)) + +// +// Decodes a Prototype PTE into the underlying PTE +// +#define MiSubsectionPteToSubsection(x) \ + ((x)->u.Subsect.WhichPool == PagedPool) ? \ + (PMMPTE)((ULONG_PTR)MmSubsectionBase + \ + (((x)->u.Subsect.SubsectionAddressHigh << 7) | \ + (x)->u.Subsect.SubsectionAddressLow << 3)) : \ + (PMMPTE)((ULONG_PTR)MmNonPagedPoolEnd - \ + (((x)->u.Subsect.SubsectionAddressHigh << 7) | \ + (x)->u.Subsect.SubsectionAddressLow << 3)) // // Number of bits corresponding to the area that a coarse page table occupies (1KB) // #define CPT_SHIFT 10 -#define CPT_SIZE (1 << CPT_SHIFT) - -/* MMPTE related defines */ -#define MM_EMPTY_PTE_LIST ((ULONG)0xFFFFF) -#define MM_EMPTY_LIST ((ULONG_PTR)-1) - -// -// Base Addresses -// -#define PTE_BASE 0xC0000000 -#define PTE_TOP 0xC03FFFFF -#define PDE_BASE 0xC0400000 -#define PDE_TOP 0xC04FFFFF -#define HYPER_SPACE 0xC0500000 - -#if 0 -typedef struct _HARDWARE_PDE_ARMV6 -{ - ULONG Valid:1; // Only for small pages - ULONG LargePage:1; // Note, if large then Valid = 0 - ULONG Buffered:1; - ULONG Cached:1; - ULONG NoExecute:1; - ULONG Domain:4; - ULONG Ecc:1; - ULONG PageFrameNumber:22; -} HARDWARE_PDE_ARMV6, *PHARDWARE_PDE_ARMV6; - -typedef struct _HARDWARE_LARGE_PTE_ARMV6 -{ - ULONG Valid:1; // Only for small pages - ULONG LargePage:1; // Note, if large then Valid = 0 - ULONG Buffered:1; - ULONG Cached:1; - ULONG NoExecute:1; - ULONG Domain:4; - ULONG Ecc:1; - ULONG Accessed:1; - ULONG Owner:1; - ULONG CacheAttributes:3; - ULONG ReadOnly:1; - ULONG Shared:1; - ULONG NonGlobal:1; - ULONG SuperLagePage:1; - ULONG Reserved:1; - ULONG PageFrameNumber:12; -} HARDWARE_LARGE_PTE_ARMV6, *PHARDWARE_LARGE_PTE_ARMV6; - -typedef struct _HARDWARE_PTE_ARMV6 -{ - ULONG NoExecute:1; - ULONG Valid:1; - ULONG Buffered:1; - ULONG Cached:1; - ULONG Accessed:1; - ULONG Owner:1; - ULONG CacheAttributes:3; - ULONG ReadOnly:1; - ULONG Shared:1; - ULONG NonGlobal:1; - ULONG PageFrameNumber:20; -} HARDWARE_PTE_ARMV6, *PHARDWARE_PTE_ARMV6; - -C_ASSERT(sizeof(HARDWARE_PDE_ARMV6) == sizeof(ULONG)); -C_ASSERT(sizeof(HARDWARE_LARGE_PTE_ARMV6) == sizeof(ULONG)); -C_ASSERT(sizeof(HARDWARE_PTE_ARMV6) == sizeof(ULONG)); -#endif - -/* For FreeLDR */ -typedef struct _PAGE_TABLE_ARM -{ - HARDWARE_PTE_ARMV6 Pte[1024]; -} PAGE_TABLE_ARM, *PPAGE_TABLE_ARM; - -typedef struct _PAGE_DIRECTORY_ARM -{ - union - { - HARDWARE_PDE_ARMV6 Pde[4096]; - HARDWARE_LARGE_PTE_ARMV6 Pte[4096]; - }; -} PAGE_DIRECTORY_ARM, *PPAGE_DIRECTORY_ARM; - -C_ASSERT(sizeof(PAGE_TABLE_ARM) == PAGE_SIZE); -C_ASSERT(sizeof(PAGE_DIRECTORY_ARM) == (4 * PAGE_SIZE)); - -typedef enum _ARM_DOMAIN -{ - FaultDomain, - ClientDomain, - InvalidDomain, - ManagerDomain -} ARM_DOMAIN; - -#define MI_MAKE_LOCAL_PAGE(x) ((x)->u.Hard.NonGlobal = 1) -#define MI_MAKE_DIRTY_PAGE(x) -#define MI_MAKE_ACCESSED_PAGE(x) -#define MI_MAKE_OWNER_PAGE(x) ((x)->u.Hard.Owner = 1) -#define MI_MAKE_WRITE_PAGE(x) ((x)->u.Hard.ReadOnly = 0) -#define MI_PAGE_DISABLE_CACHE(x) ((x)->u.Hard.Cached = 0) -#define MI_PAGE_WRITE_THROUGH(x) ((x)->u.Hard.Buffered = 0) -#define MI_PAGE_WRITE_COMBINED(x) ((x)->u.Hard.Buffered = 1) -#define MI_IS_PAGE_WRITEABLE(x) ((x)->u.Hard.ReadOnly == 0) -#define MI_IS_PAGE_COPY_ON_WRITE(x)FALSE -#define MI_IS_PAGE_DIRTY(x) TRUE -#define MI_IS_PAGE_LARGE(x) FALSE - -/* Easy accessing PFN in PTE */ -#define PFN_FROM_PTE(v) ((v)->u.Hard.PageFrameNumber) /* See PDR definition */ -#define MI_HYPERSPACE_PTES (256 - 1) -#define MI_ZERO_PTES (32) -#define MI_MAPPING_RANGE_START ((ULONG)HYPER_SPACE) -#define MI_MAPPING_RANGE_END (MI_MAPPING_RANGE_START + \ - MI_HYPERSPACE_PTES * PAGE_SIZE) #define MI_ZERO_PTE (PMMPTE)(MI_MAPPING_RANGE_END + \ PAGE_SIZE) -#define MI_DUMMY_PTE (PMMPTE)(MI_MAPPING_RANGE_END + \ - PAGE_SIZE) -#define MI_VAD_BITMAP (PMMPTE)(MI_DUMMY_PTE + \ - PAGE_SIZE) -#define MI_WORKING_SET_LIST (PMMPTE)(MI_VAD_BITMAP + \ - PAGE_SIZE) -/* Retrives the PDE entry for the given VA */ -#define MiGetPdeAddress(x) ((PMMPDE)(PDE_BASE + (((ULONG)(x) >> 20) << 2))) -#define MiAddressToPde(x) MiGetPdeAddress(x) - -/* Retrieves the PTE entry for the given VA */ -#define MiGetPteAddress(x) ((PMMPTE)(PTE_BASE + (((ULONG)(x) >> 12) << 2))) -#define MiAddressToPte(x) MiGetPteAddress(x) - -/* Retrives the PDE offset for the given VA */ -#define MiGetPdeOffset(x) (((ULONG)(x)) >> 20) -#define MiGetPteOffset(x) ((((ULONG)(x)) << 12) >> 24) -#define MiAddressToPteOffset(x) MiGetPteOffset(x) - -/* Convert a PTE into a corresponding address */ -#define MiPteToAddress(x) ((PVOID)((ULONG)(x) << 10)) -#define MiPdeToAddress(x) ((PVOID)((ULONG)(x) << 18)) - Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] Tue May 5 20:36:07 2015 @@ -9,39 +9,76 @@ #define _MI_PAGING_LEVELS 2 #endif -/* MMPTE related defines */ -#define MM_EMPTY_PTE_LIST ((ULONG)0xFFFFF) -#define MM_EMPTY_LIST ((ULONG_PTR)-1) +/* Memory layout base addresses */ +#define MI_USER_PROBE_ADDRESS (PVOID)0x7FFF0000 +#define MI_DEFAULT_SYSTEM_RANGE_START (PVOID)0x80000000 +#define HYPER_SPACE 0xC0400000 +#define HYPER_SPACE_END 0xC07FFFFF +#define MI_SYSTEM_CACHE_WS_START (PVOID)0xC0C00000 +#define MI_PAGED_POOL_START (PVOID)0xE1000000 +#define MI_NONPAGED_POOL_END (PVOID)0xFFBE0000 +#define MI_DEBUG_MAPPING (PVOID)0xFFBFF000 + /* FIXME: These are different for PAE */ #define PTE_BASE 0xC0000000 #define PDE_BASE 0xC0300000 #define PDE_TOP 0xC0300FFF #define PTE_TOP 0xC03FFFFF -#define HYPER_SPACE 0xC0400000 -#define HYPER_SPACE_END 0xC07FFFFF #define PTE_PER_PAGE 0x400 #define PDE_PER_PAGE 0x400 +#define PPE_PER_PAGE 1 -/* Converting address to a corresponding PDE or PTE entry */ -#define MiAddressToPde(x) \ - ((PMMPDE)(((((ULONG)(x)) >> 22) << 2) + PDE_BASE)) -#define MiAddressToPte(x) \ - ((PMMPTE)(((((ULONG)(x)) >> 12) << 2) + PTE_BASE)) -#define MiAddressToPteOffset(x) \ - ((((ULONG)(x)) << 10) >> 22) +/* Misc address definitions */ +#define MI_SYSTEM_PTE_BASE (PVOID)MiAddressToPte(NULL) +#define MM_HIGHEST_VAD_ADDRESS \ + (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE)) +#define MI_MAPPING_RANGE_START (ULONG)HYPER_SPACE +#define MI_MAPPING_RANGE_END (MI_MAPPING_RANGE_START + \ + MI_HYPERSPACE_PTES * PAGE_SIZE) +#define MI_DUMMY_PTE (PMMPTE)((ULONG_PTR)MI_MAPPING_RANGE_END + \ + PAGE_SIZE) +#define MI_VAD_BITMAP (PMMPTE)((ULONG_PTR)MI_DUMMY_PTE + \ + PAGE_SIZE) +#define MI_WORKING_SET_LIST (PMMPTE)((ULONG_PTR)MI_VAD_BITMAP + \ + PAGE_SIZE) -/* Convert a PTE into a corresponding address */ -#define MiPteToAddress(PTE) ((PVOID)((ULONG)(PTE) << 10)) -#define MiPdeToAddress(PDE) ((PVOID)((ULONG)(PDE) << 20)) -#define MiPdeToPte(PDE) ((PMMPTE)MiPteToAddress(PDE)) -#define MiPteToPde(PTE) ((PMMPDE)MiAddressToPte(PTE)) +/* Memory sizes */ +#define MI_MIN_PAGES_FOR_NONPAGED_POOL_TUNING ((255 * _1MB) >> PAGE_SHIFT) +#define MI_MIN_PAGES_FOR_SYSPTE_TUNING ((19 * _1MB) >> PAGE_SHIFT) +#define MI_MIN_PAGES_FOR_SYSPTE_BOOST ((32 * _1MB) >> PAGE_SHIFT) +#define MI_MIN_PAGES_FOR_SYSPTE_BOOST_BOOST ((256 * _1MB) >> PAGE_SHIFT) +#define MI_MIN_INIT_PAGED_POOLSIZE (32 * _1MB) +#define MI_MAX_INIT_NONPAGED_POOL_SIZE (128 * _1MB) +#define MI_MAX_NONPAGED_POOL_SIZE (128 * _1MB) +#define MI_SYSTEM_VIEW_SIZE (32 * _1MB) +#define MI_SESSION_VIEW_SIZE (48 * _1MB) +#define MI_SESSION_POOL_SIZE (16 * _1MB) +#define MI_SESSION_IMAGE_SIZE (8 * _1MB) +#define MI_SESSION_WORKING_SET_SIZE (4 * _1MB) +#define MI_SESSION_SIZE (MI_SESSION_VIEW_SIZE + \ + MI_SESSION_POOL_SIZE + \ + MI_SESSION_IMAGE_SIZE + \ + MI_SESSION_WORKING_SET_SIZE) +#define MI_MIN_ALLOCATION_FRAGMENT (4 * _1KB) +#define MI_ALLOCATION_FRAGMENT (64 * _1KB) +#define MI_MAX_ALLOCATION_FRAGMENT (2 * _1MB) -#define ADDR_TO_PAGE_TABLE(v) (((ULONG)(v)) / (1024 * PAGE_SIZE)) -#define ADDR_TO_PDE_OFFSET(v) (((ULONG)(v)) / (1024 * PAGE_SIZE)) -#define ADDR_TO_PTE_OFFSET(v) ((((ULONG)(v)) % (1024 * PAGE_SIZE)) / PAGE_SIZE) +/* Misc constants */ +#define MM_PTE_SOFTWARE_PROTECTION_BITS 5 +#define MI_MIN_SECONDARY_COLORS 8 +#define MI_SECONDARY_COLORS 64 +#define MI_MAX_SECONDARY_COLORS 1024 +#define MI_MAX_FREE_PAGE_LISTS 4 +#define MI_HYPERSPACE_PTES (256 - 1) +#define MI_ZERO_PTES (32) +#define MI_MAX_ZERO_BITS 21 +#define SESSION_POOL_LOOKASIDES 26 -#define MiGetPdeOffset ADDR_TO_PDE_OFFSET +/* MMPTE related defines */ +#define MM_EMPTY_PTE_LIST ((ULONG)0xFFFFF) +#define MM_EMPTY_LIST ((ULONG_PTR)-1) + /* Easy accessing PFN in PTE */ #define PFN_FROM_PTE(v) ((v)->u.Hard.PageFrameNumber) @@ -68,19 +105,53 @@ #define MI_MAKE_WRITE_PAGE(x) ((x)->u.Hard.Writable = 1) #endif -#define MI_HYPERSPACE_PTES (256 - 1) -#define MI_ZERO_PTES (32) -#define MI_MAPPING_RANGE_START (ULONG)HYPER_SPACE -#define MI_MAPPING_RANGE_END (MI_MAPPING_RANGE_START + \ - MI_HYPERSPACE_PTES * PAGE_SIZE) -#define MI_DUMMY_PTE (PMMPTE)((ULONG_PTR)MI_MAPPING_RANGE_END + \ - PAGE_SIZE) -#define MI_VAD_BITMAP (PMMPTE)((ULONG_PTR)MI_DUMMY_PTE + \ - PAGE_SIZE) -#define MI_WORKING_SET_LIST (PMMPTE)((ULONG_PTR)MI_VAD_BITMAP + \ - PAGE_SIZE) +/* On x86, these two are the same */ +#define MI_WRITE_VALID_PPE MI_WRITE_VALID_PTE -/* On x86, these two are the same */ -#define MMPDE MMPTE -#define PMMPDE PMMPTE +/* Convert an address to a corresponding PTE */ +#define MiAddressToPte(x) \ + ((PMMPTE)(((((ULONG)(x)) >> 12) << 2) + PTE_BASE)) +/* Convert an address to a corresponding PDE */ +#define MiAddressToPde(x) \ + ((PMMPDE)(((((ULONG)(x)) >> 22) << 2) + PDE_BASE)) + +/* Convert an address to a corresponding PTE offset/index */ +#define MiAddressToPteOffset(x) \ + ((((ULONG)(x)) << 10) >> 22) + +/* Convert an address to a corresponding PDE offset/index */ +#define MiAddressToPdeOffset(x) \ + (((ULONG)(x)) / (1024 * PAGE_SIZE)) +#define MiGetPdeOffset MiAddressToPdeOffset + +/* Convert a PTE/PDE into a corresponding address */ +#define MiPteToAddress(_Pte) ((PVOID)((ULONG)(_Pte) << 10)) +#define MiPdeToAddress(_Pde) ((PVOID)((ULONG)(_Pde) << 20)) + +/* Translate between P*Es */ +#define MiPdeToPte(_Pde) ((PMMPTE)MiPteToAddress(_Pde)) +#define MiPteToPde(_Pte) ((PMMPDE)MiAddressToPte(_Pte)) + +/* Check P*E boundaries */ +#define MiIsPteOnPdeBoundary(PointerPte) \ + ((((ULONG_PTR)PointerPte) & (PAGE_SIZE - 1)) == 0) + +// +// Decodes a Prototype PTE into the underlying PTE +// +#define MiProtoPteToPte(x) \ + (PMMPTE)((ULONG_PTR)MmPagedPoolStart + \ + (((x)->u.Proto.ProtoAddressHigh << 9) | (x)->u.Proto.ProtoAddressLow << 2)) + +// +// Decodes a Prototype PTE into the underlying PTE +// +#define MiSubsectionPteToSubsection(x) \ + ((x)->u.Subsect.WhichPool == PagedPool) ? \ + (PMMPTE)((ULONG_PTR)MmSubsectionBase + \ + (((x)->u.Subsect.SubsectionAddressHigh << 7) | \ + (x)->u.Subsect.SubsectionAddressLow << 3)) : \ + (PMMPTE)((ULONG_PTR)MmNonPagedPoolEnd - \ + (((x)->u.Subsect.SubsectionAddressHigh << 7) | \ + (x)->u.Subsect.SubsectionAddressLow << 3)) Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Tue May 5 20:36:07 2015 @@ -6,54 +6,7 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -#ifndef _M_AMD64 - -#define MI_MIN_PAGES_FOR_NONPAGED_POOL_TUNING ((255 * _1MB) >> PAGE_SHIFT) -#define MI_MIN_PAGES_FOR_SYSPTE_TUNING ((19 * _1MB) >> PAGE_SHIFT) -#define MI_MIN_PAGES_FOR_SYSPTE_BOOST ((32 * _1MB) >> PAGE_SHIFT) -#define MI_MIN_PAGES_FOR_SYSPTE_BOOST_BOOST ((256 * _1MB) >> PAGE_SHIFT) -#define MI_MAX_INIT_NONPAGED_POOL_SIZE (128 * _1MB) -#define MI_MAX_NONPAGED_POOL_SIZE (128 * _1MB) -#define MI_MAX_FREE_PAGE_LISTS 4 - -#define MI_MIN_INIT_PAGED_POOLSIZE (32 * _1MB) - -#define MI_SESSION_VIEW_SIZE (48 * _1MB) -#define MI_SESSION_POOL_SIZE (16 * _1MB) -#define MI_SESSION_IMAGE_SIZE (8 * _1MB) -#define MI_SESSION_WORKING_SET_SIZE (4 * _1MB) -#define MI_SESSION_SIZE (MI_SESSION_VIEW_SIZE + \ - MI_SESSION_POOL_SIZE + \ - MI_SESSION_IMAGE_SIZE + \ - MI_SESSION_WORKING_SET_SIZE) - -#define MI_SYSTEM_VIEW_SIZE (32 * _1MB) - -#define MI_USER_PROBE_ADDRESS (PVOID)0x7FFF0000 -#define MI_DEFAULT_SYSTEM_RANGE_START (PVOID)0x80000000 -#define MI_SYSTEM_CACHE_WS_START (PVOID)0xC0C00000 -#define MI_PAGED_POOL_START (PVOID)0xE1000000 -#define MI_NONPAGED_POOL_END (PVOID)0xFFBE0000 -#define MI_DEBUG_MAPPING (PVOID)0xFFBFF000 - -#define MI_SYSTEM_PTE_BASE (PVOID)MiAddressToPte(NULL) - -#define MI_MIN_SECONDARY_COLORS 8 -#define MI_SECONDARY_COLORS 64 -#define MI_MAX_SECONDARY_COLORS 1024 - -#define MI_MIN_ALLOCATION_FRAGMENT (4 * _1KB) -#define MI_ALLOCATION_FRAGMENT (64 * _1KB) -#define MI_MAX_ALLOCATION_FRAGMENT (2 * _1MB) - -#define MM_HIGHEST_VAD_ADDRESS \ - (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE)) #define MI_LOWEST_VAD_ADDRESS (PVOID)MM_LOWEST_USER_ADDRESS - -#define MI_DEFAULT_SYSTEM_PTE_COUNT 50000 -#define MI_MAX_ZERO_BITS 21 - -#endif /* !_M_AMD64 */ /* Make the code cleaner with some definitions for size multiples */ #define _1KB (1024u) @@ -72,28 +25,15 @@ /* Size of a page directory */ #define PD_SIZE (PDE_COUNT * sizeof(MMPDE)) -/* Size of all page directories for a process */ -#define SYSTEM_PD_SIZE (PD_COUNT * PD_SIZE) - -/* Architecture specific count of PDEs in a directory, and count of PTEs in a PT */ -#ifdef _M_IX86 -#define PD_COUNT 1 -#define PDE_COUNT 1024 -#define PTE_COUNT 1024 -C_ASSERT(SYSTEM_PD_SIZE == PAGE_SIZE); -#define MiIsPteOnPdeBoundary(PointerPte) \ - ((((ULONG_PTR)PointerPte) & (PAGE_SIZE - 1)) == 0) -#elif _M_ARM -#define PPE_PER_PAGE 1 -#define PDE_PER_PAGE 4096 -#define PTE_PER_PAGE 256 -#define PD_COUNT 1 -#define PDE_COUNT 4096 -#define PTE_COUNT 256 -#else +/* Stop using these! */ #define PD_COUNT PPE_PER_PAGE #define PDE_COUNT PDE_PER_PAGE #define PTE_COUNT PTE_PER_PAGE + +/* Size of all page directories for a process */ +#define SYSTEM_PD_SIZE (PD_COUNT * PD_SIZE) +#ifdef _M_IX86 +C_ASSERT(SYSTEM_PD_SIZE == PAGE_SIZE); #endif // @@ -211,19 +151,6 @@ (((PVOID)(Address) >= (PVOID)PTE_BASE) && ((PVOID)(Address) <= (PVOID)MmHyperSpaceEnd)) // -// Corresponds to MMPTE_SOFTWARE.Protection -// -#ifdef _M_IX86 -#define MM_PTE_SOFTWARE_PROTECTION_BITS 5 -#elif _M_ARM -#define MM_PTE_SOFTWARE_PROTECTION_BITS 6 -#elif _M_AMD64 -#define MM_PTE_SOFTWARE_PROTECTION_BITS 5 -#else -#error Define these please! -#endif - -// // Creates a software PTE with the given protection // #define MI_MAKE_SOFTWARE_PTE(p, x) ((p)->u.Long = (x << MM_PTE_SOFTWARE_PROTECTION_BITS)) @@ -237,8 +164,13 @@ // // Special values for LoadedImports // +#ifdef _WIN64 +#define MM_SYSLDR_NO_IMPORTS (PVOID)0xFFFFFFFFFFFFFFFEULL +#define MM_SYSLDR_BOOT_LOADED (PVOID)0xFFFFFFFFFFFFFFFFULL +#else #define MM_SYSLDR_NO_IMPORTS (PVOID)0xFFFFFFFE #define MM_SYSLDR_BOOT_LOADED (PVOID)0xFFFFFFFF +#endif #define MM_SYSLDR_SINGLE_ENTRY 0x1 // @@ -277,50 +209,16 @@ #define MI_GET_NEXT_COLOR() (MI_GET_PAGE_COLOR(++MmSystemPageColor)) #define MI_GET_NEXT_PROCESS_COLOR(x) (MI_GET_PAGE_COLOR(++(x)->NextPageColor)) -#ifndef _M_AMD64 -// -// Decodes a Prototype PTE into the underlying PTE -// -#define MiProtoPteToPte(x) \ - (PMMPTE)((ULONG_PTR)MmPagedPoolStart + \ - (((x)->u.Proto.ProtoAddressHigh << 9) | (x)->u.Proto.ProtoAddressLow << 2)) - -// -// Decodes a Prototype PTE into the underlying PTE -// -#define MiSubsectionPteToSubsection(x) \ - ((x)->u.Subsect.WhichPool == PagedPool) ? \ - (PMMPTE)((ULONG_PTR)MmSubsectionBase + \ - (((x)->u.Subsect.SubsectionAddressHigh << 7) | \ - (x)->u.Subsect.SubsectionAddressLow << 3)) : \ - (PMMPTE)((ULONG_PTR)MmNonPagedPoolEnd - \ - (((x)->u.Subsect.SubsectionAddressHigh << 7) | \ - (x)->u.Subsect.SubsectionAddressLow << 3)) -#endif - // // Prototype PTEs that don't yet have a pagefile association // -#ifdef _M_AMD64 +#ifdef _WIN64 #define MI_PTE_LOOKUP_NEEDED 0xffffffffULL #else #define MI_PTE_LOOKUP_NEEDED 0xFFFFF #endif // -// Number of session lists in the MM_SESSIONS_SPACE structure -// -#if defined(_M_AMD64) -#define SESSION_POOL_LOOKASIDES 21 -#elif defined(_M_IX86) -#define SESSION_POOL_LOOKASIDES 26 -#elif defined(_M_ARM) -#define SESSION_POOL_LOOKASIDES 26 // CHECKME -#else -#error Not Defined! -#endif - -// // Number of session data and tag pages // #define MI_SESSION_DATA_PAGES_MAXIMUM (MM_ALLOCATION_GRANULARITY / PAGE_SIZE) @@ -342,7 +240,7 @@ // // FIXFIX: These should go in ex.h after the pool merge // -#ifdef _M_AMD64 +#ifdef _WIN64 #define POOL_BLOCK_SIZE 16 #else #define POOL_BLOCK_SIZE 8 @@ -384,11 +282,6 @@ #define POOL_FREE_IRQL_INVALID 9 #define POOL_BILLED_PROCESS_INVALID 13 #define POOL_HEADER_SIZE_INVALID 32 - -#ifdef _M_ARM -#define MiPdeToPte(PDE) ((PMMPTE)MiPteToAddress(PDE)) -#endif - typedef struct _POOL_DESCRIPTOR { @@ -413,7 +306,7 @@ { struct { -#ifdef _M_AMD64 +#ifdef _WIN64 USHORT PreviousSize:8; USHORT PoolIndex:8; USHORT BlockSize:8; @@ -427,12 +320,12 @@ }; ULONG Ulong1; }; -#ifdef _M_AMD64 +#ifdef _WIN64 ULONG PoolTag; #endif union { -#ifdef _M_AMD64 +#ifdef _WIN64 PEPROCESS ProcessBilled; #else ULONG PoolTag; Modified: trunk/reactos/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/amd64/init.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] Tue May 5 20:36:07 2015 @@ -19,6 +19,10 @@ #ifdef _WINKD_ extern PMMPTE MmDebugPte; #endif + +/* Helper macros */ +#define IS_ALIGNED(addr, align) (((ULONG64)(addr) & (align - 1)) == 0) +#define IS_PAGE_ALIGNED(addr) IS_ALIGNED(addr, PAGE_SIZE) /* GLOBALS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] Tue May 5 20:36:07 2015 @@ -97,7 +97,7 @@ // // Get the PDE // - PointerPde = MiGetPdeAddress(Address); + PointerPde = MiAddressToPde(Address); if (PointerPde->u.Hard.Coarse.Valid) { // @@ -141,7 +141,7 @@ // Save it // //MmGlobalKernelPageDirectory[PdeOffset] = TempPde.u.Hard.AsUlong; - //DPRINT1("KPD: %p PDEADDR: %p\n", &MmGlobalKernelPageDirectory[PdeOffset], MiGetPdeAddress(Address)); + //DPRINT1("KPD: %p PDEADDR: %p\n", &MmGlobalKernelPageDirectory[PdeOffset], MiAddressToPde(Address)); // // FIXFIX: Double check with Felix tomorrow @@ -150,7 +150,7 @@ // // Get the PTE for this 1MB region // - PointerPte = MiGetPteAddress(MiGetPteAddress(Address)); + PointerPte = MiAddressToPte(MiAddressToPte(Address)); DPRINT1("PointerPte: %p\n", PointerPte); // @@ -206,7 +206,7 @@ // // Return the PTE // - return MiGetPteAddress(Address); + return MiAddressToPte(Address); } MMPTE @@ -647,8 +647,8 @@ // Good place to setup template PTE/PDEs. // We are lazy and pick a known-good PTE // - MiArmTemplatePte = *MiGetPteAddress(0x80000000); - MiArmTemplatePde = *MiGetPdeAddress(0x80000000); + MiArmTemplatePte = *MiAddressToPte(0x80000000); + MiArmTemplatePde = *MiAddressToPde(0x80000000); // // Loop the 2GB of address space which belong to the kernel @@ -693,7 +693,7 @@ // ARM Hack while we still use a section PTE // PMMPDE_HARDWARE PointerPde; - PointerPde = MiGetPdeAddress(PCR); + PointerPde = MiAddressToPde(PCR); ASSERT(PointerPde->u.Hard.Section.Valid == 1); PhysicalAddress.QuadPart = PointerPde->u.Hard.Section.PageFrameNumber; PhysicalAddress.QuadPart <<= CPT_SHIFT; Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Tue May 5 20:36:07 2015 @@ -18,6 +18,8 @@ #pragma alloc_text(INIT, MmInitGlobalKernelPageDirectory) #endif +#define ADDR_TO_PDE_OFFSET MiAddressToPdeOffset +#define ADDR_TO_PAGE_TABLE(v) (((ULONG)(v)) / (1024 * PAGE_SIZE)) /* GLOBALS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/mm/i386/pagepae.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/pagepae.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] Tue May 5 20:36:07 2015 @@ -16,7 +16,6 @@ #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitGlobalKernelPageDirectory) #endif - /* GLOBALS *****************************************************************/

1 0

[tkreuzer] 67567: [NTOSKRNL] Clean up some obsolete architecture specific Mm definitions
by tkreuzer＠svn.reactos.org 05 May '15

05 May '15

Author: tkreuzer Date: Tue May 5 20:35:27 2015 New Revision: 67567 URL: http://svn.reactos.org/svn/reactos?rev=67567&view=rev Log: [NTOSKRNL] Clean up some obsolete architecture specific Mm definitions Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h trunk/reactos/ntoskrnl/include/internal/arm/mm.h trunk/reactos/ntoskrnl/include/internal/i386/mm.h trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/i386/pagepae.c trunk/reactos/ntoskrnl/mm/powerpc/page.c Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Tue May 5 20:35:27 2015 @@ -1,27 +1,26 @@ /* - * kernel internal memory managment definitions for amd64 + * kernel internal memory management definitions for amd64 */ #pragma once +#define _MI_PAGING_LEVELS 4 + /* Memory layout base addresses */ -#define MI_LOWEST_VAD_ADDRESS (PVOID)0x000000007FF00000ULL +#define MI_LOWEST_VAD_ADDRESS (PVOID)0x0000000000010000ULL #define MI_USER_PROBE_ADDRESS (PVOID)0x000007FFFFFF0000ULL #define MI_DEFAULT_SYSTEM_RANGE_START (PVOID)0xFFFF080000000000ULL #define MI_REAL_SYSTEM_RANGE_START 0xFFFF800000000000ULL -#define MI_PAGE_TABLE_BASE 0xFFFFF68000000000ULL #define HYPER_SPACE 0xFFFFF70000000000ULL #define HYPER_SPACE_END 0xFFFFF77FFFFFFFFFULL -#define MI_SHARED_SYSTEM_PAGE 0xFFFFF78000000000ULL #define MI_SYSTEM_CACHE_WS_START 0xFFFFF78000001000ULL -#define MI_LOADER_MAPPINGS 0xFFFFF80000000000ULL -#define MI_PAGED_SYSTEM_START 0xFFFFF88000000000ULL #define MI_PAGED_POOL_START (PVOID)0xFFFFF8A000000000ULL -#define MI_PAGED_POOL_END 0xFFFFF8BFFFFFFFFFULL -#define MI_SESSION_SPACE_START 0xFFFFF90000000000ULL +//#define MI_PAGED_POOL_END 0xFFFFF8BFFFFFFFFFULL +//#define MI_SESSION_SPACE_START 0xFFFFF90000000000ULL #define MI_SESSION_VIEW_END 0xFFFFF97FFF000000ULL #define MI_SESSION_SPACE_END 0xFFFFF97FFFFFFFFFULL #define MM_SYSTEM_SPACE_START 0xFFFFF98000000000ULL #define MI_PFN_DATABASE 0xFFFFFA8000000000ULL +#define MI_NONPAGED_POOL_END (PVOID)0xFFFFFFFFFFBFFFFFULL #define MI_HIGHEST_SYSTEM_ADDRESS (PVOID)0xFFFFFFFFFFFFFFFFULL /* WOW64 address definitions */ @@ -39,7 +38,6 @@ #define MI_DUMMY_PTE (MI_MAPPING_RANGE_END + PAGE_SIZE) #define MI_VAD_BITMAP (MI_DUMMY_PTE + PAGE_SIZE) #define MI_WORKING_SET_LIST (MI_VAD_BITMAP + PAGE_SIZE) -#define MI_NONPAGED_POOL_END 0 /* Memory sizes */ #define MI_MIN_PAGES_FOR_NONPAGED_POOL_TUNING ((255*1024*1024) >> PAGE_SHIFT) @@ -68,20 +66,14 @@ #define MmSystemRangeStart ((PVOID)MI_REAL_SYSTEM_RANGE_START) /* Misc constants */ -#define _MI_PAGING_LEVELS 4 #define MI_NUMBER_SYSTEM_PTES 22000 #define MI_MAX_FREE_PAGE_LISTS 4 -#define NR_SECTION_PAGE_TABLES 1024 -#define NR_SECTION_PAGE_ENTRIES 1024 #define MI_HYPERSPACE_PTES (256 - 1) #define MI_ZERO_PTES (32) /* FIXME - different architectures have different cache line sizes... */ -#define MM_CACHE_LINE_SIZE 32 #define MI_MAX_ZERO_BITS 53 /* Helper macros */ -#define PAGE_MASK(x) ((x)&(~0xfff)) -#define PAE_PAGE_MASK(x) ((x)&(~0xfffLL)) #define IS_ALIGNED(addr, align) (((ULONG64)(addr) & (align - 1)) == 0) #define IS_PAGE_ALIGNED(addr) IS_ALIGNED(addr, PAGE_SIZE) @@ -135,14 +127,6 @@ #define MI_MAKE_WRITE_PAGE(x) ((x)->u.Hard.Writable = 1) #endif -// FIXME!!! -#define PAGE_TO_SECTION_PAGE_DIRECTORY_OFFSET(x) \ - ((x) / (4*1024*1024)) -#define PAGE_TO_SECTION_PAGE_TABLE_OFFSET(x) \ - ((((x)) % (4*1024*1024)) / (4*1024)) - -//#define TEB_BASE 0x7FFDE000 - /* On x64, these are the same */ #define MMPDE MMPTE #define PMMPDE PMMPTE Modified: trunk/reactos/ntoskrnl/include/internal/arm/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] Tue May 5 20:35:27 2015 @@ -1,3 +1,6 @@ +/* + * kernel internal memory management definitions for arm + */ #pragma once #define _MI_PAGING_LEVELS 2 @@ -124,9 +127,6 @@ /* Easy accessing PFN in PTE */ #define PFN_FROM_PTE(v) ((v)->u.Hard.PageFrameNumber) -#define NR_SECTION_PAGE_TABLES 1024 -#define NR_SECTION_PAGE_ENTRIES 256 - /* See PDR definition */ #define MI_HYPERSPACE_PTES (256 - 1) #define MI_ZERO_PTES (32) @@ -159,10 +159,3 @@ #define MiPteToAddress(x) ((PVOID)((ULONG)(x) << 10)) #define MiPdeToAddress(x) ((PVOID)((ULONG)(x) << 18)) -#define PAGE_TO_SECTION_PAGE_DIRECTORY_OFFSET(x) \ - ((x) / (4*1024*1024)) - -#define PAGE_TO_SECTION_PAGE_TABLE_OFFSET(x) \ - ((((x)) % (4*1024*1024)) / (4*1024)) - -#define MM_CACHE_LINE_SIZE 64 Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] Tue May 5 20:35:27 2015 @@ -1,7 +1,6 @@ /* - * Lowlevel memory managment definitions + * kernel internal memory management definitions for x86 */ - #pragma once #ifdef _PAE_ @@ -10,17 +9,9 @@ #define _MI_PAGING_LEVELS 2 #endif -#define PAGE_MASK(x) ((x)&(~0xfff)) -#define PAE_PAGE_MASK(x) ((x)&(~0xfffLL)) - /* MMPTE related defines */ #define MM_EMPTY_PTE_LIST ((ULONG)0xFFFFF) #define MM_EMPTY_LIST ((ULONG_PTR)-1) - -/* Base addresses of PTE and PDE */ -#define PAGETABLE_MAP (0xc0000000) -#define PAGEDIRECTORY_MAP (0xc0000000 + (PAGETABLE_MAP / (1024))) - /* FIXME: These are different for PAE */ #define PTE_BASE 0xC0000000 #define PDE_BASE 0xC0300000 @@ -30,18 +21,17 @@ #define HYPER_SPACE_END 0xC07FFFFF #define PTE_PER_PAGE 0x400 +#define PDE_PER_PAGE 0x400 /* Converting address to a corresponding PDE or PTE entry */ #define MiAddressToPde(x) \ - ((PMMPDE)(((((ULONG)(x)) >> 22) << 2) + PAGEDIRECTORY_MAP)) + ((PMMPDE)(((((ULONG)(x)) >> 22) << 2) + PDE_BASE)) #define MiAddressToPte(x) \ - ((PMMPTE)(((((ULONG)(x)) >> 12) << 2) + PAGETABLE_MAP)) + ((PMMPTE)(((((ULONG)(x)) >> 12) << 2) + PTE_BASE)) #define MiAddressToPteOffset(x) \ ((((ULONG)(x)) << 10) >> 22) -// -// Convert a PTE into a corresponding address -// +/* Convert a PTE into a corresponding address */ #define MiPteToAddress(PTE) ((PVOID)((ULONG)(PTE) << 10)) #define MiPdeToAddress(PDE) ((PVOID)((ULONG)(PDE) << 20)) #define MiPdeToPte(PDE) ((PMMPTE)MiPteToAddress(PDE)) @@ -56,6 +46,7 @@ /* Easy accessing PFN in PTE */ #define PFN_FROM_PTE(v) ((v)->u.Hard.PageFrameNumber) +/* Macros for portable PTE modification */ #define MI_MAKE_LOCAL_PAGE(x) ((x)->u.Hard.Global = 0) #define MI_MAKE_DIRTY_PAGE(x) ((x)->u.Hard.Dirty = 1) #define MI_MAKE_ACCESSED_PAGE(x) ((x)->u.Hard.Accessed = 1) @@ -77,17 +68,6 @@ #define MI_MAKE_WRITE_PAGE(x) ((x)->u.Hard.Writable = 1) #endif -#define PAGE_TO_SECTION_PAGE_DIRECTORY_OFFSET(x) \ - ((x) / (4*1024*1024)) - -#define PAGE_TO_SECTION_PAGE_TABLE_OFFSET(x) \ - ((((x)) % (4*1024*1024)) / (4*1024)) - -#define NR_SECTION_PAGE_TABLES 1024 -#define NR_SECTION_PAGE_ENTRIES 1024 - -#define TEB_BASE 0x7FFDE000 - #define MI_HYPERSPACE_PTES (256 - 1) #define MI_ZERO_PTES (32) #define MI_MAPPING_RANGE_START (ULONG)HYPER_SPACE @@ -104,7 +84,3 @@ #define MMPDE MMPTE #define PMMPDE PMMPTE -/* -* FIXME - different architectures have different cache line sizes... -*/ -#define MM_CACHE_LINE_SIZE 32 Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Tue May 5 20:35:27 2015 @@ -43,6 +43,8 @@ #define PTE_TO_PFN(X) ((X) >> PAGE_SHIFT) #define PFN_TO_PTE(X) ((X) << PAGE_SHIFT) + +#define PAGE_MASK(x) ((x)&(~0xfff)) const ULONG Modified: trunk/reactos/ntoskrnl/mm/i386/pagepae.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/pagepae.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] Tue May 5 20:35:27 2015 @@ -38,16 +38,14 @@ #define PA_ACCESSED (1 << PA_BIT_ACCESSED) #define PA_GLOBAL (1 << PA_BIT_GLOBAL) -#define PAGETABLE_MAP (0xc0000000) -#define PAGEDIRECTORY_MAP (0xc0000000 + (PAGETABLE_MAP / (1024))) - -#define PAE_PAGEDIRECTORY_MAP (0xc0000000 + (PAGETABLE_MAP / (512))) +#define PAGEDIRECTORY_MAP (0xc0000000 + (PTE_BASE / (1024))) +#define PAE_PAGEDIRECTORY_MAP (0xc0000000 + (PTE_BASE / (512))) #define HYPERSPACE (Ke386Pae ? 0xc0800000 : 0xc0400000) #define IS_HYPERSPACE(v) (((ULONG)(v) >= HYPERSPACE && (ULONG)(v) < HYPERSPACE + 0x400000)) -ULONG MmGlobalKernelPageDirectory[1024]; -ULONGLONG MmGlobalKernelPageDirectoryForPAE[2048]; +static ULONG MmGlobalKernelPageDirectory[1024]; +static ULONGLONG MmGlobalKernelPageDirectoryForPAE[2048]; #define PTE_TO_PFN(X) ((X) >> PAGE_SHIFT) #define PFN_TO_PTE(X) ((X) << PAGE_SHIFT) @@ -55,6 +53,9 @@ #define PAE_PTE_TO_PFN(X) (PAE_PAGE_MASK(X) >> PAGE_SHIFT) #define PAE_PFN_TO_PTE(X) ((X) << PAGE_SHIFT) +#define PAGE_MASK(x) ((x)&(~0xfff)) +#define PAE_PAGE_MASK(x) ((x)&(~0xfffLL)) + extern BOOLEAN Ke386Pae; extern BOOLEAN Ke386NoExecute; @@ -155,7 +156,7 @@ #define ADDR_TO_PDE(v) (PULONG)(PAGEDIRECTORY_MAP + \ ((((ULONG)(v)) / (1024 * 1024))&(~0x3))) -#define ADDR_TO_PTE(v) (PULONG)(PAGETABLE_MAP + ((((ULONG)(v) / 1024))&(~0x3))) +#define ADDR_TO_PTE(v) (PULONG)(PTE_BASE + ((((ULONG)(v) / 1024))&(~0x3))) #define ADDR_TO_PDE_OFFSET(v) ((((ULONG)(v)) / (1024 * PAGE_SIZE))) @@ -166,7 +167,7 @@ #define PAE_ADDR_TO_PDE(v) (PULONGLONG) (PAE_PAGEDIRECTORY_MAP + \ ((((ULONG_PTR)(v)) / (512 * 512))&(~0x7))) -#define PAE_ADDR_TO_PTE(v) (PULONGLONG) (PAGETABLE_MAP + ((((ULONG_PTR)(v) / 512))&(~0x7))) +#define PAE_ADDR_TO_PTE(v) (PULONGLONG) (PTE_BASE + ((((ULONG_PTR)(v) / 512))&(~0x7))) #define PAE_ADDR_TO_PDTE_OFFSET(v) (((ULONG_PTR)(v)) / (512 * 512 * PAGE_SIZE)) @@ -221,11 +222,11 @@ { PageDir = (PULONGLONG)MmCreateHyperspaceMapping(Pfn[i+1]); memcpy(PageDir, &MmGlobalKernelPageDirectoryForPAE[i * 512], 512 * sizeof(ULONGLONG)); - if (PAE_ADDR_TO_PDTE_OFFSET(PAGETABLE_MAP) == i) + if (PAE_ADDR_TO_PDTE_OFFSET(PTE_BASE) == i) { for (j = 0; j < 4; j++) { - PageDir[PAE_ADDR_TO_PDE_PAGE_OFFSET(PAGETABLE_MAP) + j] = PAE_PFN_TO_PTE(Pfn[1+j]) | PA_PRESENT | PA_READWRITE; + PageDir[PAE_ADDR_TO_PDE_PAGE_OFFSET(PTE_BASE) + j] = PAE_PFN_TO_PTE(Pfn[1+j]) | PA_PRESENT | PA_READWRITE; } } if (PAE_ADDR_TO_PDTE_OFFSET(HYPERSPACE) == i) @@ -245,8 +246,8 @@ MmGlobalKernelPageDirectory + ADDR_TO_PDE_OFFSET(MmSystemRangeStart), (1024 - ADDR_TO_PDE_OFFSET(MmSystemRangeStart)) * sizeof(ULONG)); - DPRINT("Addr %x\n",ADDR_TO_PDE_OFFSET(PAGETABLE_MAP)); - PageDirectory[ADDR_TO_PDE_OFFSET(PAGETABLE_MAP)] = PFN_TO_PTE(Pfn[0]) | PA_PRESENT | PA_READWRITE; + DPRINT("Addr %x\n",ADDR_TO_PDE_OFFSET(PTE_BASE)); + PageDirectory[ADDR_TO_PDE_OFFSET(PTE_BASE)] = PFN_TO_PTE(Pfn[0]) | PA_PRESENT | PA_READWRITE; PageDirectory[ADDR_TO_PDE_OFFSET(HYPERSPACE)] = PFN_TO_PTE(Pfn[1]) | PA_PRESENT | PA_READWRITE; MmDeleteHyperspaceMapping(PageDirectory); @@ -334,7 +335,7 @@ DPRINT("MmGetPageTableForProcessForPAE(%x %x %d)\n", Process, Address, Create); - if (Address >= (PVOID)PAGETABLE_MAP && Address < (PVOID)((ULONG_PTR)PAGETABLE_MAP + 0x800000)) + if (Address >= (PVOID)PTE_BASE && Address < (PVOID)((ULONG_PTR)PTE_BASE + 0x800000)) { ASSERT(FALSE); } @@ -535,14 +536,14 @@ { if (Ke386Pae) { - if ((PULONGLONG)Pt >= (PULONGLONG)PAGETABLE_MAP && (PULONGLONG)Pt < (PULONGLONG)PAGETABLE_MAP + 4*512*512) + if ((PULONGLONG)Pt >= (PULONGLONG)PTE_BASE && (PULONGLONG)Pt < (PULONGLONG)PTE_BASE + 4*512*512) { return TRUE; } } else { - if (Pt >= (PULONG)PAGETABLE_MAP && Pt < (PULONG)PAGETABLE_MAP + 1024*1024) + if (Pt >= (PULONG)PTE_BASE && Pt < (PULONG)PTE_BASE + 1024*1024) { return TRUE; } @@ -1272,7 +1273,7 @@ if (Pte != 0LL) { if (Address > MmSystemRangeStart || - (Pt >= (PULONGLONG)PAGETABLE_MAP && Pt < (PULONGLONG)PAGETABLE_MAP + 4*512*512)) + (Pt >= (PULONGLONG)PTE_BASE && Pt < (PULONGLONG)PTE_BASE + 4*512*512)) { MiFlushTlb((PULONG)Pt, Address); } @@ -1337,7 +1338,7 @@ if (Pte != 0) { if (Address > MmSystemRangeStart || - (Pt >= (PULONG)PAGETABLE_MAP && Pt < (PULONG)PAGETABLE_MAP + 1024*1024)) + (Pt >= (PULONG)PTE_BASE && Pt < (PULONG)PTE_BASE + 1024*1024)) { MiFlushTlb(Pt, Address); } @@ -1492,157 +1493,6 @@ } } -PVOID -NTAPI -MmCreateHyperspaceMapping(PFN_NUMBER Page) -{ - PVOID Address; - ULONG i; - - if (Ke386Pae) - { - ULONGLONG Entry; - ULONGLONG ZeroEntry = 0LL; - PULONGLONG Pte; - - Entry = PFN_TO_PTE(Page) | PA_PRESENT | PA_READWRITE; - Pte = PAE_ADDR_TO_PTE(HYPERSPACE) + Page % 1024; - - if (Page & 1024) - { - for (i = Page %1024; i < 1024; i++, Pte++) - { - if (0LL == ExfInterlockedCompareExchange64UL(Pte, &Entry, &ZeroEntry)) - { - break; - } - } - if (i >= 1024) - { - Pte = PAE_ADDR_TO_PTE(HYPERSPACE); - for (i = 0; i < Page % 1024; i++, Pte++) - { - if (0LL == ExfInterlockedCompareExchange64UL(Pte, &Entry, &ZeroEntry)) - { - break; - } - } - if (i >= Page % 1024) - { - ASSERT(FALSE); - } - } - } - else - { - for (i = Page %1024; (LONG)i >= 0; i--, Pte--) - { - if (0LL == ExfInterlockedCompareExchange64UL(Pte, &Entry, &ZeroEntry)) - { - break; - } - } - if ((LONG)i < 0) - { - Pte = PAE_ADDR_TO_PTE(HYPERSPACE) + 1023; - for (i = 1023; i > Page % 1024; i--, Pte--) - { - if (0LL == ExfInterlockedCompareExchange64UL(Pte, &Entry, &ZeroEntry)) - { - break; - } - } - if (i <= Page % 1024) - { - ASSERT(FALSE); - } - } - } - } - else - { - ULONG Entry; - PULONG Pte; - Entry = PFN_TO_PTE(Page) | PA_PRESENT | PA_READWRITE; - Pte = ADDR_TO_PTE(HYPERSPACE) + Page % 1024; - if (Page & 1024) - { - for (i = Page % 1024; i < 1024; i++, Pte++) - { - if (0 == InterlockedCompareExchange((PLONG)Pte, (LONG)Entry, 0)) - { - break; - } - } - if (i >= 1024) - { - Pte = ADDR_TO_PTE(HYPERSPACE); - for (i = 0; i < Page % 1024; i++, Pte++) - { - if (0 == InterlockedCompareExchange((PLONG)Pte, (LONG)Entry, 0)) - { - break; - } - } - if (i >= Page % 1024) - { - ASSERT(FALSE); - } - } - } - else - { - for (i = Page % 1024; (LONG)i >= 0; i--, Pte--) - { - if (0 == InterlockedCompareExchange((PLONG)Pte, (LONG)Entry, 0)) - { - break; - } - } - if ((LONG)i < 0) - { - Pte = ADDR_TO_PTE(HYPERSPACE) + 1023; - for (i = 1023; i > Page % 1024; i--, Pte--) - { - if (0 == InterlockedCompareExchange((PLONG)Pte, (LONG)Entry, 0)) - { - break; - } - } - if (i <= Page % 1024) - { - ASSERT(FALSE); - } - } - } - } - Address = (PVOID)((ULONG_PTR)HYPERSPACE + i * PAGE_SIZE); - __invlpg(Address); - return Address; -} - -PFN_NUMBER -NTAPI -MmDeleteHyperspaceMapping(PVOID Address) -{ - PFN_NUMBER Pfn; - ASSERT (IS_HYPERSPACE(Address)); - if (Ke386Pae) - { - ULONGLONG Entry = 0LL; - Entry = (ULONG)ExfpInterlockedExchange64UL(PAE_ADDR_TO_PTE(Address), &Entry); - Pfn = PAE_PTE_TO_PFN(Entry); - } - else - { - ULONG Entry; - Entry = InterlockedExchange((PLONG)ADDR_TO_PTE(Address), 0); - Pfn = PTE_TO_PFN(Entry); - } - __invlpg(Address); - return Pfn; -} - VOID INIT_FUNCTION NTAPI @@ -1657,7 +1507,7 @@ PULONGLONG CurrentPageDirectory = (PULONGLONG)PAE_PAGEDIRECTORY_MAP; for (i = PAE_ADDR_TO_PDE_OFFSET(MmSystemRangeStart); i < 4 * 512; i++) { - if (!(i >= PAE_ADDR_TO_PDE_OFFSET(PAGETABLE_MAP) && i < PAE_ADDR_TO_PDE_OFFSET(PAGETABLE_MAP) + 4) && + if (!(i >= PAE_ADDR_TO_PDE_OFFSET(PTE_BASE) && i < PAE_ADDR_TO_PDE_OFFSET(PTE_BASE) + 4) && !(i >= PAE_ADDR_TO_PDE_OFFSET(HYPERSPACE) && i < PAE_ADDR_TO_PDE_OFFSET(HYPERSPACE) + 2) && 0LL == MmGlobalKernelPageDirectoryForPAE[i] && 0LL != CurrentPageDirectory[i]) { @@ -1675,7 +1525,7 @@ PULONG CurrentPageDirectory = (PULONG)PAGEDIRECTORY_MAP; for (i = ADDR_TO_PDE_OFFSET(MmSystemRangeStart); i < 1024; i++) { - if (i != ADDR_TO_PDE_OFFSET(PAGETABLE_MAP) && + if (i != ADDR_TO_PDE_OFFSET(PTE_BASE) && i != ADDR_TO_PDE_OFFSET(HYPERSPACE) && 0 == MmGlobalKernelPageDirectory[i] && 0 != CurrentPageDirectory[i]) { Modified: trunk/reactos/ntoskrnl/mm/powerpc/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/powerpc/page.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/powerpc/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/powerpc/page.c [iso-8859-1] Tue May 5 20:35:27 2015 @@ -445,37 +445,6 @@ #endif } -PVOID -NTAPI -MmCreateHyperspaceMapping(PFN_NUMBER Page) -{ - PVOID Address; - ppc_map_info_t info = { 0 }; - - Address = (PVOID)((ULONG_PTR)HYPERSPACE * PAGE_SIZE); - info.proc = 0; - info.addr = (vaddr_t)Address; - info.flags = MMU_KRW; - MmuMapPage(&info, 1); - - return Address; -} - -PFN_NUMBER -NTAPI -MmDeleteHyperspaceMapping(PVOID Address) -{ - ppc_map_info_t info = { 0 }; - ASSERT (IS_HYPERSPACE(Address)); - - info.proc = 0; - info.addr = (vaddr_t)Address; - - MmuUnmapPage(&info, 1); - - return (PFN_NUMBER)info.phys; -} - VOID INIT_FUNCTION NTAPI

1 0

[tkreuzer] 67566: [NTOSKRNL] Remove unused MmGetPageDirectory.
by tkreuzer＠svn.reactos.org 05 May '15

05 May '15

Author: tkreuzer Date: Tue May 5 20:35:00 2015 New Revision: 67566 URL: http://svn.reactos.org/svn/reactos?rev=67566&view=rev Log: [NTOSKRNL] Remove unused MmGetPageDirectory. Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h trunk/reactos/ntoskrnl/include/internal/arm/mm.h trunk/reactos/ntoskrnl/include/internal/i386/mm.h trunk/reactos/ntoskrnl/mm/arm/page.c trunk/reactos/ntoskrnl/mm/arm/stubs.c trunk/reactos/ntoskrnl/mm/i386/pagepae.c trunk/reactos/ntoskrnl/mm/powerpc/page.c Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Tue May 5 20:35:00 2015 @@ -154,13 +154,6 @@ #define ValidKernelPpe ValidKernelPde -PULONG64 -FORCEINLINE -MmGetPageDirectory(VOID) -{ - return (PULONG64)__readcr3(); -} - PMMPTE FORCEINLINE MiAddressToPxe(PVOID Address) Modified: trunk/reactos/ntoskrnl/include/internal/arm/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] Tue May 5 20:35:00 2015 @@ -108,9 +108,6 @@ ManagerDomain } ARM_DOMAIN; -struct _EPROCESS; -PULONG MmGetPageDirectory(VOID); - #define MI_MAKE_LOCAL_PAGE(x) ((x)->u.Hard.NonGlobal = 1) #define MI_MAKE_DIRTY_PAGE(x) #define MI_MAKE_ACCESSED_PAGE(x) Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] Tue May 5 20:35:00 2015 @@ -3,9 +3,6 @@ */ #pragma once - -struct _EPROCESS; -PULONG MmGetPageDirectory(VOID); #ifdef _PAE_ #define _MI_PAGING_LEVELS 3 Modified: trunk/reactos/ntoskrnl/mm/arm/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/page.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] Tue May 5 20:35:00 2015 @@ -135,14 +135,6 @@ { UNIMPLEMENTED_DBGBREAK(); return FALSE; -} - -PULONG -NTAPI -MmGetPageDirectory(VOID) -{ - /* Return the TTB */ - return (PULONG)KeArmTranslationTableRegisterGet().AsUlong; } NTSTATUS Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] Tue May 5 20:35:00 2015 @@ -315,16 +315,6 @@ return TRUE; } -PULONG -NTAPI -MmGetPageDirectory(VOID) -{ - // - // Return the TTB - // - return (PULONG)KeArmTranslationTableRegisterGet().AsUlong; -} - NTSTATUS NTAPI MmCreateVirtualMappingInternal(IN PEPROCESS Process, Modified: trunk/reactos/ntoskrnl/mm/i386/pagepae.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/pagepae.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] Tue May 5 20:35:00 2015 @@ -103,14 +103,6 @@ __invlpg(Address); } #endif -} - - - -PULONG -MmGetPageDirectory(VOID) -{ - return (PULONG)__readcr3(); } static ULONG Modified: trunk/reactos/ntoskrnl/mm/powerpc/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/powerpc/page.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/powerpc/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/powerpc/page.c [iso-8859-1] Tue May 5 20:35:00 2015 @@ -72,15 +72,6 @@ MiFlushTlb(PULONG Pt, PVOID Address) { __asm__("tlbi %0" : "=r" (Address)); -} - - - -PULONG -MmGetPageDirectory(VOID) -{ - unsigned int page_dir=0; - return((PULONG)page_dir); } static ULONG

1 0

[tkreuzer] 67565: [DDK] Fix declaration of NdisCopyLookaheadData
by tkreuzer＠svn.reactos.org 05 May '15

05 May '15

Author: tkreuzer Date: Tue May 5 20:34:34 2015 New Revision: 67565 URL: http://svn.reactos.org/svn/reactos?rev=67565&view=rev Log: [DDK] Fix declaration of NdisCopyLookaheadData Modified: trunk/reactos/include/ddk/ndis.h Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=675… ============================================================================== --- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Tue May 5 20:34:34 2015 @@ -608,7 +608,7 @@ UCHAR Reserved[16]; }; __MINGW_EXTENSION union { - NDIS_RW_LOCK_REFCOUNT RefCount[MAXIMUM_PROCESSORS]; + NDIS_RW_LOCK_REFCOUNT RefCount[MAXIMUM_PROCESSORS]; ULONG RefCountEx[sizeof(NDIS_RW_LOCK_REFCOUNT)/sizeof(ULONG) * MAXIMUM_PROCESSORS]; __MINGW_EXTENSION struct { KSPIN_LOCK RefCountLock; @@ -3271,7 +3271,7 @@ { \ if ((MacOptions) & NDIS_MAC_OPTION_COPY_LOOKAHEAD_DATA) \ { \ - RtlCopyMemory(_Destination, _Source, _Length); \ + RtlCopyMemory(Destination, Source, Length); \ } \ else \ { \

1 0

[tkreuzer] 67564: [CPPRT] Add some symbol aliases for ARM
by tkreuzer＠svn.reactos.org 05 May '15

05 May '15

Author: tkreuzer Date: Tue May 5 20:14:28 2015 New Revision: 67564 URL: http://svn.reactos.org/svn/reactos?rev=67564&view=rev Log: [CPPRT] Add some symbol aliases for ARM Added: trunk/reactos/lib/sdk/cpprt/arm/ (with props) trunk/reactos/lib/sdk/cpprt/arm/cpprt.s (with props) Propchange: trunk/reactos/lib/sdk/cpprt/arm/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue May 5 20:14:28 2015 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/lib/sdk/cpprt/arm/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/lib/sdk/cpprt/arm/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/lib/sdk/cpprt/arm/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/lib/sdk/cpprt/arm/cpprt.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/arm/cpprt.s?… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/arm/cpprt.s (added) +++ trunk/reactos/lib/sdk/cpprt/arm/cpprt.s [iso-8859-1] Tue May 5 20:14:28 2015 @@ -0,0 +1,24 @@ + +#include <kxarm.h> + + TEXTAREA + + MACRO + DEFINE_ALIAS $FuncName, $Target + LCLS _FuncName + LCLS _Target +_FuncName SETS "|$FuncName|" +_Target SETS "|$Target|" + IMPORT $_FuncName, WEAK $_Target + MEND + + ; void __cdecl `eh vector constructor iterator'(void *,unsigned int,int,void (__cdecl*)(void *),void (__cdecl*)(void *)) + DEFINE_ALIAS ??_L@YAXPAXIHP6AX0@Z1@Z, ?MSVCRTEX_eh_vector_constructor_iterator@@YAXPAXIHP6AX0@Z1@Z + + ; void __cdecl `eh vector destructor iterator'(void *,unsigned int,int,void (__cdecl*)(void *)) + DEFINE_ALIAS ??_M@YAXPAXIHP6AX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@YAXPAXIHP6AX0@Z@Z + + ; These are the same + //DEFINE_ALIAS __CxxFrameHandler3, __CxxFrameHandler + + END Propchange: trunk/reactos/lib/sdk/cpprt/arm/cpprt.s ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gedmurphy] 67563: [DDK] Fix the FS filter callback definitions
by gedmurphy＠svn.reactos.org 05 May '15

05 May '15

Author: gedmurphy Date: Tue May 5 18:54:28 2015 New Revision: 67563 URL: http://svn.reactos.org/svn/reactos?rev=67563&view=rev Log: [DDK] Fix the FS filter callback definitions Modified: trunk/reactos/include/ddk/ntifs.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=67… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Tue May 5 18:54:28 2015 @@ -4890,12 +4890,12 @@ } FS_FILTER_CALLBACK_DATA, *PFS_FILTER_CALLBACK_DATA; typedef NTSTATUS -(NTAPI *PFS_FILTER_CALLBACK) ( +(*PFS_FILTER_CALLBACK) ( _In_ PFS_FILTER_CALLBACK_DATA Data, _Out_ PVOID *CompletionContext); typedef VOID -(NTAPI *PFS_FILTER_COMPLETION_CALLBACK) ( +(*PFS_FILTER_COMPLETION_CALLBACK) ( _In_ PFS_FILTER_CALLBACK_DATA Data, _In_ NTSTATUS OperationStatus, _In_ PVOID CompletionContext);

1 0

[aandrejevic] 67562: [NTVDM] Revert r67561. It's incorrect.
by aandrejevic＠svn.reactos.org 05 May '15

05 May '15

Author: aandrejevic Date: Tue May 5 18:16:56 2015 New Revision: 67562 URL: http://svn.reactos.org/svn/reactos?rev=67562&view=rev Log: [NTVDM] Revert r67561. It's incorrect. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c [iso-8859-1] Tue May 5 18:16:56 2015 @@ -42,8 +42,8 @@ { if (!ExtendedCode) { - /* Call the BIOS INT 16h, AH=10h "Get Extended Keystroke" */ - setAH(0x10); + /* Call the BIOS INT 16h, AH=00h "Get Keystroke" */ + setAH(0x00); Int32Call(&DosContext, BIOS_KBD_INTERRUPT); /* Retrieve the character in AL (scan code is in AH) */ @@ -59,7 +59,7 @@ } /* Check if this is a special character */ - if (Character == 0 || Character == 0xE0) ExtendedCode = getAH(); + if (Character == 0) ExtendedCode = getAH(); if (DoEcho) DosPrintCharacter(DOS_OUTPUT_HANDLE, Character); Pointer[BytesRead++] = Character;

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