Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 32663: Update German language File
by dreimer＠svn.reactos.org 11 Mar '08

11 Mar '08

Author: dreimer Date: Tue Mar 11 14:44:22 2008 New Revision: 32663 URL: http://svn.reactos.org/svn/reactos?rev=3D32663&view=3Drev Log: Update German language File Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de= -DE.rc?rev=3D32663&r1=3D32662&r2=3D32663&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/cpl/input/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/input/lang/de-DE.rc Tue Mar 11 14:44:22 2008 @@ -2,17 +2,17 @@ = IDD_PROPPAGESETTINGS DIALOGEX 0, 0, 254, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Settings" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Select the services that you want for each input language shown= in the list.\nUse the Add and Remove buttons to modify this list.", -1, 9,= 6, 238, 17 +CAPTION "Einstellungen" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "W=C3=A4hlen Sie die Dienste, die Sie f=C3=BCr die Eingabesprach= en in der Liste verwenden wollen.\nVerwenden Sie Hinzuf=C3=BCgen und Entfer= nen, um die Liste zu bearbeiten.", -1, 9, 6, 238, 17 CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VS= CROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 28, 23= 7, 109 - PUSHBUTTON "&Set Default", IDC_SET_DEFAULT, 101, 159, 144, 14 - PUSHBUTTON "A&dd...", IDC_ADD_BUTTON, 27, 142, 70, 14 - PUSHBUTTON "&Remove...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 - PUSHBUTTON "&Properties...", IDC_PROP_BUTTON, 175, 142, 70, 14 - GROUPBOX "Preferences", -1, 7, 185, 240, 36 - PUSHBUTTON "&Key Settings...", IDC_KEY_SET_BTN, 14, 198, 110, 14 + PUSHBUTTON "&Als Standard", IDC_SET_DEFAULT, 101, 159, 144, 14 + PUSHBUTTON "&Hinzuf=C3=BCgen...", IDC_ADD_BUTTON, 27, 142, 70, 14 + PUSHBUTTON "Ent&fernen...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 + PUSHBUTTON "&Eigenschaften...", IDC_PROP_BUTTON, 175, 142, 70, 14 + GROUPBOX "Einstellungen", -1, 7, 185, 240, 36 + PUSHBUTTON "&Tasteneinstellungen...", IDC_KEY_SET_BTN, 14, 198, 110, 14 END = IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 @@ -47,18 +47,18 @@ = IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 194, 89 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_PO= PUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Key Sequence" +CAPTION "Tastenkombination =C3=A4ndern" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", 1240, 4, 5, 186, 10 GROUPBOX "", -1, 7, 16, 179, 48 - AUTOCHECKBOX "S&witch keyboard layouts", IDC_USE_SK, 12, 17, 135, 8 + AUTOCHECKBOX "Tastaturlayout &wechseln", IDC_USE_SK, 12, 17, 135, 8 CTEXT "SHIFT", -1, 68, 37, 27, 12 CTEXT "+", -1, 57, 37, 8, 9 - AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left A&LT", -1, 24, 45, 50, 12, NOT WS_TABSTOP + AUTORADIOBUTTON "&STRG", -1, 24, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "A&LT links", -1, 24, 45, 50, 12, NOT WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 83, 70, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 136, 70, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 136, 70, 50, 14 END = IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 @@ -84,8 +84,8 @@ IDS_UNKNOWN "(Unbekannt)" IDS_RESTART "Wollen Sie Ihren Computer nun neustarten?" IDS_WHATS_THIS "Was ist das?" - IDS_LANGUAGE "Language" - IDS_LAYOUT "Keyboard Layout" + IDS_LANGUAGE "Sprache" + IDS_LAYOUT "Tastaturlayout" END = STRINGTABLE

1 0

[fireball] 32662: - Update FSRTL_ADVANCED_FCB_HEADER to support newer version headers. - Split Reserved into two bitfields: Reserved and Version.
by fireball＠svn.reactos.org 11 Mar '08

11 Mar '08

Author: fireball Date: Tue Mar 11 14:03:29 2008 New Revision: 32662 URL: http://svn.reactos.org/svn/reactos?rev=3D32662&view=3Drev Log: - Update FSRTL_ADVANCED_FCB_HEADER to support newer version headers. - Split Reserved into two bitfields: Reserved and Version. 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?r= ev=3D32662&r1=3D32661&r2=3D32662&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/ddk/ntifs.h (original) +++ trunk/reactos/include/ddk/ntifs.h Tue Mar 11 14:03:29 2008 @@ -1308,7 +1308,8 @@ UCHAR Flags; UCHAR IsFastIoPossible; UCHAR Flags2; - UCHAR Reserved; + UCHAR Reserved: 4; + UCHAR Version: 4; PERESOURCE Resource; PERESOURCE PagingIoResource; LARGE_INTEGER AllocationSize; @@ -1316,6 +1317,8 @@ LARGE_INTEGER ValidDataLength; PFAST_MUTEX FastMutex; LIST_ENTRY FilterContexts; + EX_PUSH_LOCK PushLock; + PVOID *FileContextSupportPointer; } FSRTL_ADVANCED_FCB_HEADER, *PFSRTL_ADVANCED_FCB_HEADER; = typedef struct _FSRTL_PER_STREAM_CONTEXT {

1 0

[dchapyshev] 32661: - Fix typo (part 2/2)
by dchapyshev＠svn.reactos.org 11 Mar '08

11 Mar '08

Author: dchapyshev Date: Tue Mar 11 12:03:20 2008 New Revision: 32661 URL: http://svn.reactos.org/svn/reactos?rev=3D32661&view=3Drev Log: - Fix typo (part 2/2) Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys= .inf?rev=3D32661&r1=3D32660&r2=3D32661&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Tue Mar 11 12:03:20 2008 @@ -38,65 +38,65 @@ HKLM,"SYSTEM\CurrentControlSet\Control\IDConfigDB\Hardware Profiles\0000",= "FriendlyName",0x00000000,"New Hardware Profile" = ; Keyboard Layouts -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00040402","Layout F= ile",0x00000000,"kbdbgm.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00040402","Layout T= ext",0x00000000,"Bulgarian BDS 5237-1978" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00020402","Layout F= ile",0x00000000,"kbdbgt.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00020402","Layout T= ext",0x00000000,"Bulgarian phonetic classic" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00030402","Layout F= ile",0x00000000,"kbdbga.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00030402","Layout T= ext",0x00000000,"Bulgarian phonetic BDS 5237-2006 " -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000406","Layout F= ile",0x00000000,"kbdda.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000406","Layout T= ext",0x00000000,"Danish" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000407","Layout F= ile",0x00000000,"kbdgr.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000407","Layout T= ext",0x00000000,"German" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000807","Layout F= ile",0x00000000,"kbdsg.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000807","Layout T= ext",0x00000000,"Swiss German" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000408","Layout F= ile",0x00000000,"kbdhe.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000408","Layout T= ext",0x00000000,"Greek" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000409","Layout F= ile",0x00000000,"kbdus.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000409","Layout T= ext",0x00000000,"United States" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000809","Layout F= ile",0x00000000,"kbduk.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000809","Layout T= ext",0x00000000,"United Kingdom" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00010409","Layout F= ile",0x00000000,"kbddv.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00010409","Layout I= d", 0x00000000,"0002" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00010409","Layout T= ext",0x00000000,"US-Dvorak" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040a","Layout F= ile",0x00000000,"kbdes.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040a","Layout T= ext",0x00000000,"Spanish" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040b","Layout F= ile",0x00000000,"kbdfi.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040b","Layout T= ext",0x00000000,"Finnish" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040c","Layout F= ile",0x00000000,"kbdfr.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040c","Layout T= ext",0x00000000,"French" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040d","Layout F= ile",0x00000000,"kbdheb.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040d","Layout T= ext",0x00000000,"Hebrew" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000410","Layout F= ile",0x00000000,"kbdit.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000410","Layout T= ext",0x00000000,"Italian" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000411","Layout F= ile",0x00000000,"kbdja.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000411","Layout T= ext",0x00000000,"Japanese" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000080c","Layout F= ile",0x00000000,"kbdbe.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000080c","Layout T= ext",0x00000000,"Belgian French" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000813","Layout F= ile",0x00000000,"kbdbe.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000813","Layout T= ext",0x00000000,"Belgian Dutch" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000415","Layout F= ile",0x00000000,"kbdpl1.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000415","Layout T= ext",0x00000000,"Polish (programmer's)" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000816","Layout F= ile",0x00000000,"kbdpo.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000816","Layout T= ext",0x00000000,"Portuguese" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000419","Layout F= ile",0x00000000,"kbdru.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000419","Layout T= ext",0x00000000,"Russian" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041b","Layout F= ile",0x00000000,"kbdsk.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041b","Layout T= ext",0x00000000,"Slovak" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout F= ile",0x00000000,"kbdsw.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout T= ext",0x00000000,"Swedish" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041e","Layout F= ile",0x00000000,"kbdth.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041e","Layout T= ext",0x00000000,"Thai" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layout F= ile",0x00000000,"kbdur.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layout T= ext",0x00000000,"Ukrainian" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000427","Layout F= ile",0x00000000,"kbdlt.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000427","Layout T= ext",0x00000000,"Lithuanian" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000455","Layout F= ile",0x00000000,"kbdbur.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000455","Layout T= ext",0x00000000,"Burmese" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000414","Layout F= ile",0x00000000,"kbdno.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000414","Layout T= ext",0x00000000,"Norwegian" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000405","Layout F= ile",0x00000000,"kbdcz1.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000405","Layout T= ext",0x00000000,"Czech (QWERTY)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00040402","Layout = File",0x00000000,"kbdbgm.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00040402","Layout = Text",0x00000000,"Bulgarian BDS 5237-1978" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020402","Layout = File",0x00000000,"kbdbgt.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020402","Layout = Text",0x00000000,"Bulgarian phonetic classic" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00030402","Layout = File",0x00000000,"kbdbga.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00030402","Layout = Text",0x00000000,"Bulgarian phonetic BDS 5237-2006 " +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000406","Layout = File",0x00000000,"kbdda.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000406","Layout = Text",0x00000000,"Danish" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000407","Layout = File",0x00000000,"kbdgr.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000407","Layout = Text",0x00000000,"German" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000807","Layout = File",0x00000000,"kbdsg.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000807","Layout = Text",0x00000000,"Swiss German" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000408","Layout = File",0x00000000,"kbdhe.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000408","Layout = Text",0x00000000,"Greek" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000409","Layout = File",0x00000000,"kbdus.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000409","Layout = Text",0x00000000,"United States" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000809","Layout = File",0x00000000,"kbduk.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000809","Layout = Text",0x00000000,"United Kingdom" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010409","Layout = File",0x00000000,"kbddv.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010409","Layout = Id", 0x00000000,"0002" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010409","Layout = Text",0x00000000,"US-Dvorak" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040a","Layout = File",0x00000000,"kbdes.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040a","Layout = Text",0x00000000,"Spanish" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040b","Layout = File",0x00000000,"kbdfi.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040b","Layout = Text",0x00000000,"Finnish" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040c","Layout = File",0x00000000,"kbdfr.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040c","Layout = Text",0x00000000,"French" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040d","Layout = File",0x00000000,"kbdheb.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040d","Layout = Text",0x00000000,"Hebrew" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000410","Layout = File",0x00000000,"kbdit.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000410","Layout = Text",0x00000000,"Italian" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout = File",0x00000000,"kbdja.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout = Text",0x00000000,"Japanese" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000080c","Layout = File",0x00000000,"kbdbe.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000080c","Layout = Text",0x00000000,"Belgian French" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000813","Layout = File",0x00000000,"kbdbe.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000813","Layout = Text",0x00000000,"Belgian Dutch" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000415","Layout = File",0x00000000,"kbdpl1.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000415","Layout = Text",0x00000000,"Polish (programmer's)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000816","Layout = File",0x00000000,"kbdpo.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000816","Layout = Text",0x00000000,"Portuguese" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000419","Layout = File",0x00000000,"kbdru.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000419","Layout = Text",0x00000000,"Russian" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041b","Layout = File",0x00000000,"kbdsk.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041b","Layout = Text",0x00000000,"Slovak" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041d","Layout = File",0x00000000,"kbdsw.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041d","Layout = Text",0x00000000,"Swedish" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041e","Layout = File",0x00000000,"kbdth.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041e","Layout = Text",0x00000000,"Thai" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000422","Layout = File",0x00000000,"kbdur.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000422","Layout = Text",0x00000000,"Ukrainian" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000427","Layout = File",0x00000000,"kbdlt.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000427","Layout = Text",0x00000000,"Lithuanian" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000455","Layout = File",0x00000000,"kbdbur.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000455","Layout = Text",0x00000000,"Burmese" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000414","Layout = File",0x00000000,"kbdno.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000414","Layout = Text",0x00000000,"Norwegian" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000405","Layout = File",0x00000000,"kbdcz1.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000405","Layout = Text",0x00000000,"Czech (QWERTY)" = ; Network HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08= 002BE10318}",,0x00000000,"Network Adapters"

1 0

[dchapyshev] 32660: - Fix typo (part 1/2)
by dchapyshev＠svn.reactos.org 11 Mar '08

11 Mar '08

Author: dchapyshev Date: Tue Mar 11 11:39:58 2008 New Revision: 32660 URL: http://svn.reactos.org/svn/reactos?rev=3D32660&view=3Drev Log: - Fix typo (part 1/2) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntuser/kbdlayout.c?rev=3D32660&r1=3D32659&r2=3D32660&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Tue Mar 11 11:= 39:58 2008 @@ -133,7 +133,7 @@ UNICODE_STRING klid; WCHAR LayoutPathBuffer[MAX_PATH] =3D L"\\SystemRoot\\System32\\"; WCHAR KeyNameBuffer[MAX_PATH] =3D L"\\REGISTRY\\Machine\\SYSTEM\\" - L"CurrentControlSet\\Control\\KeyboardLayouts\\"; + L"CurrentControlSet\\Control\\Keyboard Layouts\\"; = RtlInitUnicodeString(&klid, wsKLID); RtlInitUnicodeString(&LayoutValueName,L"Layout File");

1 0

[ros-arm-bringup] 32659: - Convert all Loader Block structures to virtual addresses (By adding KSEG0_BASE) since the kernel eventually unmaps the page table responsible for the physical->virtual identity mapping, but we'll still need to access the loader block. - Implement proper trap prolog/epilog code -- currently used and tested in the data abort handler. Currently hacked away some KTRAP_FRAME stuff on ARM. - The data abort handler has a very rudimentary check to detect page faults and will c
by ros-arm-bringup＠svn.reactos.org 11 Mar '08

11 Mar '08

Author: ros-arm-bringup Date: Tue Mar 11 11:13:43 2008 New Revision: 32659 URL: http://svn.reactos.org/svn/reactos?rev=3D32659&view=3Drev Log: - Convert all Loader Block structures to virtual addresses (By adding KSEG0= _BASE) since the kernel eventually unmaps the page table responsible for th= e physical->virtual identity mapping, but we'll still need to access the lo= ader block. - Implement proper trap prolog/epilog code -- currently used and tested in = the data abort handler. Currently hacked away some KTRAP_FRAME stuff on ARM. - The data abort handler has a very rudimentary check to detect page faults= and will call MmAccessFaults, this means we now support paged pool! - We now succesfully go past MmInitSystem and go all the way until ObInitSy= stem (still in Phase 0). Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c trunk/reactos/include/ndk/arm/ketypes.h trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h trunk/reactos/ntoskrnl/ke/arm/trap.s trunk/reactos/ntoskrnl/ke/arm/trapc.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/= arch/arm/loader.c?rev=3D32659&r1=3D32658&r2=3D32659&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c Tue Mar 11 11:13:4= 3 2008 @@ -30,6 +30,7 @@ CHAR ArmArcHalPath[64]; CHAR ArmNtHalPath[64]; CHAR ArmNtBootPath[64]; +WCHAR ArmModuleName[64]; PNLS_DATA_BLOCK ArmNlsDataBlock; PLOADER_PARAMETER_EXTENSION ArmExtension; BIOS_MEMORY_DESCRIPTOR ArmBoardMemoryDescriptors[16] =3D {{0}}; @@ -1042,7 +1043,7 @@ // // Jump to Kernel // - (*KernelEntryPoint)(Magic, (PVOID)ArmLoaderBlock); + (*KernelEntryPoint)(Magic, (PVOID)((ULONG_PTR)ArmLoaderBlock | KSEG0_B= ASE)); } = VOID @@ -1054,6 +1055,7 @@ NTSTATUS Status; ULONG Dummy, i; PLDR_DATA_TABLE_ENTRY LdrEntry; + PLIST_ENTRY NextEntry, OldEntry; = // // Allocate the ARM Shared Heap @@ -1080,7 +1082,7 @@ // // Setup the extension and setup block // - ArmLoaderBlock->Extension =3D ArmExtension; + ArmLoaderBlock->Extension =3D (PVOID)((ULONG_PTR)ArmExtension | KSEG0_= BASE); ArmLoaderBlock->SetupLdrBlock =3D NULL; = // @@ -1223,6 +1225,7 @@ // // Setup loader entry for the kernel // + wcscpy(ArmModuleName, L"ntoskrnl.exe"); LdrEntry =3D ArmAllocateFromSharedHeap(sizeof(LDR_DATA_TABLE_ENTRY)); RtlZeroMemory(LdrEntry, sizeof(LDR_DATA_TABLE_ENTRY)); LdrEntry->DllBase =3D (PVOID)KernelBase; @@ -1230,6 +1233,10 @@ LdrEntry->EntryPoint =3D KernelEntryPoint; LdrEntry->LoadCount =3D 1; LdrEntry->Flags =3D LDRP_IMAGE_DLL | LDRP_ENTRY_PROCESSED; + RtlInitUnicodeString(&LdrEntry->FullDllName, ArmModuleName); + RtlInitUnicodeString(&LdrEntry->BaseDllName, ArmModuleName); + LdrEntry->FullDllName.Buffer =3D (PVOID)((ULONG_PTR)LdrEntry->FullDllN= ame.Buffer | KSEG0_BASE); + LdrEntry->BaseDllName.Buffer =3D (PVOID)((ULONG_PTR)LdrEntry->BaseDllN= ame.Buffer | KSEG0_BASE); InsertTailList(&ArmLoaderBlock->LoadOrderListHead, &LdrEntry->InLoadOr= derLinks); = // @@ -1253,6 +1260,36 @@ if (Status !=3D STATUS_SUCCESS) return; } = + = + // + // Loop driver list + // = + NextEntry =3D ArmLoaderBlock->LoadOrderListHead.Flink; + while (NextEntry !=3D &ArmLoaderBlock->LoadOrderListHead) + { + // + // Remember the physical entry + // + OldEntry =3D NextEntry->Flink; + = + // + // Edit the data + // + NextEntry->Flink =3D (PVOID)((ULONG_PTR)NextEntry->Flink | KSEG0_B= ASE); + NextEntry->Blink =3D (PVOID)((ULONG_PTR)NextEntry->Blink | KSEG0_B= ASE); + = + // + // Keep looping + // + NextEntry =3D OldEntry; + } + + // + // Now edit the root itself + // + NextEntry->Flink =3D (PVOID)((ULONG_PTR)NextEntry->Flink | KSEG0_BASE); + NextEntry->Blink =3D (PVOID)((ULONG_PTR)NextEntry->Blink | KSEG0_BASE); + = // // Setup extension parameters // @@ -1276,7 +1313,7 @@ // Set the ARC Boot Path // strncpy(ArmArcBootPath, ArmCommandLine, 63); - ArmLoaderBlock->ArcBootDeviceName =3D ArmArcBootPath; + ArmLoaderBlock->ArcBootDeviceName =3D (PVOID)((ULONG_PTR)ArmArcBootPat= h | KSEG0_BASE); = // // The rest of the string is the NT path @@ -1286,22 +1323,31 @@ ArmNtBootPath[0] =3D '\\'; strncat(ArmNtBootPath, BootPath + 1, 63); strcat(ArmNtBootPath,"\\"); - ArmLoaderBlock->NtBootPathName =3D ArmNtBootPath; + ArmLoaderBlock->NtBootPathName =3D (PVOID)((ULONG_PTR)ArmNtBootPath | = KSEG0_BASE); = // // Set the HAL paths // strncpy(ArmArcHalPath, ArmArcBootPath, 63); - ArmLoaderBlock->ArcHalDeviceName =3D ArmArcHalPath; + ArmLoaderBlock->ArcHalDeviceName =3D (PVOID)((ULONG_PTR)ArmArcHalPath = | KSEG0_BASE); strcpy(ArmNtHalPath, "\\"); - ArmLoaderBlock->NtHalPathName =3D ArmNtHalPath; - = - /* Use this new command line */ + ArmLoaderBlock->NtHalPathName =3D (PVOID)((ULONG_PTR)ArmNtHalPath | KS= EG0_BASE); + = + // + // Use this new command line + // strncpy(ArmLoaderBlock->LoadOptions, HalPath + 2, 255); = - /* Parse it and change every slash to a space */ + // + // Parse it and change every slash to a space + // BootPath =3D ArmLoaderBlock->LoadOptions; do {if (*BootPath =3D=3D '/') *BootPath =3D ' ';} while (*BootPath++); + + // + // Fixup command-line pointer + // + ArmLoaderBlock->LoadOptions =3D (PVOID)((ULONG_PTR)ArmLoaderBlock->Loa= dOptions | KSEG0_BASE); = // // Setup cache information @@ -1412,6 +1458,35 @@ ArmLoaderBlock->Prcb =3D KSEG0_BASE | (ULONG)Base; ArmLoaderBlock->Process =3D ArmLoaderBlock->Prcb + sizeof(KPRCB); ArmLoaderBlock->Thread =3D ArmLoaderBlock->Process + sizeof(EPROCESS); + = + // + // Loop memory list + // = + NextEntry =3D ArmLoaderBlock->MemoryDescriptorListHead.Flink; + while (NextEntry !=3D &ArmLoaderBlock->MemoryDescriptorListHead) + { + // + // Remember the physical entry + // + OldEntry =3D NextEntry->Flink; + = + // + // Edit the data + // + NextEntry->Flink =3D (PVOID)((ULONG_PTR)NextEntry->Flink | KSEG0_B= ASE); + NextEntry->Blink =3D (PVOID)((ULONG_PTR)NextEntry->Blink | KSEG0_B= ASE); + = + // + // Keep looping + // + NextEntry =3D OldEntry; + } + = + // + // Now edit the root itself + // + NextEntry->Flink =3D (PVOID)((ULONG_PTR)NextEntry->Flink | KSEG0_BASE); + NextEntry->Blink =3D (PVOID)((ULONG_PTR)NextEntry->Blink | KSEG0_BASE); } = VOID Modified: trunk/reactos/include/ndk/arm/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/ketyp= es.h?rev=3D32659&r1=3D32658&r2=3D32659&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/ndk/arm/ketypes.h (original) +++ trunk/reactos/include/ndk/arm/ketypes.h Tue Mar 11 11:13:43 2008 @@ -59,6 +59,7 @@ // typedef struct _KTRAP_FRAME { + ULONG Spsr; ULONG R0; ULONG R1; ULONG R2; @@ -72,17 +73,17 @@ ULONG R10; ULONG R11; ULONG R12; - ULONG Sp; - ULONG Lr; + ULONG UserSp; + ULONG UserLr; + ULONG SvcSp; + ULONG SvcLr; ULONG Pc; - ULONG Psr; = - UCHAR ExceptionRecord[(sizeof(EXCEPTION_RECORD) + 7) & (~7)]; - UCHAR OldIrql; - UCHAR PreviousMode; - ULONG Fpscr; - ULONG FpExc; - ULONG S[33]; - ULONG FpExtra[8]; +// UCHAR OldIrql; +// UCHAR PreviousMode; +// ULONG Fpscr; +// ULONG FpExc; +// ULONG S[33]; +// ULONG FpExtra[8]; } KTRAP_FRAME, *PKTRAP_FRAME; = #ifndef NTOS_MODE_USER Modified: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/inte= rnal/arm/intrin_i.h?rev=3D32659&r1=3D32658&r2=3D32659&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h Tue Mar 11 11:13= :43 2008 @@ -26,6 +26,24 @@ { ARM_ID_CODE_REGISTER Value; __asm__ __volatile__ ("mrc p15, 0, %0, c0, c0, 0" : "=3Dr"(Value.AsUlo= ng) : : "cc"); + return Value; +} + +FORCEINLINE +ULONG +KeArmFaultStatusRegisterGet(VOID) +{ + ULONG Value; + __asm__ __volatile__ ("mrc p15, 0, %0, c5, c0, 0" : "=3Dr"(Value) : : = "cc"); + return Value; +} + +FORCEINLINE +ULONG +KeArmFaultAddressRegisterGet(VOID) +{ + ULONG Value; + __asm__ __volatile__ ("mrc p15, 0, %0, c6, c0, 0" : "=3Dr"(Value) : : = "cc"); return Value; } = Modified: trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/inte= rnal/arm/ksarm.h?rev=3D32659&r1=3D32658&r2=3D32659&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h Tue Mar 11 11:13:43= 2008 @@ -9,6 +9,7 @@ .equ CPSR_SVC_MODE, 0x13 .equ CPSR_ABORT_MODE, 0x17 .equ CPSR_UND_MODE, 0x1B +.equ CPSR_MODES, 0x1F = = /* Modified: trunk/reactos/ntoskrnl/ke/arm/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trap.= s?rev=3D32659&r1=3D32658&r2=3D32659&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ke/arm/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/arm/trap.s Tue Mar 11 11:13:43 2008 @@ -62,32 +62,107 @@ = NESTED_ENTRY KiDataAbortException PROLOG_END KiDataAbortException - - // - // Save space for trap frame - // - sub sp, #TrapFrameLength = // - // Build the register part of the trap frame + // Fixup lr // - stm sp, {r0-r15} + sub lr, lr, #8 + = + // + // Save the bottom 4 registers + // + stmdb sp, {r0-r3} + = + // + // Save the abort lr, sp, spsr, cpsr + // + mov r0, lr + mov r1, sp + mrs r2, cpsr + mrs r3, spsr + = + // + // Switch to SVC mode + // + bic r2, r2, #CPSR_MODES + orr r2, r2, #CPSR_SVC_MODE + msr cpsr_c, r2 + = + // + // Save the SVC sp before we modify it + // + mov r2, sp + = + // + // Save the abort lr + // + str r0, [sp, #-4]! + = + // + // Save the SVC lr and sp + // + str lr, [sp, #-4]! + str r2, [sp, #-4]! + = + // + // Restore the saved SPSR + // + msr spsr_all, r3 + = + // + // Restore our 4 registers + // + ldmdb r1, {r0-r3} + = + // + // Make space for the trap frame + // + sub sp, sp, #(4*15) // TrapFrameLength + = + // + // Save user-mode registers + // + stmia sp, {r0-r12} + add r0, sp, #(4*13) + stmia r0, {r13-r14}^ + = + // + // Save SPSR + // + mrs r0, spsr_all + str r0, [sp, #-4]! = - // - // TOOD: We'll worry about the rest later... - // - = // // Call the C handler // - mov a1, sp - b KiDataAbortHandler + adr lr, AbortExit + mov r0, sp + ldr pc, =3DKiDataAbortHandler + +AbortExit: = // - // Restore state + // Get the SPSR and restore it // + ldr r0, [sp], #4 + msr spsr_all, r0 + = + // + // Restore the registers + // + ldmia sp, {r0-r14}^ + mov r0, r0 + = + // + // Advance in the trap frame + // + add sp, sp, #(4*15) + = + // + // Restore program execution state + // + ldmia sp, {sp, lr, pc}^ b . - = ENTRY_END KiDataAbortException = NESTED_ENTRY KiInterruptException Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc= .c?rev=3D32659&r1=3D32658&r2=3D32659&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ke/arm/trapc.c (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c Tue Mar 11 11:13:43 2008 @@ -19,7 +19,23 @@ NTSTATUS KiDataAbortHandler(IN PKTRAP_FRAME TrapFrame) { - DPRINT1("Data Abort (%p) @ %p\n", TrapFrame, TrapFrame->Lr - 8); + NTSTATUS Status; + PVOID Address =3D (PVOID)KeArmFaultAddressRegisterGet(); + DPRINT1("Data Abort (%x) @ %p %p\n", Address, TrapFrame->SvcLr, TrapFr= ame->Pc); + DPRINT1("Abort Reason: %d\n", KeArmFaultStatusRegisterGet()); + = + // + // Check if this is a page fault + // + if (KeArmFaultStatusRegisterGet() =3D=3D 21) + { + Status =3D MmAccessFault(FALSE, + Address, + KernelMode, + TrapFrame); + DPRINT1("Status: %x\n", Status); + if (Status =3D=3D STATUS_SUCCESS) return Status; + } = while (TRUE); return STATUS_SUCCESS;

1 0

[dchapyshev] 32658: - Fix build
by dchapyshev＠svn.reactos.org 11 Mar '08

11 Mar '08

Author: dchapyshev Date: Tue Mar 11 11:13:26 2008 New Revision: 32658 URL: http://svn.reactos.org/svn/reactos?rev=3D32658&view=3Drev Log: - Fix build Modified: trunk/reactos/dll/cpl/input/input.rbuild Modified: trunk/reactos/dll/cpl/input/input.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.r= build?rev=3D32658&r1=3D32657&r2=3D32658&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/cpl/input/input.rbuild (original) +++ trunk/reactos/dll/cpl/input/input.rbuild Tue Mar 11 11:13:26 2008 @@ -1,6 +1,6 @@ <?xml version=3D"1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name=3D"input" type=3D"win32dll" extension=3D".cpl" baseaddress=3D= "${BASEADDRESS_INPUT}" installbase=3D"system32" installname=3D"input.cpl" u= nicode=3D"yes"> +<module name=3D"input" type=3D"win32dll" extension=3D".dll" baseaddress=3D= "${BASEADDRESS_INPUT}" installbase=3D"system32" installname=3D"input.dll" u= nicode=3D"yes"> <importlibrary definition=3D"input.def" /> <include base=3D"input">.</include> <define name=3D"_WIN32_IE">0x600</define>

1 0

[fireball] 32657: - Remove kilobyte of unneeded MS support database text copypaste. - Rename and add two application compatibility flags to W32THREADINFO structure (one for ancient compat flags, and one for a bit more modern flags). - Implement GetAppCompatFlags2() too.
by fireball＠svn.reactos.org 11 Mar '08

11 Mar '08

Author: fireball Date: Tue Mar 11 10:58:31 2008 New Revision: 32657 URL: http://svn.reactos.org/svn/reactos?rev=3D32657&view=3Drev Log: - Remove kilobyte of unneeded MS support database text copypaste. - Rename and add two application compatibility flags to W32THREADINFO struc= ture (one for ancient compat flags, and one for a bit more modern flags). - Implement GetAppCompatFlags2() too. Modified: trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc= /stubs.c?rev=3D32657&r1=3D32656&r2=3D32657&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/user32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c Tue Mar 11 10:58:31 2008 @@ -142,188 +142,29 @@ */ DWORD STDCALL -GetAppCompatFlags ( HTASK hTask ) +GetAppCompatFlags(HTASK hTask) { PW32THREADINFO ti =3D GetW32ThreadInfo(); = - if (ti =3D=3D NULL) - { - return 0; - } - - /* NOTE : GetAppCompatFlags retuns which compatible flags should be send= back = - * the return value is any of http://support.microsoft.com/kb/82860 - * This text are direcly copy from the MSDN URL, so it does not get lost - *----------------------------------------------------------------------= -------- - * Bit: 1 - * Symbolic name: GACF_IGNORENODISCARD - * - * Meaning: Ignore NODISCARD flag if passed to GlobalAlloc(). C 6.x - * Runtime install library was allocating global memory - * improperly by incorrectly specifying the GMEM_NODISCARD bit. - * = - * Problem: Setup for MS apps. does not work on 1M 286 machine. - *----------------------------------------------------------------------- - * Bit: 2 - * Symbolic name: GACF_FORCETEXTBAND - * - * Meaning: Separate text band from graphics band. Forces separate band - * for text, disallowing 3.1 optimization where Text and - * Graphics are printed in the same band. Word Perfect was - * assuming text had to go in second band. - * - * Problem: Can't print graphics in landscape mode. The - * compatibility switch doesn't completely fix the - * problem, just fixes it for certain memory - * configurations. - *----------------------------------------------------------------------- - * Bit: 4 - * - * Symbolic name: GACF_ONELANDGRXBAND - * Meaning: One graphics band only. Allows only one Landscape graphics - * band. Take as much memory as possible for this band. What - * doesn't fit in that band doesn't print. - * - * Problem: Can't print graphics in landscape mode. The - * compatibility switch doesn't completely fix the - * problem, just fixes it for certain memory configurations. - *----------------------------------------------------------------------- - * Bit: 8 - * Symbolic name: GACF_IGNORETOPMOST - * - * Meaning: Ignore topmost windows for GetWindow(HWND,GW_HWNDFIRST) - * = - * Problem: CCMail would GP fault when running any Windows applet - * from CCMail because it assumed the applet it starts - * will be at the top of the window list when winexec - * returns. Because of the addition of TOPMOST windows in - * Win , this isn't the case. The compatibility bit - * fixes this so GetWindow doesn't return a topmost window. - *----------------------------------------------------------------------- - * Bit: 10 - * Symbolic name: GACF_CALLTTDEVICE - * - * Meaning: Set the DEVICE_FONTTYPE bit in the FontType for TT fonts - * returned by EnumFonts(). - * - * Problem: WordPerfect was assuming TT fonts enumerated by the - * printer would have the device bit set. TT fonts are not - * device fonts, so this bit wasn't set. There were - * various font mapping problems, such as TNR appearing in - * Script or Symbol. - *----------------------------------------------------------------------- - * Bit: 20 - * - * Symbolic name: GACF_MULTIPLEBANDS - * - * Meaning: Manually break graphics output into more than one band when = printing. - * - * Problem: Freelance wouldn't print graphics when there was enough - * memory and unidrv used only one band for printing. If - * the first band was the entire page, it didn't issue any - * graphics calls, thinking it was the text only band. - * This forces unidrv to use multiple bands. - *----------------------------------------------------------------------- - * Bit: 40 - * Symbolic name: GACF_ALWAYSSENDNCPAINT - * - * Meaning: SetWindowPos() must send a WM_NCPAINT message to all - * children, disallowing the 3.1 optimization where this message - * is only sent to windows that must be redrawn. - * - * Problem: File window overlaps the toolbox and doesn't repaint - * when a new file is opened. Pixie used the receipt of - * WM_NCPAINT messages to determine that they may need to - * reposition themselves at the top of the list. Win 3.0 - * used to send the messages to windows even when they - * didn't need to be sent; in particular if the window was - * within the bounding rect of any update region involved - * in a window management operation. - * = - * Problem: Repaint problems with dialog boxes left on the screen - * after file.open or file.new operations. - * - * Problem: Tool window is not available when opening the app. - *----------------------------------------------------------------------- - * Bit: 80 - *----------------------------------------------------------------------- - * Bit: 100 - *----------------------------------------------------------------------- - * Bit: 200 - *----------------------------------------------------------------------- - * Bit: 800 - *----------------------------------------------------------------------- - * Bit: 1000 - *----------------------------------------------------------------------- - * Bit: 2000 - *----------------------------------------------------------------------- - * Bit: 4000 - *----------------------------------------------------------------------- - * Bit: 8000 - * - * Symbolic name: GACF_FORCETTGRAPHICS - * - * Meaning: no expain in msdn - * - * Problem: Freelance wouldn't print TT unless print TT as graphics was = selected. - *----------------------------------------------------------------------- - * Bit: 10000 - * - * Symbolic name: GACF_NOHRGN1 - * Meaning: This bit affects applications that depend on a bug in the - * 3.0 GetUpdateRect() function. Under 3.0, GetUpdateRect - * would not always return the rectangle in logical DC - * coordinates: if the entire window was invalid, the rectangle - * was sometimes returned in window coordinates. This bug was - * fixed for 3.0 and 3.1 apps in Windows 3.1: coordinates are - * ALWAYS returned in logical coordinates. This bit re- - * introduces the bug in GetUpdateRect(), for those - * applications that depend on this behavior. - * - * Problem: Canvas not redrawn properly opening specific MSDraw objects = in Winword. - *----------------------------------------------------------------------- - * Bit: 20000 - * - * Symbolic name: GACF_NCCALCSIZEONMOVE - * Meaning: 3.1 and higher optimized WM_NCCALCSIZE if a window was just = moving, - * where 3.0 always sent it. This bit causes it to be sent always, as in= 3.0. - * - * Problem: Navigator bar of window fails to redraw when the window - * is moved across the desktop. - *----------------------------------------------------------------------- - * Bit: 40000 - * - * Symbolic name: GACF_SENDMENUDBLCLK - * - * Meaning: Passes double-clicks on a menu bar on to the app. With this - * bit set, if the user double clicks on the menu bar when a - * menu is visible, we end processing of the menu and pass the - * double click message on to the application. This allows Just - * Write to detect double click on the system menu of a - * maximized MDI child. The normal (and expected) behavior is - * for Windows to detect the double click on a sys menu of a - * maximized child and send the app a WM_SYSCOMMAND SC_CLOSE - * message which is what happens with a non-maximized MDI child window. - * - * Problem: Sub-editors (such as footer and header editors) - * couldn't be closed by double-clicking the system menu. - * = - *----------------------------------------------------------------------- - * Bit: 80000 - * - * Symbolic name: GACF_30AVGWIDTH - * - * Meaning: Changed the way we calculate avg width, this fixes it for - * postscript. Scale all fonts by 7/8. This flag has been - * added for TurboTax for printing with pscript driver. Turbo - * Tax has hard coded average width it uses for selecting fonts. - * Since we changed the way we calculate avg width to match what - * is in TT, Turbo Tax is broken. - * - * Problem: 1040 tax forms wouldn't print correctly. - */ - = - return ti->dwAppsCompatibleFlags; + /* If there is no threadinfo (?!), then return 0 */ + if (!ti) return 0; + + return ti->AppCompatFlags; +} + +/* + * @implemented + */ +DWORD +STDCALL +GetAppCompatFlags2(HTASK hTask) +{ + PW32THREADINFO ti =3D GetW32ThreadInfo(); + + /* If there is no threadinfo (?!), then return 0 */ + if (!ti) return 0; + + return ti->AppCompatFlags2; } = /* @@ -872,17 +713,6 @@ /* * @unimplemented */ -DWORD -STDCALL -GetAppCompatFlags2(HTASK hTask) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ VOID STDCALL InitializeLpkHooks(FARPROC *hookfuncs) { UNIMPLEMENTED; Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32= k/ntuser.h?rev=3D32657&r1=3D32656&r2=3D32657&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Tue Mar 11 10:58:31 2008 @@ -191,9 +191,9 @@ ULONG_PTR DesktopHeapDelta; /* A mask of what hooks are currently active */ ULONG Hooks; - /* apps compatble flags it being set which compatible mode the apps ne= ed - * to run in see GetAppCompatFlags for more info */ - DWORD dwAppsCompatibleFlags; + /* Application compatibility flags */ + DWORD AppCompatFlags; + DWORD AppCompatFlags2; } W32THREADINFO, *PW32THREADINFO; = /* Window Client Information structure */

1 0

[dchapyshev] 32656: - Rewrite input.dll - Delete unused resources - Update all languages
by dchapyshev＠svn.reactos.org 11 Mar '08

11 Mar '08

Author: dchapyshev Date: Tue Mar 11 10:52:27 2008 New Revision: 32656 URL: http://svn.reactos.org/svn/reactos?rev=3D32656&view=3Drev Log: - Rewrite input.dll - Delete unused resources - Update all languages Removed: trunk/reactos/dll/cpl/input/advanced.c trunk/reactos/dll/cpl/input/langbar.c trunk/reactos/dll/cpl/input/misc.c trunk/reactos/dll/cpl/input/resources/information.ico trunk/reactos/dll/cpl/input/resources/keyboard.ico trunk/reactos/dll/cpl/input/resources/marker.ico trunk/reactos/dll/cpl/input/resources/microphone.ico Modified: trunk/reactos/dll/cpl/input/add.c trunk/reactos/dll/cpl/input/input.c trunk/reactos/dll/cpl/input/input.h trunk/reactos/dll/cpl/input/input.rbuild trunk/reactos/dll/cpl/input/input.rc trunk/reactos/dll/cpl/input/inputlangprop.c trunk/reactos/dll/cpl/input/keysettings.c trunk/reactos/dll/cpl/input/lang/bg-BG.rc trunk/reactos/dll/cpl/input/lang/de-DE.rc trunk/reactos/dll/cpl/input/lang/en-US.rc trunk/reactos/dll/cpl/input/lang/es-ES.rc trunk/reactos/dll/cpl/input/lang/fr-FR.rc trunk/reactos/dll/cpl/input/lang/pl-PL.rc trunk/reactos/dll/cpl/input/lang/ru-RU.rc trunk/reactos/dll/cpl/input/lang/sk-SK.rc trunk/reactos/dll/cpl/input/lang/uk-UA.rc trunk/reactos/dll/cpl/input/resource.h trunk/reactos/dll/cpl/input/settings.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/input/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/add.c?r= ev=3D32656&r1=3D32655&r2=3D32656&view=3Ddiff Removed: trunk/reactos/dll/cpl/input/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/advance= d.c?rev=3D32655&view=3Dauto Modified: trunk/reactos/dll/cpl/input/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.c= ?rev=3D32656&r1=3D32655&r2=3D32656&view=3Ddiff Modified: trunk/reactos/dll/cpl/input/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.h= ?rev=3D32656&r1=3D32655&r2=3D32656&view=3Ddiff Modified: trunk/reactos/dll/cpl/input/input.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.r= build?rev=3D32656&r1=3D32655&r2=3D32656&view=3Ddiff Modified: trunk/reactos/dll/cpl/input/input.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.r= c?rev=3D32656&r1=3D32655&r2=3D32656&view=3Ddiff Modified: trunk/reactos/dll/cpl/input/inputlangprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/inputla= ngprop.c?rev=3D32656&r1=3D32655&r2=3D32656&view=3Ddiff Modified: trunk/reactos/dll/cpl/input/keysettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/keysett= ings.c?rev=3D32656&r1=3D32655&r2=3D32656&view=3Ddiff Modified: trunk/reactos/dll/cpl/input/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/bg= -BG.rc?rev=3D32656&r1=3D32655&r2=3D32656&view=3Ddiff Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de= -DE.rc?rev=3D32656&r1=3D32655&r2=3D32656&view=3Ddiff Modified: trunk/reactos/dll/cpl/input/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/en= -US.rc?rev=3D32656&r1=3D32655&r2=3D32656&view=3Ddiff Modified: trunk/reactos/dll/cpl/input/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/es= -ES.rc?rev=3D32656&r1=3D32655&r2=3D32656&view=3Ddiff Modified: trunk/reactos/dll/cpl/input/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/fr= -FR.rc?rev=3D32656&r1=3D32655&r2=3D32656&view=3Ddiff Modified: trunk/reactos/dll/cpl/input/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/pl= -PL.rc?rev=3D32656&r1=3D32655&r2=3D32656&view=3Ddiff Modified: trunk/reactos/dll/cpl/input/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ru= -RU.rc?rev=3D32656&r1=3D32655&r2=3D32656&view=3Ddiff Modified: trunk/reactos/dll/cpl/input/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/sk= -SK.rc?rev=3D32656&r1=3D32655&r2=3D32656&view=3Ddiff Modified: trunk/reactos/dll/cpl/input/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/uk= -UA.rc?rev=3D32656&r1=3D32655&r2=3D32656&view=3Ddiff Removed: trunk/reactos/dll/cpl/input/langbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/langbar= .c?rev=3D32655&view=3Dauto Removed: trunk/reactos/dll/cpl/input/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/misc.c?= rev=3D32655&view=3Dauto Modified: trunk/reactos/dll/cpl/input/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resourc= e.h?rev=3D32656&r1=3D32655&r2=3D32656&view=3Ddiff Removed: trunk/reactos/dll/cpl/input/resources/information.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resourc= es/information.ico?rev=3D32655&view=3Dauto Removed: trunk/reactos/dll/cpl/input/resources/keyboard.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resourc= es/keyboard.ico?rev=3D32655&view=3Dauto Removed: trunk/reactos/dll/cpl/input/resources/marker.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resourc= es/marker.ico?rev=3D32655&view=3Dauto Removed: trunk/reactos/dll/cpl/input/resources/microphone.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resourc= es/microphone.ico?rev=3D32655&view=3Dauto Modified: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/setting= s.c?rev=3D32656&r1=3D32655&r2=3D32656&view=3Ddiff

1 0

[ros-arm-bringup] 32655: - We missed this one -- fix the x86 build.
by ros-arm-bringup＠svn.reactos.org 11 Mar '08

11 Mar '08

Author: ros-arm-bringup Date: Tue Mar 11 01:05:57 2008 New Revision: 32655 URL: http://svn.reactos.org/svn/reactos?rev=3D32655&view=3Drev Log: - We missed this one -- fix the x86 build. Modified: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S Modified: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/i386/fast= interlck_asm.S?rev=3D32655&r1=3D32654&r2=3D32655&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S (original) +++ trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S Tue Mar 11 01:05:57 2= 008 @@ -540,7 +540,6 @@ */ .global @Exfi386InterlockedExchangeUlong@8 .global @InterlockedExchange@8 -@InterlockedExchange@8: @Exfi386InterlockedExchangeUlong@8: = #ifdef CONFIG_SMP

1 0

[ros-arm-bringup] 32654: - Forgot to commit previous HAL changes. - There is no reason to implement the Interlocked* APIs in assembly in the kernel -- just have them call the intrinsics. - Also fix the way we were overloading the exported APIs, we now use the intrinsics all the time. - Convert loader block address to virtual, and parse the addresses inside it and convert them to virtual too, after we don't use them in FreeLDR anymore -- the kernel will delete the p->v identity mapping, and event
by ros-arm-bringup＠svn.reactos.org 11 Mar '08

11 Mar '08

Author: ros-arm-bringup Date: Mon Mar 10 23:42:54 2008 New Revision: 32654 URL: http://svn.reactos.org/svn/reactos?rev=3D32654&view=3Drev Log: - Forgot to commit previous HAL changes. - There is no reason to implement the Interlocked* APIs in assembly in the = kernel -- just have them call the intrinsics. - Also fix the way we were overloading the exported APIs, we now use the in= trinsics all the time. - Convert loader block address to virtual, and parse the addresses inside i= t and convert them to virtual too, after we don't use them in FreeLDR anymo= re -- the kernel will delete the p->v identity mapping, and eventually stil= l need to touch the loader block. - Implement MmGetPhysicalAddress and MiGetUserPageDirectoryCount for ARM. - We now reach the point where we start initializing the boot drivers' memo= ry information. Added: trunk/reactos/ntoskrnl/ex/exintrin.c (with props) Modified: trunk/reactos/hal/halarm/generic/hal.c trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s trunk/reactos/ntoskrnl/mm/arm/stubs.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild trunk/reactos/ntoskrnl/rtl/arm/rtlexcpt.c Modified: trunk/reactos/hal/halarm/generic/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/generic/ha= l.c?rev=3D32654&r1=3D32653&r2=3D32654&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/hal/halarm/generic/hal.c (original) +++ trunk/reactos/hal/halarm/generic/hal.c Mon Mar 10 23:42:54 2008 @@ -26,6 +26,11 @@ #undef ExAcquireFastMutex #undef ExReleaseFastMutex #undef ExTryToAcquireFastMutex +#undef KeAcquireSpinLock +#undef KeGetCurrentIrql +#undef KeLowerIrql +#undef KeRaiseIrql +#undef KeReleaseSpinLock = /* DATA ******************************************************************= ****/ = @@ -730,90 +735,12 @@ return Address; } = - -#undef KeAcquireSpinLock -VOID -NTAPI -KeAcquireSpinLock( - PKSPIN_LOCK SpinLock, - PKIRQL OldIrql) -{ - UNIMPLEMENTED; -} - - -KIRQL -FASTCALL -KeAcquireSpinLockRaiseToSynch( - PKSPIN_LOCK SpinLock) -{ - UNIMPLEMENTED; - - return 0; -} - - -/* - * @implemented - */ -VOID -FASTCALL -KeAcquireInStackQueuedSpinLock(IN PKSPIN_LOCK SpinLock, - IN PKLOCK_QUEUE_HANDLE LockHandle) -{ - /* Simply raise to dispatch */ - LockHandle->OldIrql =3D KeSwapIrql(DISPATCH_LEVEL); -} - -/* - * @implemented - */ -VOID -FASTCALL -KeAcquireInStackQueuedSpinLockRaiseToSynch(IN PKSPIN_LOCK SpinLock, - IN PKLOCK_QUEUE_HANDLE LockHand= le) -{ - /* Simply raise to synch */ - LockHandle->OldIrql =3D KeSwapIrql(SYNCH_LEVEL); -} - -/* - * @implemented - */ -VOID -FASTCALL -KeReleaseInStackQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle) -{ - /* Simply lower IRQL back */ - KeSwapIrql(LockHandle->OldIrql); -} - VOID NTAPI KeFlushWriteBuffer(VOID) { UNIMPLEMENTED; } - -#undef KeGetCurrentIrql -KIRQL -NTAPI -KeGetCurrentIrql(VOID) -{ - UNIMPLEMENTED; - - return (KIRQL)0; -} - -#undef KeLowerIrql -VOID -NTAPI -KeLowerIrql( - KIRQL NewIrql) -{ - UNIMPLEMENTED; -} - = LARGE_INTEGER NTAPI @@ -829,47 +756,6 @@ return Value; } = -#undef KeRaiseIrql -VOID -NTAPI -KeRaiseIrql( - KIRQL NewIrql, - PKIRQL OldIrql) -{ - UNIMPLEMENTED; -} - - -KIRQL -NTAPI -KeRaiseIrqlToDpcLevel(VOID) -{ - UNIMPLEMENTED; - - return (KIRQL)0; -} - - -KIRQL -NTAPI -KeRaiseIrqlToSynchLevel(VOID) -{ - UNIMPLEMENTED; - - return (KIRQL)0; -} - -#undef KeReleaseSpinLock -VOID -NTAPI -KeReleaseSpinLock( - PKSPIN_LOCK SpinLock, - KIRQL NewIrql) -{ - UNIMPLEMENTED; -} - - VOID NTAPI KeStallExecutionProcessor( @@ -878,42 +764,6 @@ UNIMPLEMENTED; } = - -LOGICAL -FASTCALL -KeTryToAcquireQueuedSpinLock( - KSPIN_LOCK_QUEUE_NUMBER LockNumber, - PKIRQL OldIrql) -{ - UNIMPLEMENTED; - - return FALSE; -} - - -BOOLEAN -FASTCALL -KeTryToAcquireQueuedSpinLockRaiseToSynch( - KSPIN_LOCK_QUEUE_NUMBER LockNumber, - PKIRQL OldIrql) -{ - UNIMPLEMENTED; - - return FALSE; -} - - -KIRQL -FASTCALL -KfAcquireSpinLock( - PKSPIN_LOCK SpinLock) -{ - UNIMPLEMENTED; - - return (KIRQL)0; -} - - VOID FASTCALL KfLowerIrql( @@ -932,17 +782,6 @@ = return (KIRQL)0; } - - -VOID -FASTCALL -KfReleaseSpinLock( - PKSPIN_LOCK SpinLock, - KIRQL NewIrql) -{ - UNIMPLEMENTED; -} - = VOID NTAPI @@ -1071,31 +910,21 @@ } = KIRQL -FASTCALL -KeAcquireQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle) -{ - UNIMPLEMENTED; - return (KIRQL)0; +KeSwapIrql(IN KIRQL Irql) +{ + UNIMPLEMENTED; + return 0; } = KIRQL -FASTCALL -KeAcquireQueuedSpinLockRaiseToSynch(IN PKLOCK_QUEUE_HANDLE LockHandle) +KeRaiseIrqlToDpcLevel(VOID) { UNIMPLEMENTED; - return (KIRQL)0; -} - -VOID -FASTCALL -KeReleaseQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle, - IN KIRQL OldIrql) -{ - UNIMPLEMENTED; + return 0; } = KIRQL -KeSwapIrql(IN KIRQL Irql) +KeRaiseIrqlToSynchLevel(VOID) { UNIMPLEMENTED; return 0; @@ -1163,4 +992,195 @@ KeArmFlushIcache(); } = +/* + * @implemented + */ +KIRQL +NTAPI +KeGetCurrentIrql(VOID) +{ + /* Return IRQL */ + return PCR->CurrentIrql; +} + +/* + * @implemented + */ +VOID +NTAPI +KeLowerIrql(KIRQL NewIrql) +{ + /* Call the fastcall function */ + KfLowerIrql(NewIrql); +} + +/* + * @implemented + */ +VOID +NTAPI +KeRaiseIrql(KIRQL NewIrql, + PKIRQL OldIrql) +{ + /* Call the fastcall function */ + *OldIrql =3D KfRaiseIrql(NewIrql); +} + +/* + * @implemented + */ +VOID +NTAPI +KeAcquireSpinLock(PKSPIN_LOCK SpinLock, + PKIRQL OldIrql) +{ + /* Call the fastcall function */ + *OldIrql =3D KfAcquireSpinLock(SpinLock); +} + +/* + * @implemented + */ +KIRQL +FASTCALL +KeAcquireSpinLockRaiseToSynch(PKSPIN_LOCK SpinLock) +{ + /* Simply raise to dispatch */ + return KfRaiseIrql(DISPATCH_LEVEL); +} + +/* + * @implemented + */ +VOID +NTAPI +KeReleaseSpinLock(PKSPIN_LOCK SpinLock, + KIRQL NewIrql) +{ + /* Call the fastcall function */ + KfReleaseSpinLock(SpinLock, NewIrql); +} + +/* + * @implemented + */ +KIRQL +FASTCALL +KfAcquireSpinLock(PKSPIN_LOCK SpinLock) +{ + /* Simply raise to dispatch */ + return KfRaiseIrql(DISPATCH_LEVEL); +} + +/* + * @implemented + */ +VOID +FASTCALL +KfReleaseSpinLock(PKSPIN_LOCK SpinLock, + KIRQL OldIrql) +{ + /* Simply lower IRQL back */ + KfLowerIrql(OldIrql); +} + +/* + * @implemented + */ +KIRQL +FASTCALL +KeAcquireQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber) +{ + /* Simply raise to dispatch */ + return KfRaiseIrql(DISPATCH_LEVEL); +} + +/* + * @implemented + */ +KIRQL +FASTCALL +KeAcquireQueuedSpinLockRaiseToSynch(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber) +{ + /* Simply raise to dispatch */ + return KfRaiseIrql(DISPATCH_LEVEL); +} + +/* + * @implemented + */ +VOID +FASTCALL +KeAcquireInStackQueuedSpinLock(IN PKSPIN_LOCK SpinLock, + IN PKLOCK_QUEUE_HANDLE LockHandle) +{ + /* Simply raise to dispatch */ + LockHandle->OldIrql =3D KfRaiseIrql(DISPATCH_LEVEL); +} + +/* + * @implemented + */ +VOID +FASTCALL +KeAcquireInStackQueuedSpinLockRaiseToSynch(IN PKSPIN_LOCK SpinLock, + IN PKLOCK_QUEUE_HANDLE LockHand= le) +{ + /* Simply raise to synch */ + LockHandle->OldIrql =3D KfRaiseIrql(SYNCH_LEVEL); +} + +/* + * @implemented + */ +VOID +FASTCALL +KeReleaseQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, + IN KIRQL OldIrql) +{ + /* Simply lower IRQL back */ + KfLowerIrql(OldIrql); +} + +/* + * @implemented + */ +VOID +FASTCALL +KeReleaseInStackQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle) +{ + /* Simply lower IRQL back */ + KfLowerIrql(LockHandle->OldIrql); +} + +/* + * @implemented + */ +BOOLEAN +FASTCALL +KeTryToAcquireQueuedSpinLockRaiseToSynch(IN KSPIN_LOCK_QUEUE_NUMBER LockNu= mber, + IN PKIRQL OldIrql) +{ + /* Simply raise to dispatch */ + *OldIrql =3D KfRaiseIrql(DISPATCH_LEVEL); + = + /* Always return true on UP Machines */ + return TRUE; +} + +/* + * @implemented + */ +LOGICAL +FASTCALL +KeTryToAcquireQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, + OUT PKIRQL OldIrql) +{ + /* Simply raise to dispatch */ + *OldIrql =3D KfRaiseIrql(DISPATCH_LEVEL); + = + /* Always return true on UP Machines */ + return TRUE; +} + /* EOF */ Added: trunk/reactos/ntoskrnl/ex/exintrin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/exintrin.= c?rev=3D32654&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ex/exintrin.c (added) +++ trunk/reactos/ntoskrnl/ex/exintrin.c Mon Mar 10 23:42:54 2008 @@ -1,0 +1,75 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ex/exinrin.c + * PURPOSE: Exported kernel functions which are now intrinsics + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES **************************************************************= *****/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#undef InterlockedIncrement +#undef InterlockedDecrement +#undef InterlockedCompareExchange +#undef InterlockedExchangeAdd +#undef InterlockedExchange + +/* FUNCTIONS *************************************************************= *****/ + +LONG +FASTCALL +InterlockedIncrement(IN LONG volatile *Addend) +{ + // + // Call the intrinsic + // + return _InterlockedIncrement(Addend); = +} + +LONG +FASTCALL +InterlockedDecrement(IN LONG volatile *Addend) +{ + // + // Call the intrinsic + // + return _InterlockedDecrement(Addend); +} + +LONG +FASTCALL +InterlockedCompareExchange(IN OUT LONG volatile *Destination, + IN LONG Exchange, + IN LONG Comperand) +{ + // + // Call the intrinsic + // + return _InterlockedCompareExchange(Destination, Exchange, Comperand); +} + +LONG +FASTCALL +InterlockedExchange(IN OUT LONG volatile *Destination, + IN LONG Value) +{ + // + // Call the intrinsic + // + return _InterlockedExchange(Destination, Value); +} + +LONG +FASTCALL +InterlockedExchangeAdd(IN OUT LONG volatile *Addend, + IN LONG Increment) +{ + // + // Call the intrinsic + // + return _InterlockedExchangeAdd(Addend, Increment); +} Propchange: trunk/reactos/ntoskrnl/ex/exintrin.c ---------------------------------------------------------------------------= --- svn:eol-style =3D native Propchange: trunk/reactos/ntoskrnl/ex/exintrin.c ---------------------------------------------------------------------------= --- svn:mime-type =3D text/plain Modified: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/i386/fast= interlck_asm.S?rev=3D32654&r1=3D32653&r2=3D32654&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S (original) +++ trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S Mon Mar 10 23:42:54 2= 008 @@ -558,54 +558,6 @@ /* Return */ ret = -/*ULONG - *FASTCALL - *InterlockedIncrement(IN PLONG Addend) - */ -.global @InterlockedIncrement@4 -@InterlockedIncrement@4: - - /* Do the op */ - mov eax, 1 - LOCK xadd dword ptr [ecx], eax - - /* Return */ - inc eax - ret - -/*ULONG - *FASTCALL - *InterlockedDecrement(IN PLONG Addend) - */ -.global @InterlockedDecrement@4 -@InterlockedDecrement@4: - - /* Do the op */ - mov eax, -1 - LOCK xadd dword ptr [ecx], eax - - /* Return */ - dec eax - ret - -/*PVOID - *FASTCALL - *InterlockedCompareExchange(IN OUT PVOID *Destination, - * IN PVOID Exchange, - * IN PVOID Comperand) - */ -.global @InterlockedCompareExchange@12 -@InterlockedCompareExchange@12: - - /* Get comperand */ - mov eax, [esp+4] - - /* Do the op */ - LOCK cmpxchg dword ptr [ecx], edx - - /* Return */ - ret 4 - /*PVOID *FASTCALL *ExfInterlockedCompareExchange64(IN PLONGLONG Destination, @@ -669,21 +621,6 @@ /* Return */ ret 8 = -/*PVOID - *FASTCALL - *InterlockedExchangeAdd(IN OUT PLONG Addend, - * IN LONG Increment) - */ -.global @InterlockedExchangeAdd@8 -@InterlockedExchangeAdd@8: - - /* Do the op */ - LOCK xadd dword ptr [ecx], edx - - /* Return */ - mov eax, edx - ret - /*** Non-586 functions ***/ = /*PSINGLE_LIST_ENTRY Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/inte= rnal/ntoskrnl.h?rev=3D32654&r1=3D32653&r2=3D32654&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Mon Mar 10 23:42:54 = 2008 @@ -21,6 +21,16 @@ #define KeGetPreviousMode _KeGetPreviousMode #undef PsGetCurrentProcess #define PsGetCurrentProcess _PsGetCurrentProcess + +// +// We are very lazy on ARM -- we just import intrinsics +// Question: Why wasn't this done for x86 too? (see fastintrlck.asm) +// +#define InterlockedDecrement _InterlockedDecrement +#define InterlockedIncrement _InterlockedIncrement +#define InterlockedCompareExchange _InterlockedCompareExchange +#define InterlockedExchange _InterlockedExchange +#define InterlockedExchangeAdd _InterlockedExchangeAdd = #include "ke.h" #include "i386/mm.h" @@ -54,15 +64,6 @@ #include "vdm.h" #include "hal.h" #include "arch/intrin_i.h" - -// -// We are very lazy on ARM -- we just import intrinsics -// Question: Why wasn't this done for x86 too? (see fastintrlck.asm) -// -#define InterlockedDecrement _InterlockedDecrement -#define InterlockedIncrement _InterlockedIncrement -#define InterlockedCompareExchange _InterlockedCompareExchange -#define InterlockedExchangeAdd _InterlockedExchangeAdd = #include <pshpack1.h> /* Modified: trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs= _asm.s?rev=3D32654&r1=3D32653&r2=3D32654&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s (original) +++ trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s Mon Mar 10 23:42:54 2008 @@ -31,11 +31,6 @@ GENERATE_ARM_STUB Exi386InterlockedDecrementLong = GENERATE_ARM_STUB Exi386InterlockedExchangeUlong = GENERATE_ARM_STUB Exi386InterlockedIncrementLong = -GENERATE_ARM_STUB InterlockedCompareExchange = -GENERATE_ARM_STUB InterlockedDecrement = -GENERATE_ARM_STUB InterlockedExchange = -GENERATE_ARM_STUB InterlockedExchangeAdd = -GENERATE_ARM_STUB InterlockedIncrement = GENERATE_ARM_STUB InterlockedPopEntrySList = GENERATE_ARM_STUB InterlockedPushEntrySList = = Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs= .c?rev=3D32654&r1=3D32653&r2=3D32654&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/mm/arm/stubs.c (original) +++ trunk/reactos/ntoskrnl/mm/arm/stubs.c Mon Mar 10 23:42:54 2008 @@ -11,6 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + /* GLOBALS ***************************************************************= *****/ = #undef UNIMPLEMENTED @@ -551,15 +552,50 @@ */ PHYSICAL_ADDRESS NTAPI -MmGetPhysicalAddress(IN PVOID vaddr) -{ - PHYSICAL_ADDRESS p; - - // - // TODO - // - UNIMPLEMENTED; - return p; +MmGetPhysicalAddress(IN PVOID Address) +{ + PHYSICAL_ADDRESS PhysicalAddress =3D {{0}}; + PMMPTE PointerPte; + DPRINT1("MmGetPhysicalAddress(%lx)\n", Address); + + // + // Early boot PCR check + // + if (Address =3D=3D PCR) + { + // + // ARM Hack while we still use a section PTE + // + PointerPte =3D MiGetPdeAddress(PCR); + ASSERT(PointerPte->u.Hard.L1.Section.Type =3D=3D SectionPte); + PhysicalAddress.QuadPart =3D PointerPte->u.Hard.L1.Section.BaseAdd= ress; + PhysicalAddress.QuadPart <<=3D CPT_SHIFT; + DPRINT1("Base: %p\n", PhysicalAddress.LowPart); + PhysicalAddress.LowPart +=3D BYTE_OFFSET(Address); + return PhysicalAddress; + } + = + // + // Get the PTE + // + PointerPte =3D MiGetPteAddress(Address); + if (PointerPte->u.Hard.L1.Fault.Type =3D=3D FaultPte) + { + // + // Invalid address + // + DPRINT1("Address invalid: %p\n", Address); + return PhysicalAddress; + } + + // + // Return the information + // + ASSERT(PointerPte->u.Hard.L2.Small.Type !=3D SmallPte); + PhysicalAddress.QuadPart =3D PointerPte->u.Hard.L2.Small.BaseAddress; + PhysicalAddress.QuadPart <<=3D PAGE_SHIFT; + PhysicalAddress.LowPart +=3D BYTE_OFFSET(Address); + return PhysicalAddress; } = PVOID @@ -691,10 +727,9 @@ MiGetUserPageDirectoryCount(VOID) { // - // TODO - // - UNIMPLEMENTED; - return 0; + // Return the index + // + return MiGetPdeOffset(MmSystemRangeStart); } = VOID Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-gen= eric.rbuild?rev=3D32654&r1=3D32653&r2=3D32654&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Mon Mar 10 23:42:54 2008 @@ -181,6 +181,7 @@ <file>efi.c</file> <file>event.c</file> <file>evtpair.c</file> + <file>exintrin.c</file> <file>fmutex.c</file> <file>handle.c</file> <file>harderr.c</file> Modified: trunk/reactos/ntoskrnl/rtl/arm/rtlexcpt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/arm/rtle= xcpt.c?rev=3D32654&r1=3D32653&r2=3D32654&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/rtl/arm/rtlexcpt.c (original) +++ trunk/reactos/ntoskrnl/rtl/arm/rtlexcpt.c Mon Mar 10 23:42:54 2008 @@ -1,17 +1,16 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/rtl/libsupp.c - * PURPOSE: RTL Support Routines - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - * Gunnar Dalsnes + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/rtl/arm/rtlexcpt.c + * PURPOSE: ARM Exception Helper Routines for Stack Walking + * PROGRAMMERS: ReactOS Portable Systems Group */ = -/* INCLUDES **************************************************************= ****/ +/* INCLUDES **************************************************************= *****/ = #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> = /* FUNCTIONS *************************************************************= ****/ =

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