Ros-diffs November 2011

ros-diffs@reactos.org

16 participants
274 discussions

[khornicek] 54374: [TRANSLATION] Fix Czech resources that got broken by the UTF8 conversion.

by khornicek＠svn.reactos.org

Author: khornicek Date: Sun Nov 13 16:27:03 2011 New Revision: 54374 URL: http://svn.reactos.org/svn/reactos?rev=54374&view=rev Log: [TRANSLATION] Fix Czech resources that got broken by the UTF8 conversion. Modified: trunk/reactos/base/setup/reactos/lang/cs-CZ.rc trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc trunk/reactos/base/setup/welcome/lang/cs-CZ.rc trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc trunk/reactos/base/system/format/lang/cs-CZ.rc trunk/reactos/base/system/regsvr32/lang/cs-CZ.rc trunk/reactos/base/system/rundll32/lang/cs-CZ.rc trunk/reactos/base/system/userinit/lang/cs-CZ.rc trunk/reactos/base/system/winlogon/lang/cs-CZ.rc Modified: trunk/reactos/base/setup/reactos/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/cs… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/cs-CZ.rc [iso-8859-1] Sun Nov 13 16:27:03 2011 @@ -11,9 +11,9 @@ CAPTION "Instalace systÃ©mu ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "VÃtejte v prÃ¹vodci instalace systÃ©mu ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "SystÃ©m ReactOS zatÃm nelze nainstalovat pÃ¸Ãmo z tohoto CD! Pro instalaci restartuje poÃ¨ÃtaÃ¨ z tohoto CD.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "KlepnutÃm na DokonÃ¨it ukonÃ¨Ãte instalaci.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "VÃtejte v prÅ¯vodci instalace systÃ©mu ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "SystÃ©m ReactOS zatÃm nelze nainstalovat pÅÃmo z tohoto CD! Pro instalaci restartuje poÄÃtaÄ z tohoto CD.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "KlepnutÃm na DokonÄit ukonÄÃte instalaci.", IDC_STATIC, 115, 169, 195, 17 END IDD_LANGSELPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -24,7 +24,7 @@ CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 CONTROL "Jazyk instalace:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11 CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142 - CONTROL "KlÃ¡vesnice Ã¨i metoda zadÃ¡vÃ¡nÃ:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 + CONTROL "KlÃ¡vesnice Äi metoda zadÃ¡vÃ¡nÃ:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81 LTEXT "Po klepnutÃ na DalÅ¡Ã bude moÅ¾nÃ© zvolit typ instalace.", IDC_STATIC, 10, 180 ,297, 10 END @@ -37,7 +37,7 @@ CONTROL "Typ instalace", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 CONTROL "Nainstalovat systÃ©m ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 CONTROL "Opravit nebo aktualizovat jiÅ¾ nainstalovanÃ½ systÃ©m ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 - LTEXT "Po klepnutÃ na DalÅ¡Ã bude moÅ¾nÃ© nastavit zaÃ¸ÃzenÃ.", IDC_STATIC, 10, 180 ,297, 10 + LTEXT "Po klepnutÃ na DalÅ¡Ã bude moÅ¾nÃ© nastavit zaÅÃzenÃ.", IDC_STATIC, 10, 180 ,297, 10 END IDD_DEVICEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -45,14 +45,14 @@ CAPTION "Instalace systÃ©mu ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "NastavenÃ zaÃ¸ÃzenÃ", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "PoÃ¨ÃtaÃ¨:", IDC_STATIC, 20,15, 80, 10 + CONTROL "NastavenÃ zaÅÃzenÃ", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "PoÄÃtaÄ:", IDC_STATIC, 20,15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 150, 80 LTEXT "Obrazovka:", IDC_STATIC, 20,35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 LTEXT "KlÃ¡vesnice:", IDC_STATIC, 20,55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 - LTEXT "Po klepnutÃ na DalÅ¡Ã bude moÅ¾nÃ© nastavit instalaÃ¨nÃ zaÃ¸ÃzenÃ.", IDC_STATIC, 10, 180 ,277, 20 + LTEXT "Po klepnutÃ na DalÅ¡Ã bude moÅ¾nÃ© nastavit instalaÄnÃ zaÅÃzenÃ.", IDC_STATIC, 10, 180 ,277, 20 END IDD_DRIVEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -62,20 +62,20 @@ BEGIN CONTROL "OddÃl, do kterÃ©ho bude systÃ©m ReactOS nainstalovÃ¡n", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&VytvoÃ¸it", IDC_PARTCREATE, 20,155,50,15 + PUSHBUTTON "&VytvoÅit", IDC_PARTCREATE, 20,155,50,15 PUSHBUTTON "&Smazat", IDC_PARTDELETE, 76,155,50,15 - PUSHBUTTON "&OvladaÃ¨", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED - PUSHBUTTON "&PokroÃ¨ilÃ© volby...", IDC_PARTMOREOPTS, 218,155,80,15 + PUSHBUTTON "&OvladaÄ", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED + PUSHBUTTON "&PokroÄilÃ© volby...", IDC_PARTMOREOPTS, 218,155,80,15 LTEXT "Po klepnutÃ na DalÅ¡Ã bude moÅ¾nÃ© zkontrolovat vÅ¡echna nastavenÃ.", IDC_STATIC, 10, 180 ,277, 20 END IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 145, 90 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME -CAPTION "VytvoÃ¸it oddÃl" +CAPTION "VytvoÅit oddÃl" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_UPDOWN1,"msctls_updown32", WS_VISIBLE,104,22,9,13 - CONTROL "VytvoÃ¸it a naformÃ¡tovat oddÃl",IDC_STATIC,"Button",BS_GROUPBOX,7,5,129,57 + CONTROL "VytvoÅit a naformÃ¡tovat oddÃl",IDC_STATIC,"Button",BS_GROUPBOX,7,5,129,57 LTEXT "Velikost:",IDC_STATIC, 13,24,27,9 EDITTEXT IDC_PARTSIZE,52,23,53,13, WS_VISIBLE|WS_TABSTOP LTEXT "GB",IDC_UNIT, 117,24,14,9 @@ -87,17 +87,17 @@ IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME -CAPTION "PokroÃ¨ilÃ¡ nastavenÃ oddÃlu" +CAPTION "PokroÄilÃ¡ nastavenÃ oddÃlu" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "InstalaÃ¨nÃ sloÅ¾ka", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 + CONTROL "InstalaÄnÃ sloÅ¾ka", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Instalace zavadÃ¬Ã¨e", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 + CONTROL "Instalace zavadÄÄe", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 - CONTROL "Nainstalovat zavadÃ¬Ã¨ na pevnÃ½ disk (MBR a VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 - CONTROL "Nainstalovat zavadÃ¬Ã¨ na pevnÃ½ disk (jen VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 - CONTROL "ZavadÃ¬Ã¨ neinstalovat", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + CONTROL "Nainstalovat zavadÄÄ na pevnÃ½ disk (MBR a VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Nainstalovat zavadÄÄ na pevnÃ½ disk (jen VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "ZavadÄÄ neinstalovat", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE PUSHBUTTON "&Storno", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END @@ -108,7 +108,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "ShrnutÃ instalace", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "KlepnutÃm na DalÅ¡Ã zahÃ¡jÃte instalaÃ¨nÃ proces.", IDC_STATIC, 10, 180 ,277, 20 + LTEXT "KlepnutÃm na DalÅ¡Ã zahÃ¡jÃte instalaÄnÃ proces.", IDC_STATIC, 10, 180 ,277, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 @@ -117,7 +117,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "Akce instalace", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "Instalace souborÃ¹...", IDC_ACTIVITY, 20, 50, 277, 10 + LTEXT "Instalace souborÅ¯...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -125,34 +125,34 @@ IDD_RESTARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "DokonÃ¨enÃ instalace systÃ©mu ReactOS" +CAPTION "DokonÄenÃ instalace systÃ©mu ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "DokonÃ¨enÃ prvnÃ Ã¨Ã¡sti instalace systÃ©mu ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "PrvnÃ Ã¨Ã¡st instalace systÃ©mu ReactOS byla ÃºspÃ¬Å¡nÃ¬ dokonÃ¨ena.", IDC_STATIC, 20, 50, 277, 10 + CONTROL "DokonÄenÃ prvnÃ ÄÃ¡sti instalace systÃ©mu ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "PrvnÃ ÄÃ¡st instalace systÃ©mu ReactOS byla ÃºspÄÅ¡nÄ dokonÄena.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "Po klepnutÃ na DokonÃ¨it bude poÃ¨ÃtaÃ¨ restartovÃ¡n.", IDC_STATIC, 20, 80, 277, 10 + LTEXT "Po klepnutÃ na DokonÄit bude poÄÃtaÄ restartovÃ¡n.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Pokud je v mechanice instalaÃ¨nÃ CD, vyjmÃ¬te jej. PotÃ© kliknutÃm na DokonÃ¨it restartujte poÃ¨ÃtaÃ¨.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "Pokud je v mechanice instalaÄnÃ CD, vyjmÄte jej. PotÃ© kliknutÃm na DokonÄit restartujte poÄÃtaÄ.", IDC_STATIC, 10, 180, 297, 20 END STRINGTABLE BEGIN - IDS_LANGTITLE "VÃ½bÃ¬r jazyka" - IDS_LANGSUBTITLE "Volba jazyka, kterÃ½ bude pouÅ¾it pÃ¸i instalaci a ve vÃ½slednÃ©m systÃ©mu." - IDS_TYPETITLE "VÃtejte v prÃ¹vodci instalace systÃ©mu ReactOS" + IDS_LANGTITLE "VÃ½bÄr jazyka" + IDS_LANGSUBTITLE "Volba jazyka, kterÃ½ bude pouÅ¾it pÅi instalaci a ve vÃ½slednÃ©m systÃ©mu." + IDS_TYPETITLE "VÃtejte v prÅ¯vodci instalace systÃ©mu ReactOS" IDS_TYPESUBTITLE "Volba typu instalace." - IDS_DEVICETITLE "NastavenÃ zÃ¡kladnÃch zaÃ¸ÃzenÃ" + IDS_DEVICETITLE "NastavenÃ zÃ¡kladnÃch zaÅÃzenÃ" IDS_DEVICESUBTITLE "Volba nastavenÃ obrazovky a klÃ¡vesnice." - IDS_DRIVETITLE "NastavenÃ instalaÃ¨nÃho oddÃlu a systÃ©movÃ© sloÅ¾ky" - IDS_DRIVESUBTITLE "PÃ¸Ãprava instalaÃ¨nÃho oddÃlu, systÃ©movÃ© sloÅ¾ky a zavadÃ¬Ã¨e." - IDS_PROCESSTITLE "PÃ¸Ãprava oddÃlu, kopÃrovÃ¡nÃ souborÃ¹ a nastavenÃ systÃ©mu" - IDS_PROCESSSUBTITLE "VytvoÃ¸enÃ a naformÃ¡tovÃ¡nÃ oddÃlu, kopÃrovÃ¡nÃ souborÃ¹, instalace a nastavenÃ zavadÃ¬Ã¨e" - IDS_RESTARTTITLE "PrvnÃ Ã¨Ã¡st instalace dokonÃ¨ena" - IDS_RESTARTSUBTITLE "PrvnÃ Ã¨Ã¡st instalace byla dokonÃ¨ena, po restartovÃ¡nÃ poÃ¨ÃtaÃ¨e se bude pokraÃ¨ovat druhou Ã¨Ã¡stÃ" + IDS_DRIVETITLE "NastavenÃ instalaÄnÃho oddÃlu a systÃ©movÃ© sloÅ¾ky" + IDS_DRIVESUBTITLE "PÅÃprava instalaÄnÃho oddÃlu, systÃ©movÃ© sloÅ¾ky a zavadÄÄe." + IDS_PROCESSTITLE "PÅÃprava oddÃlu, kopÃrovÃ¡nÃ souborÅ¯ a nastavenÃ systÃ©mu" + IDS_PROCESSSUBTITLE "VytvoÅenÃ a naformÃ¡tovÃ¡nÃ oddÃlu, kopÃrovÃ¡nÃ souborÅ¯, instalace a nastavenÃ zavadÄÄe" + IDS_RESTARTTITLE "PrvnÃ ÄÃ¡st instalace dokonÄena" + IDS_RESTARTSUBTITLE "PrvnÃ ÄÃ¡st instalace byla dokonÄena, po restartovÃ¡nÃ poÄÃtaÄe se bude pokraÄovat druhou ÄÃ¡stÃ" IDS_SUMMARYTITLE "ShrnutÃ instalace" - IDS_SUMMARYSUBTITLE "VÃ½pis voleb instalace k ovÃ¬Ã¸enÃ pÃ¸ed tÃm, neÅ¾ zaÃ¨ne instalace" - IDS_ABORTSETUP "SystÃ©m ReactOS nenÃ na tomto poÃ¨ÃtaÃ¨i kompletnÃ¬ nainstalovanÃ½. Pokud nynÃ ukonÃ¨Ãte instalaci, bude ji pro nainstalovÃ¡nÃ systÃ©mu ReactOS nutnÃ© provÃ©st znova. Opravdu ukonÃ¨it?" - IDS_ABORTSETUP2 "PÃ¸eruÅ¡it instalaci?" + IDS_SUMMARYSUBTITLE "VÃ½pis voleb instalace k ovÄÅenÃ pÅed tÃm, neÅ¾ zaÄne instalace" + IDS_ABORTSETUP "SystÃ©m ReactOS nenÃ na tomto poÄÃtaÄi kompletnÄ nainstalovanÃ½. Pokud nynÃ ukonÄÃte instalaci, bude ji pro nainstalovÃ¡nÃ systÃ©mu ReactOS nutnÃ© provÃ©st znova. Opravdu ukonÄit?" + IDS_ABORTSETUP2 "PÅeruÅ¡it instalaci?" END /* EOF */ Modified: trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/cs… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc [iso-8859-1] Sun Nov 13 16:27:03 2011 @@ -2,24 +2,24 @@ IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Instalace ovladaÃ¨e obrazovky" +CAPTION "Instalace ovladaÄe obrazovky" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "ReactOS zjistil, Å¾e bÃ¬Å¾Ã pod VMware(r).", -1, 117, 8, 140, 24 - LTEXT "Pokud chcete nainstalovat VMware(r) SVGA ovladaÃ¨ klepnÃ¬te na 'DalÅ¡Ã', pokud ovladaÃ¨ instalovat nechcete, klepnÃ¬te na 'Storno'.", -1, 117, 140, 140, 24 + LTEXT "ReactOS zjistil, Å¾e je spuÅ¡tÄn pod VMware(r).", -1, 117, 8, 140, 24 + LTEXT "Pokud chcete nainstalovat VMware(r) SVGA ovladaÄ kliknÄte na 'DalÅ¡Ã', pokud ovladaÄ instalovat nechcete, klepnÄte na 'Storno'.", -1, 117, 140, 140, 24 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Instalace ovladaÃ¨e obrazovky" +CAPTION "Instalace ovladaÄe obrazovky" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "StandardnÃ instalace ReactOS neobsahuje VMware(r) SVGA ovladaÃ¨.\n\nProto musÃte v oknÃ¬ VMware(r) workstation vybrat nabÃdku 'VM' a zvolit poloÅ¾ku 'Install VMware tools...'\n\n\nKlepnÃ¬te na 'DalÅ¡Ã' pro pokraÃ¨ovÃ¡nÃ nebo 'Storno' pro pÃ¸eskoÃ¨enÃ instalace SVGA ovladaÃ¨e.",-1,25,25,225,85 + LTEXT "StandardnÃ instalace ReactOS neobsahuje VMware(r) SVGA ovladaÄ.\n\nProto musÃte v oknÄ VMware(r) workstation vybrat nabÃdku 'VM' a zvolit poloÅ¾ku 'Install VMware tools...'\n\n\nKlepnÄte na 'DalÅ¡Ã' pro pokraÄovÃ¡nÃ nebo 'Storno' pro pÅeskoÄenÃ instalace SVGA ovladaÄe.",-1,25,25,225,85 END IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Instalace ovladaÃ¨e obrazovky" +CAPTION "Instalace ovladaÄe obrazovky" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "{STATUS}",IDC_INSTALLINGSTATUS,25,68,225,8 @@ -28,10 +28,10 @@ IDD_CONFIG DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Instalace ovladaÃ¨e obrazovky" +CAPTION "Instalace ovladaÄe obrazovky" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "OvladaÃ¨ obrazovky VMware(r) SVGA byl ÃºspÃ¬Å¡nÃ¬ nainstalovÃ¡n. NynÃ, prosÃm, vyberte preferovanÃ© rozliÅ¡enÃ obrazovky:",-1,25,5,225,20 + LTEXT "OvladaÄ obrazovky VMware(r) SVGA byl ÃºspÄÅ¡nÄ nainstalovÃ¡n. NynÃ, prosÃm, vyberte preferovanÃ© rozliÅ¡enÃ obrazovky:",-1,25,5,225,20 PUSHBUTTON "640x480", 1120, 25, 30, 65, 15, BS_AUTORADIOBUTTON PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON @@ -49,59 +49,59 @@ IDD_INSTALLATION_FAILED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Instalace ovladaÃ¨e obrazovky" +CAPTION "Instalace ovladaÄe obrazovky" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Nelze nainstalovat VMware(r) SVGA ovladaÃ¨.\n\n\nKlepnÃ¬te na 'DokonÃ¨it' pro pokraÃ¨ovÃ¡nÃ v instalaÃ¨nÃm procesu.",-1,25,25,225,85 + LTEXT "Nelze nainstalovat VMware(r) SVGA ovladaÄ.\n\n\nKlepnÄte na 'DokonÄit' pro pokraÄovÃ¡nÃ v instalaÄnÃm procesu.",-1,25,25,225,85 END IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Instalace ovladaÃ¨e obrazovky" +CAPTION "Instalace ovladaÄe obrazovky" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "OvladaÃ¨ VMware(r) SVGA je jiÅ¾ nainstalovÃ¡n.\n\nNynÃ, prosÃm, zvolte, co chete provÃ©st:",-1,25,5,225,30 + LTEXT "OvladaÄ VMware(r) SVGA je jiÅ¾ nainstalovÃ¡n.\n\nNynÃ, prosÃm, zvolte, co chete provÃ©st:",-1,25,5,225,30 PUSHBUTTON "Upravit nastavenÃ obrazovky", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON - PUSHBUTTON "PouÅ¾Ãt jinÃ½ grafickÃ½ ovladaÃ¨", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON - PUSHBUTTON "Odebrat ovladaÃ¨ VMware(r) SVGA", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON - LTEXT "KlepnÃ¬te na 'DalÅ¡Ã' pro pokraÃ¨ovÃ¡nÃ nebo na 'Storno' pro ukonÃ¨enÃ prÃ¹vodce.", -1, 25, 93, 225, 19 + PUSHBUTTON "PouÅ¾Ãt jinÃ½ grafickÃ½ ovladaÄ", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Odebrat ovladaÄ VMware(r) SVGA", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON + LTEXT "KlepnÄte na 'DalÅ¡Ã' pro pokraÄovÃ¡nÃ nebo na 'Storno' pro ukonÄenÃ prÅ¯vodce.", -1, 25, 93, 225, 19 END IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Instalace ovladaÃ¨e obrazovky" +CAPTION "Instalace ovladaÄe obrazovky" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Vyberte, prosÃm, grafickÃ½ ovladaÃ¨, kterÃ½ chcete pouÅ¾Ãt:",-1,25,25,225,15 - PUSHBUTTON "ReactOS VGA ovladaÃ¨", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON - PUSHBUTTON "ReactOS VBE ovladaÃ¨ (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON - LTEXT "KlepnÃ¬te na 'DokonÃ¨it' pro dokonÃ¨enÃ operace nebo na 'Storno' pro ukonÃ¨enÃ nastavenÃ beze zmÃ¬n.", -1, 25, 93, 225, 20 + LTEXT "Vyberte, prosÃm, grafickÃ½ ovladaÄ, kterÃ½ chcete pouÅ¾Ãt:",-1,25,25,225,15 + PUSHBUTTON "ReactOS VGA ovladaÄ", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "ReactOS VBE ovladaÄ (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON + LTEXT "KlepnÄte na 'DokonÄit' pro dokonÄenÃ operace nebo na 'Storno' pro ukonÄenÃ nastavenÃ beze zmÄn.", -1, 25, 93, 225, 20 END IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Instalace ovladaÃ¨e obrazovky" +CAPTION "Instalace ovladaÄe obrazovky" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "NynÃ bude odebrÃ¡n ovladaÃ¨ VMware(r) SVGA!!!\n\n\nKlepnÃ¬te na 'DokonÃ¨it' pro odebrÃ¡nÃ ovladaÃ¨e nebo na 'Storno' pro ponechÃ¡nÃ.",-1,25,25,225,85 + LTEXT "NynÃ bude odebrÃ¡n ovladaÄ VMware(r) SVGA!!!\n\n\nKlepnÄte na 'DokonÄit' pro odebrÃ¡nÃ ovladaÄe nebo na 'Storno' pro ponechÃ¡nÃ.",-1,25,25,225,85 END STRINGTABLE BEGIN - IDS_WIZARD_NAME "DetekovÃ¡no prostÃ¸edÃ VMware(r)" - IDS_FAILEDTOLOCATEDRIVERS "ReactOS nemÃ¹Å¾e nalÃ©zt poÅ¾adovanÃ© soubory.\nZkontrolujte, prosÃm, zda je VMware(r) tools CD-ROM sprÃ¡vnÃ¬ vloÅ¾eno." - IDS_FAILEDTOCOPYFILES "Nelze zkopÃrovat poÅ¾adovanÃ© soubory.\nZkontrolujte, prosÃm, zda je VMware(r) tools CD-ROM sprÃ¡vnÃ¬ vloÅ¾eno.\n" - IDS_FAILEDTOACTIVATEDRIVER "NepodaÃ¸ilo se zaktivovat VMware(r) SVGA ovladaÃ¨!" - IDS_FAILEDTOSELVGADRIVER "NepodaÃ¸ilo se zaktivovat ReactOS VGA ovladaÃ¨!" - IDS_FAILEDTOSELVBEDRIVER "NepodaÃ¸ilo se zaktivovat ReactOS VBE ovladaÃ¨!" - IDS_UNINSTNOTICE "PodpÃ¹rnÃ© soubory VMware(r) SVGA ovladaÃ¨e nebyly odstranÃ¬ny.\nSmaÅ¾te je, prosÃm, po restarovÃ¡nÃ systÃ©mu." - IDS_FAILEDTOADDREGENTRIES "NepodaÃ¸ilo se vytvoÃ¸it v registru zÃ¡pis pro VMware(r) SVGA ovladaÃ¨!" + IDS_WIZARD_NAME "DetekovÃ¡no prostÅedÃ VMware(r)" + IDS_FAILEDTOLOCATEDRIVERS "ReactOS nemÅ¯Å¾e nalÃ©zt poÅ¾adovanÃ© soubory.\nZkontrolujte, prosÃm, zda je VMware(r) tools CD-ROM sprÃ¡vnÄ vloÅ¾eno." + IDS_FAILEDTOCOPYFILES "Nelze zkopÃrovat poÅ¾adovanÃ© soubory.\nZkontrolujte, prosÃm, zda je VMware(r) tools CD-ROM sprÃ¡vnÄ vloÅ¾eno.\n" + IDS_FAILEDTOACTIVATEDRIVER "NepodaÅilo se zaktivovat VMware(r) SVGA ovladaÄ!" + IDS_FAILEDTOSELVGADRIVER "NepodaÅilo se zaktivovat ReactOS VGA ovladaÄ!" + IDS_FAILEDTOSELVBEDRIVER "NepodaÅilo se zaktivovat ReactOS VBE ovladaÄ!" + IDS_UNINSTNOTICE "PodpÅ¯rnÃ© soubory VMware(r) SVGA ovladaÄe nebyly odstranÄny.\nSmaÅ¾te je, prosÃm, po restarovÃ¡nÃ systÃ©mu." + IDS_FAILEDTOADDREGENTRIES "NepodaÅilo se vytvoÅit v registru zÃ¡pis pro VMware(r) SVGA ovladaÄ!" END STRINGTABLE BEGIN 10001 "NejniÅ¾Å¡Ã (8BPP)" - 10002 "StÃ¸ednÃ (16BPP)" + 10002 "StÅednÃ (16BPP)" 10003 "NejvyÅ¡Å¡Ã (32BPP)" END @@ -109,23 +109,23 @@ BEGIN IDS_SEARCHINGFORCDROM "HledÃ¡ se VMware(r) Tools CD-ROM..." IDS_COPYINGFILES "kopÃrujÃ se soubory..." - IDS_ENABLINGDRIVER "ZavÃ¡dÃ se ovladaÃ¨ VMware(r) SVGA..." + IDS_ENABLINGDRIVER "ZavÃ¡dÃ se ovladaÄ VMware(r) SVGA..." END STRINGTABLE BEGIN - IDD_INSERT_VMWARE_TOOLSTITLE "PrÃ¹vodce instalacÃ VMware (r) SVGA ovladaÃ¨e" + IDD_INSERT_VMWARE_TOOLSTITLE "PrÅ¯vodce instalacÃ VMware (r) SVGA ovladaÄe" IDD_INSERT_VMWARE_TOOLSSUBTITLE "VloÅ¾te, prosÃm, VMware(r) tools CD-ROM." - IDD_INSTALLING_VMWARE_TOOLSTITLE "PrÃ¹vodce instalacÃ VMware (r) SVGA ovladaÃ¨e" - IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "VyhledÃ¡nÃ a kopÃrovÃ¡nÃ VMware (r) SVGA ovladaÃ¨e." - IDD_CONFIGTITLE "PrÃ¹vodce instalacÃ VMware (r) SVGA ovladaÃ¨e" + IDD_INSTALLING_VMWARE_TOOLSTITLE "PrÅ¯vodce instalacÃ VMware (r) SVGA ovladaÄe" + IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "VyhledÃ¡nÃ a kopÃrovÃ¡nÃ VMware (r) SVGA ovladaÄe." + IDD_CONFIGTITLE "PrÅ¯vodce instalacÃ VMware (r) SVGA ovladaÄe" IDD_CONFIGSUBTITLE "Vyberte, prosÃm, preferovanÃ© rozliÅ¡enÃ obrazovky:" - IDD_INSTALLATION_FAILEDTITLE "PrÃ¹vodce instalacÃ VMware (r) SVGA ovladaÃ¨e" - IDD_INSTALLATION_FAILEDSUBTITLE "Instalace ovladaÃ¨e VMware (r) SVGA selhala." - IDD_CHOOSEACTIONTITLE "PrÃ¹vodce instalacÃ VMware (r) SVGA ovladaÃ¨e" + IDD_INSTALLATION_FAILEDTITLE "PrÅ¯vodce instalacÃ VMware (r) SVGA ovladaÄe" + IDD_INSTALLATION_FAILEDSUBTITLE "Instalace ovladaÄe VMware (r) SVGA selhala." + IDD_CHOOSEACTIONTITLE "PrÅ¯vodce instalacÃ VMware (r) SVGA ovladaÄe" IDD_CHOOSEACTIONSUBTITLE "Zvolte, prosÃm, co chete provÃ©st." - IDD_SELECTDRIVERTITLE "PrÃ¹vodce instalacÃ VMware (r) SVGA ovladaÃ¨e" - IDD_SELECTDRIVERSUBTITLE "Vyberte ovladaÃ¨." - IDD_DOUNINSTALLTITLE "PrÃ¹vodce instalacÃ VMware (r) SVGA ovladaÃ¨e" - IDD_DOUNINSTALLSUBTITLE "OdstranÃ¬nÃ ovladaÃ¨e." + IDD_SELECTDRIVERTITLE "PrÅ¯vodce instalacÃ VMware (r) SVGA ovladaÄe" + IDD_SELECTDRIVERSUBTITLE "Vyberte ovladaÄ." + IDD_DOUNINSTALLTITLE "PrÅ¯vodce instalacÃ VMware (r) SVGA ovladaÄe" + IDD_DOUNINSTALLSUBTITLE "OdstranÄnÃ ovladaÄe." END Modified: trunk/reactos/base/setup/welcome/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/cs… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/cs-CZ.rc [iso-8859-1] Sun Nov 13 16:27:03 2011 @@ -7,7 +7,7 @@ BEGIN IDS_APPTITLE "ReactOS - VÃtejte" IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "VÃtejte v operaÃ¨nÃm systÃ©mu ReactOS.\n\nKlepnÃ¬te na tlaÃ¨Ãtko v levÃ©m sloupci." + IDS_DEFAULTTOPICDESC "VÃtejte v operaÄnÃm systÃ©mu ReactOS.\n\nKlepnÄte na tlaÄÃtko v levÃ©m sloupci." // IDS_CHECKTEXT "Zobrazit dialog znovu" // IDS_CLOSETEXT "Konec" END @@ -45,9 +45,9 @@ /* Topic descriptions */ STRINGTABLE DISCARDABLE BEGIN - IDS_TOPICDESC0 "Nainstaluje ReactOS na VÃ¡Å¡ poÃ¨ÃtaÃ¨ nebo zaktualizuje existujÃcÃ systÃ©m." + IDS_TOPICDESC0 "Nainstaluje ReactOS na VÃ¡Å¡ poÄÃtaÄ nebo zaktualizuje existujÃcÃ systÃ©m." IDS_TOPICDESC1 "ProhlÃÅ¾et toto CD." - IDS_TOPICDESC2 "KlepnÃ¬te pro ukonÃ¨enÃ tohoto programu." + IDS_TOPICDESC2 "KlepnÄte pro ukonÄenÃ tohoto programu." // IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." // IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." // IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." Modified: trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc [iso-8859-1] Sun Nov 13 16:27:03 2011 @@ -39,8 +39,8 @@ BEGIN MENUITEM "&OvlÃ¡dacÃ panely", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED MENUITEM "", -1, MFT_SEPARATOR - MENUITEM "&ZabezpeÃ¨enÃ...", IDM_SECURITY, MFT_STRING, MFS_ENABLED - MENUITEM "&SÃÂovÃ¡ pÃ¸ipojenÃ", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED + MENUITEM "&ZabezpeÄenÃ...", IDM_SECURITY, MFT_STRING, MFS_ENABLED + MENUITEM "&SÃÅ¥ovÃ¡ pÅipojenÃ", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&TiskÃ¡rny a faxy", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "&HlavnÃ panel a nabÃdka Start", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END @@ -48,13 +48,13 @@ BEGIN MENUITEM "", -1, MFT_SEPARATOR END - MENUITEM "NÃ¡povÃ¬d&a a odbornÃ¡ pomoc", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED + MENUITEM "NÃ¡povÄd&a a odbornÃ¡ pomoc", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Spustit...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED MENUITEM "S&ynchronizovat", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED MENUITEM "Odh&lÃ¡sit %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED MENUITEM "Odpoj&it...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED - MENUITEM "Odpo&jit poÃ¨ÃtaÃ¨ z doku", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED + MENUITEM "Odpo&jit poÄÃtaÄ z doku", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED MENUITEM "&Vypnout...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED END END @@ -70,8 +70,8 @@ AUTOCHECKBOX "Uzamknout &hlavnÃ panel", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "&Automaticky sktÃ½vat hlavnÃ panel", IDC_TASKBARPROP_HIDE, 13,58,200,10 AUTOCHECKBOX "&Zobrazit hlavnÃ panel nad ostatnÃmi okny", IDC_TASKBARPROP_ONTOP, 13,71,200,10 - AUTOCHECKBOX "&Seskupovat podobnÃ¡ tlaÃ¨Ãtka hlavnÃho panelu", IDC_TASKBARPROP_GROUP, 13,84,200,10 - AUTOCHECKBOX "Zobrazit &panel SnadnÃ© spuÅ¡tÃ¬nÃ", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 + AUTOCHECKBOX "&Seskupovat podobnÃ¡ tlaÄÃtka hlavnÃho panelu", IDC_TASKBARPROP_GROUP, 13,84,200,10 + AUTOCHECKBOX "Zobrazit &panel SnadnÃ© spuÅ¡tÄnÃ", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "Zobrazit &nÃ¡hledy oken", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 END @@ -81,14 +81,14 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN AUTORADIOBUTTON "Start &menu", IDC_TASKBARPROP_STARTMENU, 7,7,105,10 - LTEXT "Tento styl menu umoÅ¾Ã²uje snadnÃ½ pÃ¸Ãstup ke sloÅ¾kÃ¡m, oblÃbenÃ½m programÃ¹m a vyhledÃ¡vÃ¡nÃ.", IDC_STATIC, 20,17,150,24, WS_DISABLED + LTEXT "Tento styl menu umoÅ¾Åuje snadnÃ½ pÅÃstup ke sloÅ¾kÃ¡m, oblÃbenÃ½m programÅ¯m a vyhledÃ¡vÃ¡nÃ.", IDC_STATIC, 20,17,150,24, WS_DISABLED PUSHBUTTON "&Upravit...", IDC_TASKBARPROP_STARTMENUCUST, 192,4,53,14, WS_DISABLED AUTORADIOBUTTON "&KlasickÃ© Start menu", IDC_TASKBARPROP_STARTMENUCLASSIC, 7,47,105,10, WS_DISABLED - LTEXT "Tento styl menu umoÅ¾Ã²uje pouÅ¾Ãvat klasickÃ½ vzhled a funkce",-1,20,57,150,24, WS_DISABLED + LTEXT "Tento styl menu umoÅ¾Åuje pouÅ¾Ãvat klasickÃ½ vzhled a funkce",-1,20,57,150,24, WS_DISABLED PUSHBUTTON "Up&ravit...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192,44,53,14, WS_DISABLED GROUPBOX "SoukromÃ",IDC_STATIC, 7,100,238,42 - AUTOCHECKBOX "UloÅ¾it a zobrazit seznam naposledy otevÃ¸enÃ½ch &souborÃ¹", IDC_TASKBARPROP_RECENTFILES, 14,114,224,10, WS_DISABLED - AUTOCHECKBOX "UloÅ¾it a zobrazit seznam naposledy spuÅ¡tÃ¬nÃ½ch &programÃ¹",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED + AUTOCHECKBOX "UloÅ¾it a zobrazit seznam naposledy otevÅenÃ½ch &souborÅ¯", IDC_TASKBARPROP_RECENTFILES, 14,114,224,10, WS_DISABLED + AUTOCHECKBOX "UloÅ¾it a zobrazit seznam naposledy spuÅ¡tÄnÃ½ch &programÅ¯",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED END IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218 @@ -98,24 +98,24 @@ BEGIN CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED GROUPBOX "Ikony", IDC_STATIC, 6,33,240,58, WS_DISABLED - LTEXT "PÃ¸ehledost oznamovacÃ oblasti lze zachovat pomocÃ skrytÃ nepouÅ¾ÃvanÃ½ch ikon.", IDC_STATIC, 13,48,223,16, WS_DISABLED + LTEXT "PÅehledost oznamovacÃ oblasti lze zachovat pomocÃ skrytÃ nepouÅ¾ÃvanÃ½ch ikon.", IDC_STATIC, 13,48,223,16, WS_DISABLED AUTOCHECKBOX "Sk&rÃ½t neaktivnÃ ikony", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED PUSHBUTTON "&Upravit...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED GROUPBOX "SystÃ©movÃ© ikony", IDC_STATIC, 6,97,240,84, WS_DISABLED LTEXT "Vyberte systÃ©movÃ© ikony, kterÃ© se majÃ vÅ¾dy zobrazit.", IDC_STATIC, 13,112,223,16, WS_DISABLED AUTOCHECKBOX "&Hodiny", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED AUTOCHECKBOX "H&lasitost", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED - AUTOCHECKBOX "S&ÃÂ", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED + AUTOCHECKBOX "S&ÃÅ¥", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED AUTOCHECKBOX "&NapÃ¡jenÃ", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED END IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Panely nÃ¡strojÃ¹" +CAPTION "Panely nÃ¡strojÅ¯" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "Vyberte panely nÃ¡strojÃ¹, kterÃ© majÃ bÃ½t pÃ¸ÃdÃ¡ny na hlavnÃ panel.", IDC_STATIC, 7,7,223,12, WS_DISABLED + LTEXT "Vyberte panely nÃ¡strojÅ¯, kterÃ© majÃ bÃ½t pÅÃdÃ¡ny na hlavnÃ panel.", IDC_STATIC, 7,7,223,12, WS_DISABLED CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END @@ -124,7 +124,7 @@ BEGIN IDS_START "Start" IDS_PROPERTIES "Vl&astnosti" - IDS_OPEN_ALL_USERS "Ote&vÃ¸Ãt sloÅ¾ku All Users" + IDS_OPEN_ALL_USERS "Ote&vÅÃt sloÅ¾ku All Users" IDS_EXPLORE_ALL_USERS "Pro&chÃ¡zet sloÅ¾ku All Users" IDS_STARTUP_ERROR "SystÃ©m nemohl spustit proces Explorer, protoÅ¾e registry jsou poÅ¡kozenÃ© nebo nedostupnÃ©." END Modified: trunk/reactos/base/system/format/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/cs… ============================================================================== --- trunk/reactos/base/system/format/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/format/lang/cs-CZ.rc [iso-8859-1] Sun Nov 13 16:27:03 2011 @@ -7,21 +7,21 @@ STRINGTABLE DISCARDABLE BEGIN STRING_HELP, "PouÅ¾itÃ: %s jednotka: [-FS:filesystem] [-V:jmenovka] [-Q] [-A:velikost] [-C]\n\n\ - [jednotka:] UrÃ¨Ã jednotku, kterÃ¡ bude zformÃ¡tovÃ¡na.\n\ - -FS:typfs UrÃ¨Ã typ souborovÃ©ho systÃ©mu (%s).\n\ - -V:jmenovka UrÃ¨Ã jmenovku svazku.\n\ + [jednotka:] UrÄÃ jednotku, kterÃ¡ bude zformÃ¡tovÃ¡na.\n\ + -FS:typfs UrÄÃ typ souborovÃ©ho systÃ©mu (%s).\n\ + -V:jmenovka UrÄÃ jmenovku svazku.\n\ -Q Provede rychlÃ© formÃ¡tovÃ¡nÃ.\n\ - -A:velikost PÃ¸epÃÅ¡e implicitnÃ velikost alokaÃ¨nÃ jednotky. Pro bÃ¬Å¾nÃ©\n\ - pouÅ¾itÃ silnÃ¬ doporuÃ¨ujeme implicitnÃ hodnoty.\n\ + -A:velikost PÅepÃÅ¡e implicitnÃ velikost alokaÄnÃ jednotky. Pro bÄÅ¾nÃ©\n\ + pouÅ¾itÃ silnÄ doporuÄujeme implicitnÃ hodnoty.\n\ NTFS podporuje 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\ FAT podporuje 8192, 16K, 32K, 64K, 128K, 256K.\n\ - Pro alokaÃ¨nÃ jednotky pÃ¸es 4096 nenÃ podporovÃ¡na NTFS komprese.\n\ - -C Soubory vytvoÃ¸enÃ© na novÃ©m svazku budou implicitnÃ¬\n\ + Pro alokaÄnÃ jednotky pÅes 4096 nenÃ podporovÃ¡na NTFS komprese.\n\ + -C Soubory vytvoÅenÃ© na novÃ©m svazku budou implicitnÄ\n\ komprimovÃ¡ny.\n\n" -STRING_COMPLETE "%lu procent dokonÃ¨eno.\r" +STRING_COMPLETE "%lu procent dokonÄeno.\r" -STRING_FORMAT_FAIL "FormatEx nedokÃ¡zal ÃºspÃ¬Å¡nÃ¬ skonÃ¨it.\n\n" +STRING_FORMAT_FAIL "FormatEx nedokÃ¡zal ÃºspÄÅ¡nÄ skonÄit.\n\n" STRING_NO_SUPPORT "Operace nenÃ podporovÃ¡na" @@ -33,7 +33,7 @@ STRING_ERROR_DRIVE_TYPE "Nelze zjistit typ disku" -STRING_INSERT_DISK "VloÅ¾te novou disketu do jednotky %C:\na potÃ© stisknÃ¬te klÃ¡vesu ENTER..." +STRING_INSERT_DISK "VloÅ¾te novou disketu do jednotky %C:\na potÃ© stisknÄte klÃ¡vesu ENTER..." STRING_NO_VOLUME "Nelze zjistit svazek" @@ -41,30 +41,30 @@ STRING_FILESYSTEM "SouborovÃ½ systÃ©m je typu %s.\n" -STRING_LABEL_NAME_EDIT "VloÅ¾te nynÃ¬jÅ¡Ã jmenovku svazku pro jednotku %C: " +STRING_LABEL_NAME_EDIT "VloÅ¾te nynÄjÅ¡Ã jmenovku svazku pro jednotku %C: " STRING_ERROR_LABEL "Pro tuto jednotku byla zadÃ¡na nesprÃ¡vnÃ¡ jmenovka svazku.\n" STRING_YN_FORMAT "\nPOZOR, VÅ ECHNA DATA NA PEVNÃM DISKU\n\ -NA JEDNOTCE %C: BUDOU ZTRACENA!\nPokroÃ¨it k formÃ¡tovÃ¡nÃ (A/N)? " +NA JEDNOTCE %C: BUDOU ZTRACENA!\nPokroÄit k formÃ¡tovÃ¡nÃ (A/N)? " STRING_YES_NO_FAQ "AN" -STRING_VERIFYING "OvÃ¬Ã¸uji" +STRING_VERIFYING "OvÄÅuji" STRING_FAST_FMT "RychloformÃ¡tovÃ¡nÃ" -STRING_CREATE_FSYS "VytvÃ¡Ã¸Ãm strukturu souborovÃ©ho systÃ©mu.\n" +STRING_CREATE_FSYS "VytvÃ¡ÅÃm strukturu souborovÃ©ho systÃ©mu.\n" -STRING_FMT_COMPLETE "FormÃ¡tovÃ¡nÃ dokonÃ¨eno.\n" +STRING_FMT_COMPLETE "FormÃ¡tovÃ¡nÃ dokonÄeno.\n" STRING_VOL_COMPRESS "Svazek nepodporuje kompresi.\n" -STRING_ENTER_LABEL "Jmenovka svazku (11 znakÃ¹, ENTER pro Å¾Ã¡dnÃ½)? " +STRING_ENTER_LABEL "Jmenovka svazku (11 znakÅ¯, ENTER pro Å¾Ã¡dnÃ½)? " STRING_NO_LABEL "Nelze nastavit jmenovku svazku" -STRING_FREE_SPACE "\nCelkovÃ© mÃsto na disku: %I64d bajtÃ¹.\nDostupnÃ© mÃsto: %I64d bajtÃ¹.\n" +STRING_FREE_SPACE "\nCelkovÃ© mÃsto na disku: %I64d bajtÅ¯.\nDostupnÃ© mÃsto: %I64d bajtÅ¯.\n" -STRING_SERIAL_NUMBER "\nSÃ©riovÃ© Ã¨Ãslo svazku je %04X-%04X\n" +STRING_SERIAL_NUMBER "\nSÃ©riovÃ© ÄÃslo svazku je %04X-%04X\n" END Modified: trunk/reactos/base/system/regsvr32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… ============================================================================== --- trunk/reactos/base/system/regsvr32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/regsvr32/lang/cs-CZ.rc [iso-8859-1] Sun Nov 13 16:27:03 2011 @@ -7,25 +7,25 @@ STRINGTABLE DISCARDABLE BEGIN -IDS_UsageMessage, "%s\n\nPouÅ¾itÃ: regsvr32 [/u] [/s] [/c] [/n] [/i[:pÃ¸Ãkaz]] nÃ¡zevdll\n\ +IDS_UsageMessage, "%s\n\nPouÅ¾itÃ: regsvr32 [/u] [/s] [/c] [/n] [/i[:pÅÃkaz]] nÃ¡zevdll\n\ /u - Odregistrovat server\n\ /s - TichÃ½ reÅ¾im; nezobrazuje Å¾Ã¡dnÃ© zprÃ¡vy\n\ /c - VÃ½stup na konzoli\n\ -/i - Zavolat DllInstall a pÃ¸edat volitelnÃ½ [pÃ¸Ãkaz]; pÃ¸i pouÅ¾itÃ s /u volÃ¡ odinstalaci dll\n\ +/i - Zavolat DllInstall a pÅedat volitelnÃ½ [pÅÃkaz]; pÅi pouÅ¾itÃ s /u volÃ¡ odinstalaci dll\n\ /n - Nevolat DllRegisterServer; tato volba musÃ bÃ½t pouÅ¾ita s /i" IDS_NoDllSpecified, "Nebyl zadÃ¡n nÃ¡zev DLL." -IDS_InvalidFlag, "NerozpoznanÃ½ pÃ¸epÃnaÃ¨: %s" +IDS_InvalidFlag, "NerozpoznanÃ½ pÅepÃnaÄ: %s" -IDS_SwitchN_NoI, "NerozpoznanÃ½ pÃ¸epÃnaÃ¨: /n musÃ bÃ½t pouÅ¾ito s pÃ¸epÃnaÃ¨em /i" +IDS_SwitchN_NoI, "NerozpoznanÃ½ pÅepÃnaÄ: /n musÃ bÃ½t pouÅ¾ito s pÅepÃnaÄem /i" IDS_DllNotLoaded, "LoadLibrary('%s') selhalo.\nGetLastError vracÃ 0x%08x." -IDS_MissingEntry, "%s bylo naÃ¨teno, ale vstupnÃ bod %s nebyl nalezen.\n\n\ -%s nemusÃ bÃ½t vyexportovÃ¡no, nebo v pamÃ¬ti mÃ¹Å¾e bÃ½t poÅ¡kozenÃ¡ verze %s. ZvaÅ¾te pouÅ¾itÃ PView k nalezenÃ a odstranÃ¬nÃ." +IDS_MissingEntry, "%s bylo naÄteno, ale vstupnÃ bod %s nebyl nalezen.\n\n\ +%s nemusÃ bÃ½t vyexportovÃ¡no, nebo v pamÄti mÅ¯Å¾e bÃ½t poÅ¡kozenÃ¡ verze %s. ZvaÅ¾te pouÅ¾itÃ PView k nalezenÃ a odstranÄnÃ." IDS_FailureMessage, "%s v %s selhalo.\nNÃ¡vratovÃ½ kÃ³d je: 0x%08x" -IDS_SuccessMessage, "%s v %s uspÃ¬lo." +IDS_SuccessMessage "%s v %s uspÄlo." END Modified: trunk/reactos/base/system/rundll32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/rundll32/lang/cs-CZ.rc [iso-8859-1] Sun Nov 13 16:27:03 2011 @@ -6,6 +6,6 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN - IDS_DllNotLoaded, "LoadLibrary se nepodaÃ¸ilo naÃ¨Ãst '%s'" + IDS_DllNotLoaded, "LoadLibrary se nepodaÅilo naÄÃst '%s'" IDS_MissingEntry, "ChybÃ vstupnÃ bod:%s\nV %s" END Modified: trunk/reactos/base/system/userinit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/cs-CZ.rc [iso-8859-1] Sun Nov 13 16:27:03 2011 @@ -7,6 +7,6 @@ STRINGTABLE DISCARDABLE BEGIN -STRING_USERINIT_FAIL, "Aplikace Userinit selhala pÃ¸i spouÅ¡tÃ¬nÃ shellu!\n" +STRING_USERINIT_FAIL, "Aplikace Userinit selhala pÅi spouÅ¡tÄnÃ uÅ¾ivatelskÃ©ho rozhranÃ!\n" END Modified: trunk/reactos/base/system/winlogon/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… ============================================================================== --- trunk/reactos/base/system/winlogon/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/lang/cs-CZ.rc [iso-8859-1] Sun Nov 13 16:27:03 2011 @@ -2,10 +2,10 @@ IDD_SHUTDOWNCOMPUTER DIALOGEX 45, 22, 164, 52 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "VypnutÃ poÃ¨ÃtaÃ¨e" +CAPTION "VypnutÃ poÄÃtaÄe" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "NynÃ mÃ¹Å¾ete bez obav vypnout VÃ¡Å¡ poÃ¨ÃtaÃ¨.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "NynÃ mÅ¯Å¾ete VÃ¡Å¡ poÄÃtaÄ bez obav vypnout.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 DEFPUSHBUTTON "&Restartovat", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 END @@ -15,31 +15,31 @@ CAPTION "Chyba uÅ¾ivatelskÃ©ho rozhranÃ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "DynamickÃ¡ knihovna %s selhala pÃ¸i nahrÃ¡vanÃ.", IDC_GINALOADFAILED, 39, 16, 156, 24 - LTEXT "Kontaktujte sprÃ¡vce poÃ¨ÃtaÃ¨e pro nahrazenÃ dynamickÃ¬ knihovny nebo obnovte pÃ¹vodnÃ dynamickou knihovnu.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 + LTEXT "DynamickÃ¡ knihovna %s selhala pÅi nahrÃ¡vanÃ.", IDC_GINALOADFAILED, 39, 16, 156, 24 + LTEXT "Kontaktujte sprÃ¡vce poÄÃtaÄe pro nahrazenÃ dynamickÄ knihovny nebo obnovte pÅ¯vodnÃ dynamickou knihovnu.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14 END STRINGTABLE BEGIN - IDS_PREPARENETWORKCONNECTIONS "PÃ¸Ãprava sÃÂovÃ½ch pÃ¸ipojenÃ..." - IDS_APPLYINGCOMPUTERSETTINGS "NastavenÃ poÃ¨ÃtaÃ¨e..." - IDS_RUNNINGSTARTUPSCRIPTS "SpouÅ¡tÃ¬cÃ skripty..." - IDS_RUNNINGSHUTDOWNSCRIPTS "UkonÃ¨ovacÃ skripty..." + IDS_PREPARENETWORKCONNECTIONS "PÅÃprava sÃÅ¥ovÃ½ch pÅipojenÃ..." + IDS_APPLYINGCOMPUTERSETTINGS "NastavenÃ poÄÃtaÄe..." + IDS_RUNNINGSTARTUPSCRIPTS "SpouÅ¡tÄcÃ skripty..." + IDS_RUNNINGSHUTDOWNSCRIPTS "UkonÄovacÃ skripty..." IDS_APPLYINGYOURPERSONALSETTINGS "OsobnÃ nastavenÃ..." IDS_RUNNINGLOGOFFSCRIPTS "Skripty po odhlÃ¡Å¡enÃ..." - IDS_RUNNINGLOGONSCRIPTS "Skripty po pÃ¸ihlÃ¡Å¡enÃ..." + IDS_RUNNINGLOGONSCRIPTS "Skripty po pÅihlÃ¡Å¡enÃ..." IDS_LOADINGYOURPERSONALSETTINGS "NahrÃ¡vÃ¡nÃ osobnÃho nastavenÃ..." - IDS_CLOSINGNETWORKCONNECTIONS "UkonÃ¨enÃ sÃÂovÃ½ch pÃ¸ipojenÃ..." + IDS_CLOSINGNETWORKCONNECTIONS "UkonÄenÃ sÃÅ¥ovÃ½ch pÅipojenÃ..." IDS_REACTOSISSHUTTINGDOWN "ReactOS se vypÃnÃ¡..." - IDS_PREPARETOSTANDBY "PÃ¸Ãprava k pÃ¸echodu do ÃºspornÃ©ho reÅ¾imu..." - IDS_PREPARETOHIBERNATE "PÃ¸Ãprava k pÃ¸echodu do reÅ¾imu hibernace..." + IDS_PREPARETOSTANDBY "PÅÃprava k pÅechodu do ÃºspornÃ©ho reÅ¾imu..." + IDS_PREPARETOHIBERNATE "PÅÃprava k pÅechodu do reÅ¾imu hibernace..." IDS_SAVEYOURSETTINGS "UklÃ¡dÃ¡nÃ osobnÃho nastavenÃ..." IDS_REACTOSISSTARTINGUP "ReactOS se spouÅ¡tÃ..." END STRINGTABLE BEGIN - IDS_FAILEDACTIVATEUSERSHELL "Aplikace Winlogon selhala pÃ¸i aktivaci shellu!" + IDS_FAILEDACTIVATEUSERSHELL "Aplikace Winlogon selhala pÅi aktivaci uÅ¾ivatelskÃ©ho rozhranÃ!" END

12 years, 10 months

[ekohl] 54373: [SERVICES] REnumServicesStatusExW: Fix dwServiceType and dwServiceState checks.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Nov 13 12:13:16 2011 New Revision: 54373 URL: http://svn.reactos.org/svn/reactos?rev=54373&view=rev Log: [SERVICES] REnumServicesStatusExW: Fix dwServiceType and dwServiceState checks. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Nov 13 12:13:16 2011 @@ -5304,13 +5304,16 @@ *pcbBytesNeeded = 0; *lpServicesReturned = 0; - if ((dwServiceType!=SERVICE_DRIVER) && (dwServiceType!=SERVICE_WIN32)) + if ((dwServiceType == 0) || + ((dwServiceType & ~(SERVICE_DRIVER | SERVICE_WIN32)) != 0)) { DPRINT("Not a valid Service Type!\n"); return ERROR_INVALID_PARAMETER; } - if ((dwServiceState<SERVICE_ACTIVE) || (dwServiceState>SERVICE_STATE_ALL)) + if ((dwServiceState != SERVICE_ACTIVE) && + (dwServiceState != SERVICE_INACTIVE) && + (dwServiceState != SERVICE_STATE_ALL)) { DPRINT("Not a valid Service State!\n"); return ERROR_INVALID_PARAMETER;

12 years, 10 months

[cgutman] 54372: [NDIS] - Fix a critical bug in NdisMGetDmaAlignment which was causing every NIC driver calling this function to crash because we thought we were passed an NDIS_DMA_BLOCK handle whe...

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Nov 13 06:02:08 2011 New Revision: 54372 URL: http://svn.reactos.org/svn/reactos?rev=54372&view=rev Log: [NDIS] - Fix a critical bug in NdisMGetDmaAlignment which was causing every NIC driver calling this function to crash because we thought we were passed an NDIS_DMA_BLOCK handle when in fact we receive an NDIS_MINIPORT_BLOCK handle - Fixes RTL8169 and 3Com NICs (and probably several more) [bug 6651 and bug 4330] Modified: trunk/reactos/drivers/network/ndis/ndis/io.c Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Sun Nov 13 06:02:08 2011 @@ -831,6 +831,7 @@ NdisMReadDmaCounter( IN NDIS_HANDLE MiniportDmaHandle) { + /* NOTE: Unlike NdisMGetDmaAlignment() below, this is a handle to the DMA block */ PNDIS_DMA_BLOCK DmaBlock = MiniportDmaHandle; PDMA_ADAPTER AdapterObject = (PDMA_ADAPTER)DmaBlock->SystemAdapterObject; @@ -846,10 +847,11 @@ ULONG EXPORT NdisMGetDmaAlignment( - IN NDIS_HANDLE MiniportDmaHandle) -{ - PNDIS_DMA_BLOCK DmaBlock = MiniportDmaHandle; - PDMA_ADAPTER AdapterObject = (PDMA_ADAPTER)DmaBlock->SystemAdapterObject; + IN NDIS_HANDLE MiniportAdapterHandle) +{ + /* NOTE: Unlike NdisMReadDmaCounter() above, this is a handle to the NDIS miniport block */ + PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; + PDMA_ADAPTER AdapterObject = (PDMA_ADAPTER)Adapter->NdisMiniportBlock.SystemAdapterObject; NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));

12 years, 10 months

[cgutman] 54371: [HAL] - Fix DMA on the EISA bus - Fix a critical calculation error in map register size resulting in the map register allocation worker not allocating enough map registers for a dy...

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Nov 13 05:49:33 2011 New Revision: 54371 URL: http://svn.reactos.org/svn/reactos?rev=54371&view=rev Log: [HAL] - Fix DMA on the EISA bus - Fix a critical calculation error in map register size resulting in the map register allocation worker not allocating enough map registers for a dynamic resize Modified: trunk/reactos/hal/halx86/generic/dma.c Modified: trunk/reactos/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] Sun Nov 13 05:49:33 2011 @@ -614,9 +614,12 @@ * Also note that we check for channel number since there are only 8 DMA * channels on ISA, so any request above this requires new adapter. */ - if ((DeviceDescription->InterfaceType == Isa) || !(DeviceDescription->Master)) - { - if ((DeviceDescription->InterfaceType == Isa) && (DeviceDescription->DmaChannel >= 8)) + if (((DeviceDescription->InterfaceType == Eisa) || + (DeviceDescription->InterfaceType == Isa)) || !(DeviceDescription->Master)) + { + if (((DeviceDescription->InterfaceType == Isa) || + (DeviceDescription->InterfaceType == Eisa)) && + (DeviceDescription->DmaChannel >= 8)) { EisaAdapter = FALSE; } @@ -1208,7 +1211,7 @@ */ KeWaitForSingleObject(&HalpDmaLock, Executive, KernelMode, FALSE, NULL); Succeeded = HalpGrowMapBuffers(WorkItem->AdapterObject->MasterAdapter, - WorkItem->NumberOfMapRegisters); + WorkItem->NumberOfMapRegisters << PAGE_SHIFT); KeSetEvent(&HalpDmaLock, 0, 0); if (Succeeded)

12 years, 10 months

[ekohl] 54370: [SERVICES] RControlService: Initialize the callers service status information.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Nov 13 00:13:00 2011 New Revision: 54370 URL: http://svn.reactos.org/svn/reactos?rev=54370&view=rev Log: [SERVICES] RControlService: Initialize the callers service status information. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Nov 13 00:13:00 2011 @@ -1095,7 +1095,6 @@ return ERROR_INVALID_HANDLE; } - /* Check the service entry point */ lpService = hSvc->ServiceEntry; if (lpService == NULL) @@ -1131,6 +1130,11 @@ if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, DesiredAccess)) return ERROR_ACCESS_DENIED; + + /* Return the current service status information */ + RtlCopyMemory(lpServiceStatus, + &lpService->Status, + sizeof(SERVICE_STATUS)); if (dwControl == SERVICE_CONTROL_STOP) {

12 years, 10 months

[ekohl] 54369: [SERVICES] RControlService returns ERROR_SERVICE_NOT_ACTIVE if the service has not been started.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Nov 12 21:16:20 2011 New Revision: 54369 URL: http://svn.reactos.org/svn/reactos?rev=54369&view=rev Log: [SERVICES] RControlService returns ERROR_SERVICE_NOT_ACTIVE if the service has not been started. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sat Nov 12 21:16:20 2011 @@ -646,6 +646,7 @@ return ERROR_INVALID_PARAMETER; } + DWORD ScmCanonDriverImagePath(DWORD dwStartType, const wchar_t *lpServiceName, @@ -1178,6 +1179,10 @@ { dwControlsAccepted = lpService->Status.dwControlsAccepted; dwCurrentState = lpService->Status.dwCurrentState; + + /* Return ERROR_SERVICE_NOT_ACTIVE if the service has not been started */ + if (lpService->lpImage == NULL || dwCurrentState == SERVICE_STOPPED) + return ERROR_SERVICE_NOT_ACTIVE; /* Check the current state before sending a control request */ switch (dwCurrentState) @@ -2064,9 +2069,10 @@ /* Unlock the service database */ ScmUnlockDatabase(); - /* check if it is marked for deletion */ + /* Check if it is marked for deletion */ if (lpService->bDeleted) return ERROR_SERVICE_MARKED_FOR_DELETE; + /* Return Error exist */ return ERROR_SERVICE_EXISTS; }

12 years, 10 months

[pschweitzer] 54368: [USETUP] Added a half checkpoint to prevent testbot to wrongly assume ReactOS has crashed during setup

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Nov 12 20:20:41 2011 New Revision: 54368 URL: http://svn.reactos.org/svn/reactos?rev=54368&view=rev Log: [USETUP] Added a half checkpoint to prevent testbot to wrongly assume ReactOS has crashed during setup Modified: trunk/reactos/base/setup/usetup/progress.c Modified: trunk/reactos/base/setup/usetup/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/progress… ============================================================================== --- trunk/reactos/base/setup/usetup/progress.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/progress.c [iso-8859-1] Sat Nov 12 20:20:41 2011 @@ -317,6 +317,14 @@ { Bar->Percent = NewPercent; + /* DO NOT REMOVE THOSE LINES + * This might be needed by sysreg + */ + if (NewPercent == 50) + { + DPRINT1("CHECKPOINT:HALF_COPIED\n"); + } + sprintf(TextBuffer, "%-3lu%%", Bar->Percent); coPos.X = Bar->Left + (Bar->Width - 2) / 2;

12 years, 10 months

[jgardou] 54367: (FORMATTING) -Grrr, you stupid software

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Nov 12 19:36:56 2011 New Revision: 54367 URL: http://svn.reactos.org/svn/reactos?rev=54367&view=rev Log: (FORMATTING) -Grrr, you stupid software Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Sat Nov 12 19:36:56 2011 @@ -62,7 +62,7 @@ PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); DPRINT("MmPageOutVirtualMemory(Address 0x%.8X) PID %d\n", - Address, Process->UniqueProcessId); + Address, Process->UniqueProcessId); /* * Check for paging out from a deleted virtual memory area. @@ -79,7 +79,7 @@ * Disable the virtual mapping. */ MmDisableVirtualMapping(Process, Address, - &WasDirty, &Page); + &WasDirty, &Page); if (Page == 0) { @@ -132,7 +132,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("MM: Failed to write to swap page (Status was 0x%.8X)\n", - Status); + Status); MmEnableVirtualMapping(Process, Address); PageOp->Status = STATUS_UNSUCCESSFUL; KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); @@ -200,8 +200,8 @@ * Get the segment corresponding to the virtual address */ Region = MmFindRegion(MemoryArea->StartingAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - Address, NULL); + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + Address, NULL); if (Region->Type == MEM_RESERVE || Region->Protect == PAGE_NOACCESS) { @@ -220,8 +220,8 @@ * Get or create a page operation */ PageOp = MmGetPageOp(MemoryArea, Process->UniqueProcessId, - (PVOID)PAGE_ROUND_DOWN(Address), NULL, 0, - MM_PAGEOP_PAGEIN, FALSE); + (PVOID)PAGE_ROUND_DOWN(Address), NULL, 0, + MM_PAGEOP_PAGEIN, FALSE); if (PageOp == NULL) { DPRINT1("MmGetPageOp failed"); @@ -236,10 +236,10 @@ { MmUnlockAddressSpace(AddressSpace); Status = KeWaitForSingleObject(&PageOp->CompletionEvent, - 0, - KernelMode, - FALSE, - NULL); + 0, + KernelMode, + FALSE, + NULL); /* * Check for various strange conditions */ @@ -319,18 +319,18 @@ * try again */ Status = MmCreateVirtualMapping(Process, - (PVOID)PAGE_ROUND_DOWN(Address), - Region->Protect, - &Page, - 1); - while (Status == STATUS_NO_MEMORY) - { - MmUnlockAddressSpace(AddressSpace); - Status = MmCreateVirtualMapping(Process, - Address, + (PVOID)PAGE_ROUND_DOWN(Address), Region->Protect, &Page, 1); + while (Status == STATUS_NO_MEMORY) + { + MmUnlockAddressSpace(AddressSpace); + Status = MmCreateVirtualMapping(Process, + Address, + Region->Protect, + &Page, + 1); MmLockAddressSpace(AddressSpace); } if (!NT_SUCCESS(Status)) @@ -386,15 +386,15 @@ SWAPENTRY SwapEntry; MmDeletePageFileMapping(Process, - (char*)BaseAddress + (i * PAGE_SIZE), - &SwapEntry); + (char*)BaseAddress + (i * PAGE_SIZE), + &SwapEntry); MmFreeSwapPage(SwapEntry); } else { MmDeleteVirtualMapping(Process, - (char*)BaseAddress + (i*PAGE_SIZE), - FALSE, NULL, &Page); + (char*)BaseAddress + (i*PAGE_SIZE), + FALSE, NULL, &Page); if (Page != 0) { SWAPENTRY SavedSwapEntry; @@ -405,7 +405,7 @@ MmSetSavedSwapEntryPage(Page, 0); } MmDeleteRmap(Page, Process, - (char*)BaseAddress + (i * PAGE_SIZE)); + (char*)BaseAddress + (i * PAGE_SIZE)); MmReleasePageMemoryConsumer(MC_USER, Page); } } @@ -467,15 +467,15 @@ if (MemoryArea->Type == MEMORY_AREA_VIRTUAL_MEMORY) { Status = MmProtectAnonMem(AddressSpace, MemoryArea, *BaseAddress, - *NumberOfBytesToProtect, NewAccessProtection, - OldAccessProtection); + *NumberOfBytesToProtect, NewAccessProtection, + OldAccessProtection); } else if (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) { Status = MmProtectSectionView(AddressSpace, MemoryArea, *BaseAddress, - *NumberOfBytesToProtect, - NewAccessProtection, - OldAccessProtection); + *NumberOfBytesToProtect, + NewAccessProtection, + OldAccessProtection); } else { @@ -659,11 +659,11 @@ { /* Reference the handle for correct permissions */ Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_OPERATION, - PsProcessType, - PreviousMode, - (PVOID*)&Process, - NULL); + PROCESS_VM_OPERATION, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); if (!NT_SUCCESS(Status)) return Status; /* Check if not running in the current process */ @@ -722,7 +722,7 @@ if (((ULONG_PTR)BaseAddress + RegionSize) > (ULONG_PTR)MemoryArea->EndingAddress) { DPRINT("BaseAddress + RegionSize %x is larger than MemoryArea's EndingAddress %x\n", - (ULONG_PTR)BaseAddress + RegionSize, MemoryArea->EndingAddress); + (ULONG_PTR)BaseAddress + RegionSize, MemoryArea->EndingAddress); MmUnlockAddressSpace(AddressSpace); if (Attached) KeUnstackDetachProcess(&ApcState); @@ -752,12 +752,11 @@ if (MemoryArea->Type == MEMORY_AREA_VIRTUAL_MEMORY && MemoryAreaLength >= RegionSize) { - Status = - MmAlterRegion(AddressSpace, - MemoryArea->StartingAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - BaseAddress, RegionSize, - Type, Protect, MmModifyAttributes); + Status = MmAlterRegion(AddressSpace, + MemoryArea->StartingAddress, + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + BaseAddress, RegionSize, + Type, Protect, MmModifyAttributes); MmUnlockAddressSpace(AddressSpace); if (Attached) KeUnstackDetachProcess(&ApcState); if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); @@ -778,12 +777,11 @@ /* Region list initialized? */ if (MemoryArea->Data.SectionData.RegionListHead.Flink) { - Status = - MmAlterRegion(AddressSpace, - MemoryArea->StartingAddress, - &MemoryArea->Data.SectionData.RegionListHead, - BaseAddress, RegionSize, - Type, Protect, MmModifyAttributes); + Status = MmAlterRegion(AddressSpace, + MemoryArea->StartingAddress, + &MemoryArea->Data.SectionData.RegionListHead, + BaseAddress, RegionSize, + Type, Protect, MmModifyAttributes); } else { @@ -816,14 +814,14 @@ } Status = MmCreateMemoryArea(AddressSpace, - MEMORY_AREA_VIRTUAL_MEMORY, - &BaseAddress, - RegionSize, - Protect, - &MemoryArea, - PBaseAddress != 0, - AllocationType & MEM_TOP_DOWN, - BoundaryAddressMultiple); + MEMORY_AREA_VIRTUAL_MEMORY, + &BaseAddress, + RegionSize, + Protect, + &MemoryArea, + PBaseAddress != 0, + AllocationType & MEM_TOP_DOWN, + BoundaryAddressMultiple); if (!NT_SUCCESS(Status)) { MmUnlockAddressSpace(AddressSpace); @@ -834,10 +832,10 @@ } MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - - (ULONG_PTR)MemoryArea->StartingAddress; + (ULONG_PTR)MemoryArea->StartingAddress; MmInitializeRegion(&MemoryArea->Data.VirtualMemoryData.RegionListHead, - MemoryAreaLength, Type, Protect); + MemoryAreaLength, Type, Protect); if ((AllocationType & MEM_COMMIT) && (Protect & (PAGE_READWRITE | PAGE_EXECUTE_READWRITE))) @@ -895,7 +893,7 @@ ULONG i; DPRINT("MmFreeVirtualMemory(Process %p MemoryArea %p)\n", Process, - MemoryArea); + MemoryArea); /* Mark this memory area as about to be deleted. */ MemoryArea->DeleteInProgress = TRUE; @@ -914,17 +912,17 @@ { PMM_PAGEOP PageOp; PageOp = MmCheckForPageOp(MemoryArea, Process->UniqueProcessId, - (PVOID)((ULONG_PTR)MemoryArea->StartingAddress + (i * PAGE_SIZE)), - NULL, 0); + (PVOID)((ULONG_PTR)MemoryArea->StartingAddress + (i * PAGE_SIZE)), + NULL, 0); if (PageOp != NULL) { NTSTATUS Status; MmUnlockAddressSpace(&Process->Vm); Status = KeWaitForSingleObject(&PageOp->CompletionEvent, - 0, - KernelMode, - FALSE, - NULL); + 0, + KernelMode, + FALSE, + NULL); if (Status != STATUS_SUCCESS) { DPRINT1("Failed to wait for page op\n"); @@ -1046,11 +1044,11 @@ { /* Reference the handle for correct permissions */ Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_OPERATION, - PsProcessType, - PreviousMode, - (PVOID*)&Process, - NULL); + PROCESS_VM_OPERATION, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); if (!NT_SUCCESS(Status)) return Status; /* Check if not running in the current process */ @@ -1064,7 +1062,7 @@ BaseAddress = (PVOID)PAGE_ROUND_DOWN((PBaseAddress)); RegionSize = PAGE_ROUND_UP((ULONG_PTR)(PBaseAddress) + (PRegionSize)) - - PAGE_ROUND_DOWN((PBaseAddress)); + PAGE_ROUND_DOWN((PBaseAddress)); AddressSpace = &Process->Vm; @@ -1092,17 +1090,16 @@ goto unlock_deref_and_return; case MEM_DECOMMIT: - Status = - MmAlterRegion(AddressSpace, - MemoryArea->StartingAddress, - (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) ? - &MemoryArea->Data.SectionData.RegionListHead : - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - BaseAddress, - RegionSize, - MEM_RESERVE, - PAGE_NOACCESS, - MmModifyAttributes); + Status = MmAlterRegion(AddressSpace, + MemoryArea->StartingAddress, + (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) ? + &MemoryArea->Data.SectionData.RegionListHead : + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + BaseAddress, + RegionSize, + MEM_RESERVE, + PAGE_NOACCESS, + MmModifyAttributes); goto unlock_deref_and_return; } @@ -1135,8 +1132,8 @@ for (;;) { Region = MmFindRegion(MemoryArea->StartingAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - (PVOID)((ULONG_PTR)BaseAddress + LengthCount), NULL); + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + (PVOID)((ULONG_PTR)BaseAddress + LengthCount), NULL); /* If a Region was found and it is committed */ if ((Region) && (Region->Type == MEM_COMMIT)) @@ -1163,9 +1160,9 @@ { *OldProtect = Region->Protect; Status = MmAlterRegion(AddressSpace, MemoryArea->StartingAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - BaseAddress, Length, Region->Type, Protect, - MmModifyAttributes); + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + BaseAddress, Length, Region->Type, Protect, + MmModifyAttributes); } return (Status); @@ -1183,8 +1180,8 @@ Info->BaseAddress = (PVOID)PAGE_ROUND_DOWN(Address); Region = MmFindRegion(MemoryArea->StartingAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - Address, &RegionBase); + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + Address, &RegionBase); Info->BaseAddress = RegionBase; Info->AllocationBase = MemoryArea->StartingAddress; Info->AllocationProtect = MemoryArea->Protect;

12 years, 10 months

[jgardou] 54366: (FORMATTING) - get back this good ol' 4-space indentation

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Nov 12 19:26:26 2011 New Revision: 54366 URL: http://svn.reactos.org/svn/reactos?rev=54366&view=rev Log: (FORMATTING) - get back this good ol' 4-space indentation Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Sat Nov 12 19:26:26 2011 @@ -51,164 +51,164 @@ NTSTATUS NTAPI MmPageOutVirtualMemory(PMMSUPPORT AddressSpace, - PMEMORY_AREA MemoryArea, - PVOID Address, - PMM_PAGEOP PageOp) + PMEMORY_AREA MemoryArea, + PVOID Address, + PMM_PAGEOP PageOp) { - PFN_NUMBER Page; - BOOLEAN WasDirty; - SWAPENTRY SwapEntry; - NTSTATUS Status; - PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); + PFN_NUMBER Page; + BOOLEAN WasDirty; + SWAPENTRY SwapEntry; + NTSTATUS Status; + PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); - DPRINT("MmPageOutVirtualMemory(Address 0x%.8X) PID %d\n", - Address, Process->UniqueProcessId); - - /* + DPRINT("MmPageOutVirtualMemory(Address 0x%.8X) PID %d\n", + Address, Process->UniqueProcessId); + + /* * Check for paging out from a deleted virtual memory area. */ - if (MemoryArea->DeleteInProgress) - { - PageOp->Status = STATUS_UNSUCCESSFUL; - KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); - MmReleasePageOp(PageOp); - return(STATUS_UNSUCCESSFUL); - } - - /* + if (MemoryArea->DeleteInProgress) + { + PageOp->Status = STATUS_UNSUCCESSFUL; + KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); + MmReleasePageOp(PageOp); + return(STATUS_UNSUCCESSFUL); + } + + /* * Disable the virtual mapping. */ - MmDisableVirtualMapping(Process, Address, - &WasDirty, &Page); - - if (Page == 0) - { - KeBugCheck(MEMORY_MANAGEMENT); - } - - /* + MmDisableVirtualMapping(Process, Address, + &WasDirty, &Page); + + if (Page == 0) + { + KeBugCheck(MEMORY_MANAGEMENT); + } + + /* * Paging out non-dirty data is easy. */ - if (!WasDirty) - { - MmLockAddressSpace(AddressSpace); - MmDeleteVirtualMapping(Process, Address, FALSE, NULL, NULL); - MmDeleteAllRmaps(Page, NULL, NULL); - if ((SwapEntry = MmGetSavedSwapEntryPage(Page)) != 0) - { - MmCreatePageFileMapping(Process, Address, SwapEntry); - MmSetSavedSwapEntryPage(Page, 0); - } - MmUnlockAddressSpace(AddressSpace); - MmReleasePageMemoryConsumer(MC_USER, Page); - PageOp->Status = STATUS_SUCCESS; - KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); - MmReleasePageOp(PageOp); - return(STATUS_SUCCESS); - } - - /* + if (!WasDirty) + { + MmLockAddressSpace(AddressSpace); + MmDeleteVirtualMapping(Process, Address, FALSE, NULL, NULL); + MmDeleteAllRmaps(Page, NULL, NULL); + if ((SwapEntry = MmGetSavedSwapEntryPage(Page)) != 0) + { + MmCreatePageFileMapping(Process, Address, SwapEntry); + MmSetSavedSwapEntryPage(Page, 0); + } + MmUnlockAddressSpace(AddressSpace); + MmReleasePageMemoryConsumer(MC_USER, Page); + PageOp->Status = STATUS_SUCCESS; + KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); + MmReleasePageOp(PageOp); + return(STATUS_SUCCESS); + } + + /* * If necessary, allocate an entry in the paging file for this page */ - SwapEntry = MmGetSavedSwapEntryPage(Page); - if (SwapEntry == 0) - { - SwapEntry = MmAllocSwapPage(); - if (SwapEntry == 0) - { - MmShowOutOfSpaceMessagePagingFile(); - MmEnableVirtualMapping(Process, Address); - PageOp->Status = STATUS_UNSUCCESSFUL; - KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); - MmReleasePageOp(PageOp); - return(STATUS_PAGEFILE_QUOTA); - } - } - - /* + SwapEntry = MmGetSavedSwapEntryPage(Page); + if (SwapEntry == 0) + { + SwapEntry = MmAllocSwapPage(); + if (SwapEntry == 0) + { + MmShowOutOfSpaceMessagePagingFile(); + MmEnableVirtualMapping(Process, Address); + PageOp->Status = STATUS_UNSUCCESSFUL; + KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); + MmReleasePageOp(PageOp); + return(STATUS_PAGEFILE_QUOTA); + } + } + + /* * Write the page to the pagefile */ - Status = MmWriteToSwapPage(SwapEntry, Page); - if (!NT_SUCCESS(Status)) - { - DPRINT1("MM: Failed to write to swap page (Status was 0x%.8X)\n", - Status); - MmEnableVirtualMapping(Process, Address); - PageOp->Status = STATUS_UNSUCCESSFUL; - KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); - MmReleasePageOp(PageOp); - return(STATUS_UNSUCCESSFUL); - } - - /* + Status = MmWriteToSwapPage(SwapEntry, Page); + if (!NT_SUCCESS(Status)) + { + DPRINT1("MM: Failed to write to swap page (Status was 0x%.8X)\n", + Status); + MmEnableVirtualMapping(Process, Address); + PageOp->Status = STATUS_UNSUCCESSFUL; + KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); + MmReleasePageOp(PageOp); + return(STATUS_UNSUCCESSFUL); + } + + /* * Otherwise we have succeeded, free the page */ - DPRINT("MM: Swapped out virtual memory page 0x%.8X!\n", Page << PAGE_SHIFT); - MmLockAddressSpace(AddressSpace); - MmDeleteVirtualMapping(Process, Address, FALSE, NULL, NULL); - MmCreatePageFileMapping(Process, Address, SwapEntry); - MmUnlockAddressSpace(AddressSpace); - MmDeleteAllRmaps(Page, NULL, NULL); - MmSetSavedSwapEntryPage(Page, 0); - MmReleasePageMemoryConsumer(MC_USER, Page); - PageOp->Status = STATUS_SUCCESS; - KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); - MmReleasePageOp(PageOp); - return(STATUS_SUCCESS); + DPRINT("MM: Swapped out virtual memory page 0x%.8X!\n", Page << PAGE_SHIFT); + MmLockAddressSpace(AddressSpace); + MmDeleteVirtualMapping(Process, Address, FALSE, NULL, NULL); + MmCreatePageFileMapping(Process, Address, SwapEntry); + MmUnlockAddressSpace(AddressSpace); + MmDeleteAllRmaps(Page, NULL, NULL); + MmSetSavedSwapEntryPage(Page, 0); + MmReleasePageMemoryConsumer(MC_USER, Page); + PageOp->Status = STATUS_SUCCESS; + KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); + MmReleasePageOp(PageOp); + return(STATUS_SUCCESS); } NTSTATUS NTAPI MmNotPresentFaultVirtualMemory(PMMSUPPORT AddressSpace, - MEMORY_AREA* MemoryArea, - PVOID Address) + MEMORY_AREA* MemoryArea, + PVOID Address) /* - * FUNCTION: Move data into memory to satisfy a page not present fault - * ARGUMENTS: - * AddressSpace = Address space within which the fault occurred - * MemoryArea = The memory area within which the fault occurred - * Address = The absolute address of fault - * RETURNS: Status - * NOTES: This function is called with the address space lock held. - */ +* FUNCTION: Move data into memory to satisfy a page not present fault +* ARGUMENTS: +* AddressSpace = Address space within which the fault occurred +* MemoryArea = The memory area within which the fault occurred +* Address = The absolute address of fault +* RETURNS: Status +* NOTES: This function is called with the address space lock held. +*/ { - PFN_NUMBER Page; - NTSTATUS Status; - PMM_REGION Region; - PMM_PAGEOP PageOp; - PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); + PFN_NUMBER Page; + NTSTATUS Status; + PMM_REGION Region; + PMM_PAGEOP PageOp; + PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); - /* + /* * There is a window between taking the page fault and locking the * address space when another thread could load the page so we check * that. */ - if (MmIsPagePresent(NULL, Address)) - { - return(STATUS_SUCCESS); - } - - /* + if (MmIsPagePresent(NULL, Address)) + { + return(STATUS_SUCCESS); + } + + /* * Check for the virtual memory area being deleted. */ - if (MemoryArea->DeleteInProgress) - { - return(STATUS_UNSUCCESSFUL); - } - - /* + if (MemoryArea->DeleteInProgress) + { + return(STATUS_UNSUCCESSFUL); + } + + /* * Get the segment corresponding to the virtual address */ - Region = MmFindRegion(MemoryArea->StartingAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - Address, NULL); - - if (Region->Type == MEM_RESERVE || Region->Protect == PAGE_NOACCESS) - { - return(STATUS_ACCESS_VIOLATION); - } - - /* + Region = MmFindRegion(MemoryArea->StartingAddress, + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + Address, NULL); + + if (Region->Type == MEM_RESERVE || Region->Protect == PAGE_NOACCESS) + { + return(STATUS_ACCESS_VIOLATION); + } + + /* * FIXME */ if (Region->Protect & PAGE_GUARD) @@ -216,230 +216,230 @@ return(STATUS_GUARD_PAGE_VIOLATION); } - /* + /* * Get or create a page operation */ - PageOp = MmGetPageOp(MemoryArea, Process->UniqueProcessId, - (PVOID)PAGE_ROUND_DOWN(Address), NULL, 0, - MM_PAGEOP_PAGEIN, FALSE); - if (PageOp == NULL) - { - DPRINT1("MmGetPageOp failed"); - KeBugCheck(MEMORY_MANAGEMENT); - } - - /* + PageOp = MmGetPageOp(MemoryArea, Process->UniqueProcessId, + (PVOID)PAGE_ROUND_DOWN(Address), NULL, 0, + MM_PAGEOP_PAGEIN, FALSE); + if (PageOp == NULL) + { + DPRINT1("MmGetPageOp failed"); + KeBugCheck(MEMORY_MANAGEMENT); + } + + /* * Check if someone else is already handling this fault, if so wait * for them */ - if (PageOp->Thread != PsGetCurrentThread()) - { - MmUnlockAddressSpace(AddressSpace); - Status = KeWaitForSingleObject(&PageOp->CompletionEvent, - 0, - KernelMode, - FALSE, - NULL); - /* - * Check for various strange conditions - */ - if (Status != STATUS_SUCCESS) - { - DPRINT1("Failed to wait for page op\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - if (PageOp->Status == STATUS_PENDING) - { - DPRINT1("Woke for page op before completion\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - /* - * If this wasn't a pagein then we need to restart the handling - */ - if (PageOp->OpType != MM_PAGEOP_PAGEIN) - { - MmLockAddressSpace(AddressSpace); - KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); - MmReleasePageOp(PageOp); - return(STATUS_MM_RESTART_OPERATION); - } - /* - * If the thread handling this fault has failed then we don't retry - */ - if (!NT_SUCCESS(PageOp->Status)) - { - MmLockAddressSpace(AddressSpace); - KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); - Status = PageOp->Status; - MmReleasePageOp(PageOp); - return(Status); - } - MmLockAddressSpace(AddressSpace); - KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); - MmReleasePageOp(PageOp); - return(STATUS_SUCCESS); - } - - /* + if (PageOp->Thread != PsGetCurrentThread()) + { + MmUnlockAddressSpace(AddressSpace); + Status = KeWaitForSingleObject(&PageOp->CompletionEvent, + 0, + KernelMode, + FALSE, + NULL); + /* + * Check for various strange conditions + */ + if (Status != STATUS_SUCCESS) + { + DPRINT1("Failed to wait for page op\n"); + KeBugCheck(MEMORY_MANAGEMENT); + } + if (PageOp->Status == STATUS_PENDING) + { + DPRINT1("Woke for page op before completion\n"); + KeBugCheck(MEMORY_MANAGEMENT); + } + /* + * If this wasn't a pagein then we need to restart the handling + */ + if (PageOp->OpType != MM_PAGEOP_PAGEIN) + { + MmLockAddressSpace(AddressSpace); + KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); + MmReleasePageOp(PageOp); + return(STATUS_MM_RESTART_OPERATION); + } + /* + * If the thread handling this fault has failed then we don't retry + */ + if (!NT_SUCCESS(PageOp->Status)) + { + MmLockAddressSpace(AddressSpace); + KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); + Status = PageOp->Status; + MmReleasePageOp(PageOp); + return(Status); + } + MmLockAddressSpace(AddressSpace); + KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); + MmReleasePageOp(PageOp); + return(STATUS_SUCCESS); + } + + /* * Try to allocate a page */ - MI_SET_USAGE(MI_USAGE_VAD); - MI_SET_PROCESS2(Process->ImageFileName); - Status = MmRequestPageMemoryConsumer(MC_USER, FALSE, &Page); - if (Status == STATUS_NO_MEMORY) - { - MmUnlockAddressSpace(AddressSpace); - Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); - MmLockAddressSpace(AddressSpace); - } - if (!NT_SUCCESS(Status)) - { - DPRINT1("MmRequestPageMemoryConsumer failed, status = %x\n", Status); - KeBugCheck(MEMORY_MANAGEMENT); - } - - /* + MI_SET_USAGE(MI_USAGE_VAD); + MI_SET_PROCESS2(Process->ImageFileName); + Status = MmRequestPageMemoryConsumer(MC_USER, FALSE, &Page); + if (Status == STATUS_NO_MEMORY) + { + MmUnlockAddressSpace(AddressSpace); + Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); + MmLockAddressSpace(AddressSpace); + } + if (!NT_SUCCESS(Status)) + { + DPRINT1("MmRequestPageMemoryConsumer failed, status = %x\n", Status); + KeBugCheck(MEMORY_MANAGEMENT); + } + + /* * Handle swapped out pages. */ - if (MmIsPageSwapEntry(NULL, Address)) - { - SWAPENTRY SwapEntry; - - MmDeletePageFileMapping(Process, Address, &SwapEntry); - Status = MmReadFromSwapPage(SwapEntry, Page); - if (!NT_SUCCESS(Status)) - { - KeBugCheck(MEMORY_MANAGEMENT); - } - MmSetSavedSwapEntryPage(Page, SwapEntry); - } - - /* + if (MmIsPageSwapEntry(NULL, Address)) + { + SWAPENTRY SwapEntry; + + MmDeletePageFileMapping(Process, Address, &SwapEntry); + Status = MmReadFromSwapPage(SwapEntry, Page); + if (!NT_SUCCESS(Status)) + { + KeBugCheck(MEMORY_MANAGEMENT); + } + MmSetSavedSwapEntryPage(Page, SwapEntry); + } + + /* * Set the page. If we fail because we are out of memory then * try again */ - Status = MmCreateVirtualMapping(Process, - (PVOID)PAGE_ROUND_DOWN(Address), - Region->Protect, - &Page, - 1); - while (Status == STATUS_NO_MEMORY) - { - MmUnlockAddressSpace(AddressSpace); - Status = MmCreateVirtualMapping(Process, - Address, - Region->Protect, - &Page, - 1); - MmLockAddressSpace(AddressSpace); - } - if (!NT_SUCCESS(Status)) - { - DPRINT1("MmCreateVirtualMapping failed, not out of memory\n"); - KeBugCheck(MEMORY_MANAGEMENT); - return(Status); - } - - /* + Status = MmCreateVirtualMapping(Process, + (PVOID)PAGE_ROUND_DOWN(Address), + Region->Protect, + &Page, + 1); + while (Status == STATUS_NO_MEMORY) + { + MmUnlockAddressSpace(AddressSpace); + Status = MmCreateVirtualMapping(Process, + Address, + Region->Protect, + &Page, + 1); + MmLockAddressSpace(AddressSpace); + } + if (!NT_SUCCESS(Status)) + { + DPRINT1("MmCreateVirtualMapping failed, not out of memory\n"); + KeBugCheck(MEMORY_MANAGEMENT); + return(Status); + } + + /* * Add the page to the process's working set */ - MmInsertRmap(Page, Process, (PVOID)PAGE_ROUND_DOWN(Address)); - - /* + MmInsertRmap(Page, Process, (PVOID)PAGE_ROUND_DOWN(Address)); + + /* * Finish the operation */ - PageOp->Status = STATUS_SUCCESS; - KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); - MmReleasePageOp(PageOp); - return(STATUS_SUCCESS); + PageOp->Status = STATUS_SUCCESS; + KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); + MmReleasePageOp(PageOp); + return(STATUS_SUCCESS); } static VOID MmModifyAttributes(PMMSUPPORT AddressSpace, - PVOID BaseAddress, - SIZE_T RegionSize, - ULONG OldType, - ULONG OldProtect, - ULONG NewType, - ULONG NewProtect) + PVOID BaseAddress, + SIZE_T RegionSize, + ULONG OldType, + ULONG OldProtect, + ULONG NewType, + ULONG NewProtect) /* - * FUNCTION: Modify the attributes of a memory region - */ +* FUNCTION: Modify the attributes of a memory region +*/ { - PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); + PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); - /* + /* * If we are switching a previously committed region to reserved then * free any allocated pages within the region */ - if (NewType == MEM_RESERVE && OldType == MEM_COMMIT) - { - ULONG i; - - for (i=0; i < PAGE_ROUND_UP(RegionSize)/PAGE_SIZE; i++) - { - PFN_NUMBER Page; - - if (MmIsPageSwapEntry(Process, - (char*)BaseAddress + (i * PAGE_SIZE))) - { - SWAPENTRY SwapEntry; - - MmDeletePageFileMapping(Process, - (char*)BaseAddress + (i * PAGE_SIZE), - &SwapEntry); - MmFreeSwapPage(SwapEntry); - } - else - { - MmDeleteVirtualMapping(Process, - (char*)BaseAddress + (i*PAGE_SIZE), - FALSE, NULL, &Page); - if (Page != 0) + if (NewType == MEM_RESERVE && OldType == MEM_COMMIT) + { + ULONG i; + + for (i=0; i < PAGE_ROUND_UP(RegionSize)/PAGE_SIZE; i++) + { + PFN_NUMBER Page; + + if (MmIsPageSwapEntry(Process, + (char*)BaseAddress + (i * PAGE_SIZE))) { - SWAPENTRY SavedSwapEntry; - SavedSwapEntry = MmGetSavedSwapEntryPage(Page); - if (SavedSwapEntry != 0) - { - MmFreeSwapPage(SavedSwapEntry); - MmSetSavedSwapEntryPage(Page, 0); - } - MmDeleteRmap(Page, Process, - (char*)BaseAddress + (i * PAGE_SIZE)); - MmReleasePageMemoryConsumer(MC_USER, Page); + SWAPENTRY SwapEntry; + + MmDeletePageFileMapping(Process, + (char*)BaseAddress + (i * PAGE_SIZE), + &SwapEntry); + MmFreeSwapPage(SwapEntry); } - } - } - } - - /* + else + { + MmDeleteVirtualMapping(Process, + (char*)BaseAddress + (i*PAGE_SIZE), + FALSE, NULL, &Page); + if (Page != 0) + { + SWAPENTRY SavedSwapEntry; + SavedSwapEntry = MmGetSavedSwapEntryPage(Page); + if (SavedSwapEntry != 0) + { + MmFreeSwapPage(SavedSwapEntry); + MmSetSavedSwapEntryPage(Page, 0); + } + MmDeleteRmap(Page, Process, + (char*)BaseAddress + (i * PAGE_SIZE)); + MmReleasePageMemoryConsumer(MC_USER, Page); + } + } + } + } + + /* * If we are changing the protection attributes of a committed region then * alter the attributes for any allocated pages within the region */ - if (NewType == MEM_COMMIT && OldType == MEM_COMMIT && - OldProtect != NewProtect) - { - ULONG i; - - for (i=0; i < PAGE_ROUND_UP(RegionSize)/PAGE_SIZE; i++) - { - if (MmIsPagePresent(Process, - (char*)BaseAddress + (i*PAGE_SIZE))) - { - MmSetPageProtect(Process, - (char*)BaseAddress + (i*PAGE_SIZE), - NewProtect); - } - } - } + if (NewType == MEM_COMMIT && OldType == MEM_COMMIT && + OldProtect != NewProtect) + { + ULONG i; + + for (i=0; i < PAGE_ROUND_UP(RegionSize)/PAGE_SIZE; i++) + { + if (MmIsPagePresent(Process, + (char*)BaseAddress + (i*PAGE_SIZE))) + { + MmSetPageProtect(Process, + (char*)BaseAddress + (i*PAGE_SIZE), + NewProtect); + } + } + } } NTSTATUS NTAPI MiProtectVirtualMemory(IN PEPROCESS Process, - IN OUT PVOID *BaseAddress, - IN OUT PSIZE_T NumberOfBytesToProtect, - IN ULONG NewAccessProtection, - OUT PULONG OldAccessProtection OPTIONAL) + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T NumberOfBytesToProtect, + IN ULONG NewAccessProtection, + OUT PULONG OldAccessProtection OPTIONAL) { PMEMORY_AREA MemoryArea; PMMSUPPORT AddressSpace; @@ -462,20 +462,20 @@ } if (OldAccessProtection == NULL) - OldAccessProtection = &OldAccessProtection_; + OldAccessProtection = &OldAccessProtection_; if (MemoryArea->Type == MEMORY_AREA_VIRTUAL_MEMORY) { Status = MmProtectAnonMem(AddressSpace, MemoryArea, *BaseAddress, - *NumberOfBytesToProtect, NewAccessProtection, - OldAccessProtection); + *NumberOfBytesToProtect, NewAccessProtection, + OldAccessProtection); } else if (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) { Status = MmProtectSectionView(AddressSpace, MemoryArea, *BaseAddress, - *NumberOfBytesToProtect, - NewAccessProtection, - OldAccessProtection); + *NumberOfBytesToProtect, + NewAccessProtection, + OldAccessProtection); } else { @@ -489,28 +489,28 @@ } /* - * @implemented - */ +* @implemented +*/ NTSTATUS NTAPI NtAllocateVirtualMemory(IN HANDLE ProcessHandle, - IN OUT PVOID* UBaseAddress, - IN ULONG_PTR ZeroBits, - IN OUT PSIZE_T URegionSize, - IN ULONG AllocationType, - IN ULONG Protect) + IN OUT PVOID* UBaseAddress, + IN ULONG_PTR ZeroBits, + IN OUT PSIZE_T URegionSize, + IN ULONG AllocationType, + IN ULONG Protect) { - PEPROCESS Process; - MEMORY_AREA* MemoryArea; - ULONG_PTR MemoryAreaLength; - ULONG Type; - NTSTATUS Status; - PMMSUPPORT AddressSpace; - PVOID BaseAddress; - ULONG RegionSize; - PVOID PBaseAddress; - ULONG_PTR PRegionSize; - PHYSICAL_ADDRESS BoundaryAddressMultiple; + PEPROCESS Process; + MEMORY_AREA* MemoryArea; + ULONG_PTR MemoryAreaLength; + ULONG Type; + NTSTATUS Status; + PMMSUPPORT AddressSpace; + PVOID BaseAddress; + ULONG RegionSize; + PVOID PBaseAddress; + ULONG_PTR PRegionSize; + PHYSICAL_ADDRESS BoundaryAddressMultiple; PEPROCESS CurrentProcess = PsGetCurrentProcess(); KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); KAPC_STATE ApcState; @@ -528,7 +528,7 @@ /* Check for valid Allocation Types */ if ((AllocationType & ~(MEM_COMMIT | MEM_RESERVE | MEM_RESET | MEM_PHYSICAL | - MEM_TOP_DOWN | MEM_WRITE_WATCH))) + MEM_TOP_DOWN | MEM_WRITE_WATCH))) { DPRINT1("Invalid Allocation Type\n"); return STATUS_INVALID_PARAMETER_5; @@ -659,11 +659,11 @@ { /* Reference the handle for correct permissions */ Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_OPERATION, - PsProcessType, - PreviousMode, - (PVOID*)&Process, - NULL); + PROCESS_VM_OPERATION, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); if (!NT_SUCCESS(Status)) return Status; /* Check if not running in the current process */ @@ -688,297 +688,297 @@ } } - BaseAddress = (PVOID)PAGE_ROUND_DOWN(PBaseAddress); - RegionSize = PAGE_ROUND_UP((ULONG_PTR)PBaseAddress + PRegionSize) - - PAGE_ROUND_DOWN(PBaseAddress); - - - /* + BaseAddress = (PVOID)PAGE_ROUND_DOWN(PBaseAddress); + RegionSize = PAGE_ROUND_UP((ULONG_PTR)PBaseAddress + PRegionSize) - + PAGE_ROUND_DOWN(PBaseAddress); + + + /* * Copy on Write is reserved for system use. This case is a certain failure * but there may be other cases...needs more testing */ - if ((!BaseAddress || (AllocationType & MEM_RESERVE)) && - (Protect & (PAGE_WRITECOPY | PAGE_EXECUTE_WRITECOPY))) - { - DPRINT1("Copy on write is not supported by VirtualAlloc\n"); - return STATUS_INVALID_PAGE_PROTECTION; - } - - Type = (AllocationType & MEM_COMMIT) ? MEM_COMMIT : MEM_RESERVE; - DPRINT("Type %x\n", Type); - - AddressSpace = &Process->Vm; - MmLockAddressSpace(AddressSpace); - - if (PBaseAddress != 0) - { - MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); - - if (MemoryArea != NULL) - { - MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - - (ULONG_PTR)MemoryArea->StartingAddress; - - if (((ULONG_PTR)BaseAddress + RegionSize) > (ULONG_PTR)MemoryArea->EndingAddress) - { - DPRINT("BaseAddress + RegionSize %x is larger than MemoryArea's EndingAddress %x\n", - (ULONG_PTR)BaseAddress + RegionSize, MemoryArea->EndingAddress); - - MmUnlockAddressSpace(AddressSpace); - if (Attached) KeUnstackDetachProcess(&ApcState); - if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); - return STATUS_MEMORY_NOT_ALLOCATED; - } - - if (AllocationType == MEM_RESET) - { - if (MmIsPagePresent(Process, BaseAddress)) + if ((!BaseAddress || (AllocationType & MEM_RESERVE)) && + (Protect & (PAGE_WRITECOPY | PAGE_EXECUTE_WRITECOPY))) + { + DPRINT1("Copy on write is not supported by VirtualAlloc\n"); + return STATUS_INVALID_PAGE_PROTECTION; + } + + Type = (AllocationType & MEM_COMMIT) ? MEM_COMMIT : MEM_RESERVE; + DPRINT("Type %x\n", Type); + + AddressSpace = &Process->Vm; + MmLockAddressSpace(AddressSpace); + + if (PBaseAddress != 0) + { + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); + + if (MemoryArea != NULL) + { + MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; + + if (((ULONG_PTR)BaseAddress + RegionSize) > (ULONG_PTR)MemoryArea->EndingAddress) { - /* FIXME: mark pages as not modified */ + DPRINT("BaseAddress + RegionSize %x is larger than MemoryArea's EndingAddress %x\n", + (ULONG_PTR)BaseAddress + RegionSize, MemoryArea->EndingAddress); + + MmUnlockAddressSpace(AddressSpace); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + return STATUS_MEMORY_NOT_ALLOCATED; + } + + if (AllocationType == MEM_RESET) + { + if (MmIsPagePresent(Process, BaseAddress)) + { + /* FIXME: mark pages as not modified */ + } + else + { + /* FIXME: if pages are in paging file discard them and bring in pages of zeros */ + } + + MmUnlockAddressSpace(AddressSpace); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + + /* MEM_RESET does not modify any attributes of region */ + return STATUS_SUCCESS; + } + + if (MemoryArea->Type == MEMORY_AREA_VIRTUAL_MEMORY && + MemoryAreaLength >= RegionSize) + { + Status = + MmAlterRegion(AddressSpace, + MemoryArea->StartingAddress, + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + BaseAddress, RegionSize, + Type, Protect, MmModifyAttributes); + MmUnlockAddressSpace(AddressSpace); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + DPRINT("NtAllocateVirtualMemory() = %x\n",Status); + + /* Give the caller rounded BaseAddress and area length */ + if (NT_SUCCESS(Status)) + { + *UBaseAddress = BaseAddress; + *URegionSize = RegionSize; + DPRINT("*UBaseAddress %x *URegionSize %x\n", BaseAddress, RegionSize); + } + + return(Status); + } + else if (MemoryAreaLength >= RegionSize) + { + /* Region list initialized? */ + if (MemoryArea->Data.SectionData.RegionListHead.Flink) + { + Status = + MmAlterRegion(AddressSpace, + MemoryArea->StartingAddress, + &MemoryArea->Data.SectionData.RegionListHead, + BaseAddress, RegionSize, + Type, Protect, MmModifyAttributes); + } + else + { + Status = STATUS_ACCESS_VIOLATION; + } + + MmUnlockAddressSpace(AddressSpace); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + DPRINT("NtAllocateVirtualMemory() = %x\n",Status); + + /* Give the caller rounded BaseAddress and area length */ + if (NT_SUCCESS(Status)) + { + *UBaseAddress = BaseAddress; + *URegionSize = RegionSize; + DPRINT("*UBaseAddress %x *URegionSize %x\n", BaseAddress, RegionSize); + } + + return(Status); } else { - /* FIXME: if pages are in paging file discard them and bring in pages of zeros */ + MmUnlockAddressSpace(AddressSpace); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + return(STATUS_UNSUCCESSFUL); } - - MmUnlockAddressSpace(AddressSpace); - if (Attached) KeUnstackDetachProcess(&ApcState); - if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); - - /* MEM_RESET does not modify any attributes of region */ - return STATUS_SUCCESS; - } - - if (MemoryArea->Type == MEMORY_AREA_VIRTUAL_MEMORY && - MemoryAreaLength >= RegionSize) - { - Status = - MmAlterRegion(AddressSpace, - MemoryArea->StartingAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - BaseAddress, RegionSize, - Type, Protect, MmModifyAttributes); - MmUnlockAddressSpace(AddressSpace); - if (Attached) KeUnstackDetachProcess(&ApcState); - if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); - DPRINT("NtAllocateVirtualMemory() = %x\n",Status); - - /* Give the caller rounded BaseAddress and area length */ - if (NT_SUCCESS(Status)) - { - *UBaseAddress = BaseAddress; - *URegionSize = RegionSize; - DPRINT("*UBaseAddress %x *URegionSize %x\n", BaseAddress, RegionSize); - } - - return(Status); - } - else if (MemoryAreaLength >= RegionSize) - { - /* Region list initialized? */ - if (MemoryArea->Data.SectionData.RegionListHead.Flink) - { - Status = - MmAlterRegion(AddressSpace, - MemoryArea->StartingAddress, - &MemoryArea->Data.SectionData.RegionListHead, - BaseAddress, RegionSize, - Type, Protect, MmModifyAttributes); - } - else - { - Status = STATUS_ACCESS_VIOLATION; - } - - MmUnlockAddressSpace(AddressSpace); - if (Attached) KeUnstackDetachProcess(&ApcState); - if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); - DPRINT("NtAllocateVirtualMemory() = %x\n",Status); - - /* Give the caller rounded BaseAddress and area length */ - if (NT_SUCCESS(Status)) - { - *UBaseAddress = BaseAddress; - *URegionSize = RegionSize; - DPRINT("*UBaseAddress %x *URegionSize %x\n", BaseAddress, RegionSize); - } - - return(Status); - } - else - { - MmUnlockAddressSpace(AddressSpace); - if (Attached) KeUnstackDetachProcess(&ApcState); - if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); - return(STATUS_UNSUCCESSFUL); - } - } - } - - Status = MmCreateMemoryArea(AddressSpace, - MEMORY_AREA_VIRTUAL_MEMORY, - &BaseAddress, - RegionSize, - Protect, - &MemoryArea, - PBaseAddress != 0, - AllocationType & MEM_TOP_DOWN, - BoundaryAddressMultiple); - if (!NT_SUCCESS(Status)) - { - MmUnlockAddressSpace(AddressSpace); - if (Attached) KeUnstackDetachProcess(&ApcState); - if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); - DPRINT("NtAllocateVirtualMemory() = %x\n",Status); - return(Status); - } - - MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - - (ULONG_PTR)MemoryArea->StartingAddress; - - MmInitializeRegion(&MemoryArea->Data.VirtualMemoryData.RegionListHead, - MemoryAreaLength, Type, Protect); - - if ((AllocationType & MEM_COMMIT) && - (Protect & (PAGE_READWRITE | PAGE_EXECUTE_READWRITE))) - { - const ULONG nPages = PAGE_ROUND_UP(MemoryAreaLength) >> PAGE_SHIFT; - MmReserveSwapPages(nPages); - } - - MmUnlockAddressSpace(AddressSpace); - if (Attached) KeUnstackDetachProcess(&ApcState); - if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); - - *UBaseAddress = BaseAddress; - *URegionSize = MemoryAreaLength; - DPRINT("*UBaseAddress %x *URegionSize %x\n", BaseAddress, RegionSize); - - return(STATUS_SUCCESS); + } + } + + Status = MmCreateMemoryArea(AddressSpace, + MEMORY_AREA_VIRTUAL_MEMORY, + &BaseAddress, + RegionSize, + Protect, + &MemoryArea, + PBaseAddress != 0, + AllocationType & MEM_TOP_DOWN, + BoundaryAddressMultiple); + if (!NT_SUCCESS(Status)) + { + MmUnlockAddressSpace(AddressSpace); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + DPRINT("NtAllocateVirtualMemory() = %x\n",Status); + return(Status); + } + + MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; + + MmInitializeRegion(&MemoryArea->Data.VirtualMemoryData.RegionListHead, + MemoryAreaLength, Type, Protect); + + if ((AllocationType & MEM_COMMIT) && + (Protect & (PAGE_READWRITE | PAGE_EXECUTE_READWRITE))) + { + const ULONG nPages = PAGE_ROUND_UP(MemoryAreaLength) >> PAGE_SHIFT; + MmReserveSwapPages(nPages); + } + + MmUnlockAddressSpace(AddressSpace); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + + *UBaseAddress = BaseAddress; + *URegionSize = MemoryAreaLength; + DPRINT("*UBaseAddress %x *URegionSize %x\n", BaseAddress, RegionSize); + + return(STATUS_SUCCESS); } static VOID MmFreeVirtualMemoryPage(PVOID Context, - MEMORY_AREA* MemoryArea, - PVOID Address, - PFN_NUMBER Page, - SWAPENTRY SwapEntry, - BOOLEAN Dirty) + MEMORY_AREA* MemoryArea, + PVOID Address, + PFN_NUMBER Page, + SWAPENTRY SwapEntry, + BOOLEAN Dirty) { - PEPROCESS Process = (PEPROCESS)Context; - - if (Page != 0) - { - SWAPENTRY SavedSwapEntry; - SavedSwapEntry = MmGetSavedSwapEntryPage(Page); - if (SavedSwapEntry != 0) - { - MmFreeSwapPage(SavedSwapEntry); - MmSetSavedSwapEntryPage(Page, 0); - } - MmDeleteRmap(Page, Process, Address); - MmReleasePageMemoryConsumer(MC_USER, Page); - } - else if (SwapEntry != 0) - { - MmFreeSwapPage(SwapEntry); - } + PEPROCESS Process = (PEPROCESS)Context; + + if (Page != 0) + { + SWAPENTRY SavedSwapEntry; + SavedSwapEntry = MmGetSavedSwapEntryPage(Page); + if (SavedSwapEntry != 0) + { + MmFreeSwapPage(SavedSwapEntry); + MmSetSavedSwapEntryPage(Page, 0); + } + MmDeleteRmap(Page, Process, Address); + MmReleasePageMemoryConsumer(MC_USER, Page); + } + else if (SwapEntry != 0) + { + MmFreeSwapPage(SwapEntry); + } } VOID NTAPI MmFreeVirtualMemory(PEPROCESS Process, - PMEMORY_AREA MemoryArea) + PMEMORY_AREA MemoryArea) { - PLIST_ENTRY current_entry; - PMM_REGION current; - ULONG i; - - DPRINT("MmFreeVirtualMemory(Process %p MemoryArea %p)\n", Process, - MemoryArea); - - /* Mark this memory area as about to be deleted. */ - MemoryArea->DeleteInProgress = TRUE; - - /* + PLIST_ENTRY current_entry; + PMM_REGION current; + ULONG i; + + DPRINT("MmFreeVirtualMemory(Process %p MemoryArea %p)\n", Process, + MemoryArea); + + /* Mark this memory area as about to be deleted. */ + MemoryArea->DeleteInProgress = TRUE; + + /* * Wait for any ongoing paging operations. Notice that since we have * flagged this memory area as deleted no more page ops will be added. */ - if (MemoryArea->PageOpCount > 0) - { - ULONG_PTR MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - - (ULONG_PTR)MemoryArea->StartingAddress; - const ULONG nPages = PAGE_ROUND_UP(MemoryAreaLength) >> PAGE_SHIFT; - - for (i = 0; i < nPages && MemoryArea->PageOpCount != 0; ++i) - { - PMM_PAGEOP PageOp; - PageOp = MmCheckForPageOp(MemoryArea, Process->UniqueProcessId, - (PVOID)((ULONG_PTR)MemoryArea->StartingAddress + (i * PAGE_SIZE)), - NULL, 0); - if (PageOp != NULL) - { - NTSTATUS Status; - MmUnlockAddressSpace(&Process->Vm); - Status = KeWaitForSingleObject(&PageOp->CompletionEvent, - 0, - KernelMode, - FALSE, - NULL); - if (Status != STATUS_SUCCESS) + if (MemoryArea->PageOpCount > 0) + { + ULONG_PTR MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; + const ULONG nPages = PAGE_ROUND_UP(MemoryAreaLength) >> PAGE_SHIFT; + + for (i = 0; i < nPages && MemoryArea->PageOpCount != 0; ++i) + { + PMM_PAGEOP PageOp; + PageOp = MmCheckForPageOp(MemoryArea, Process->UniqueProcessId, + (PVOID)((ULONG_PTR)MemoryArea->StartingAddress + (i * PAGE_SIZE)), + NULL, 0); + if (PageOp != NULL) { - DPRINT1("Failed to wait for page op\n"); - KeBugCheck(MEMORY_MANAGEMENT); + NTSTATUS Status; + MmUnlockAddressSpace(&Process->Vm); + Status = KeWaitForSingleObject(&PageOp->CompletionEvent, + 0, + KernelMode, + FALSE, + NULL); + if (Status != STATUS_SUCCESS) + { + DPRINT1("Failed to wait for page op\n"); + KeBugCheck(MEMORY_MANAGEMENT); + } + MmLockAddressSpace(&Process->Vm); + MmReleasePageOp(PageOp); } - MmLockAddressSpace(&Process->Vm); - MmReleasePageOp(PageOp); - } - } - } - - /* Free all the individual segments. */ - current_entry = MemoryArea->Data.VirtualMemoryData.RegionListHead.Flink; - while (current_entry != &MemoryArea->Data.VirtualMemoryData.RegionListHead) - { - current = CONTAINING_RECORD(current_entry, MM_REGION, RegionListEntry); - current_entry = current_entry->Flink; - ExFreePool(current); - } - - /* Actually free the memory area. */ - MmFreeMemoryArea(&Process->Vm, - MemoryArea, - MmFreeVirtualMemoryPage, - (PVOID)Process); + } + } + + /* Free all the individual segments. */ + current_entry = MemoryArea->Data.VirtualMemoryData.RegionListHead.Flink; + while (current_entry != &MemoryArea->Data.VirtualMemoryData.RegionListHead) + { + current = CONTAINING_RECORD(current_entry, MM_REGION, RegionListEntry); + current_entry = current_entry->Flink; + ExFreePool(current); + } + + /* Actually free the memory area. */ + MmFreeMemoryArea(&Process->Vm, + MemoryArea, + MmFreeVirtualMemoryPage, + (PVOID)Process); } /* - * @implemented - */ +* @implemented +*/ NTSTATUS NTAPI NtFreeVirtualMemory(IN HANDLE ProcessHandle, - IN PVOID* UBaseAddress, - IN PSIZE_T URegionSize, - IN ULONG FreeType) + IN PVOID* UBaseAddress, + IN PSIZE_T URegionSize, + IN ULONG FreeType) /* - * FUNCTION: Frees a range of virtual memory - * ARGUMENTS: - * ProcessHandle = Points to the process that allocated the virtual - * memory - * BaseAddress = Points to the memory address, rounded down to a - * multiple of the pagesize - * RegionSize = Limits the range to free, rounded up to a multiple of - * the paging size - * FreeType = Can be one of the values: MEM_DECOMMIT, or MEM_RELEASE - * RETURNS: Status - */ +* FUNCTION: Frees a range of virtual memory +* ARGUMENTS: +* ProcessHandle = Points to the process that allocated the virtual +* memory +* BaseAddress = Points to the memory address, rounded down to a +* multiple of the pagesize +* RegionSize = Limits the range to free, rounded up to a multiple of +* the paging size +* FreeType = Can be one of the values: MEM_DECOMMIT, or MEM_RELEASE +* RETURNS: Status +*/ { - MEMORY_AREA* MemoryArea; - NTSTATUS Status; - PEPROCESS Process; - PMMSUPPORT AddressSpace; - PVOID BaseAddress, PBaseAddress; - SIZE_T RegionSize, PRegionSize; + MEMORY_AREA* MemoryArea; + NTSTATUS Status; + PEPROCESS Process; + PMMSUPPORT AddressSpace; + PVOID BaseAddress, PBaseAddress; + SIZE_T RegionSize, PRegionSize; PEPROCESS CurrentProcess = PsGetCurrentProcess(); KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); KAPC_STATE ApcState; @@ -991,15 +991,15 @@ DPRINT1("Invalid FreeType\n"); return STATUS_INVALID_PARAMETER_4; } - + /* Check if no flag was used, or if both flags were used */ if (!((FreeType & (MEM_DECOMMIT | MEM_RELEASE))) || - ((FreeType & (MEM_DECOMMIT | MEM_RELEASE)) == (MEM_DECOMMIT | MEM_RELEASE))) + ((FreeType & (MEM_DECOMMIT | MEM_RELEASE)) == (MEM_DECOMMIT | MEM_RELEASE))) { DPRINT1("Invalid FreeType combination\n"); return STATUS_INVALID_PARAMETER_4; } - + /* Enter SEH */ _SEH2_TRY { @@ -1010,7 +1010,7 @@ ProbeForWritePointer(UBaseAddress); ProbeForWriteUlong(URegionSize); } - + /* Capture their values */ PBaseAddress = *UBaseAddress; PRegionSize = *URegionSize; @@ -1021,180 +1021,180 @@ _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - + /* Make sure the allocation isn't past the user area */ if (PBaseAddress >= MM_HIGHEST_USER_ADDRESS) { DPRINT1("Virtual free base above User Space\n"); return STATUS_INVALID_PARAMETER_2; } - - /* Make sure the allocation wouldn't overflow past the user area */ - if (((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (ULONG_PTR)PBaseAddress) < PRegionSize) - { - DPRINT1("Region size would overflow into kernel-memory\n"); - return STATUS_INVALID_PARAMETER_3; - } - - /* Check if this is for the current process */ - if (ProcessHandle == NtCurrentProcess()) - { - /* We already have the current process, no need to go through Ob */ - Process = CurrentProcess; - } - else - { - /* Reference the handle for correct permissions */ - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_OPERATION, - PsProcessType, - PreviousMode, - (PVOID*)&Process, - NULL); - if (!NT_SUCCESS(Status)) return Status; - - /* Check if not running in the current process */ - if (CurrentProcess != Process) - { - /* Attach to it */ - KeStackAttachProcess(&Process->Pcb, &ApcState); - Attached = TRUE; - } - } - - BaseAddress = (PVOID)PAGE_ROUND_DOWN((PBaseAddress)); - RegionSize = PAGE_ROUND_UP((ULONG_PTR)(PBaseAddress) + (PRegionSize)) - - PAGE_ROUND_DOWN((PBaseAddress)); - - AddressSpace = &Process->Vm; - - MmLockAddressSpace(AddressSpace); - MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); - if (MemoryArea == NULL) - { - Status = STATUS_UNSUCCESSFUL; - goto unlock_deref_and_return; - } - - switch (FreeType) - { - case MEM_RELEASE: - /* We can only free a memory area in one step. */ - if (MemoryArea->StartingAddress != BaseAddress || - MemoryArea->Type != MEMORY_AREA_VIRTUAL_MEMORY) - { + + /* Make sure the allocation wouldn't overflow past the user area */ + if (((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (ULONG_PTR)PBaseAddress) < PRegionSize) + { + DPRINT1("Region size would overflow into kernel-memory\n"); + return STATUS_INVALID_PARAMETER_3; + } + + /* Check if this is for the current process */ + if (ProcessHandle == NtCurrentProcess()) + { + /* We already have the current process, no need to go through Ob */ + Process = CurrentProcess; + } + else + { + /* Reference the handle for correct permissions */ + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_OPERATION, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Check if not running in the current process */ + if (CurrentProcess != Process) + { + /* Attach to it */ + KeStackAttachProcess(&Process->Pcb, &ApcState); + Attached = TRUE; + } + } + + BaseAddress = (PVOID)PAGE_ROUND_DOWN((PBaseAddress)); + RegionSize = PAGE_ROUND_UP((ULONG_PTR)(PBaseAddress) + (PRegionSize)) - + PAGE_ROUND_DOWN((PBaseAddress)); + + AddressSpace = &Process->Vm; + + MmLockAddressSpace(AddressSpace); + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); + if (MemoryArea == NULL) + { + Status = STATUS_UNSUCCESSFUL; + goto unlock_deref_and_return; + } + + switch (FreeType) + { + case MEM_RELEASE: + /* We can only free a memory area in one step. */ + if (MemoryArea->StartingAddress != BaseAddress || + MemoryArea->Type != MEMORY_AREA_VIRTUAL_MEMORY) + { Status = STATUS_UNSUCCESSFUL; goto unlock_deref_and_return; - } - - MmFreeVirtualMemory(Process, MemoryArea); - Status = STATUS_SUCCESS; - goto unlock_deref_and_return; - - case MEM_DECOMMIT: - Status = - MmAlterRegion(AddressSpace, - MemoryArea->StartingAddress, - (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) ? - &MemoryArea->Data.SectionData.RegionListHead : - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - BaseAddress, - RegionSize, - MEM_RESERVE, - PAGE_NOACCESS, - MmModifyAttributes); - goto unlock_deref_and_return; - } - - Status = STATUS_NOT_IMPLEMENTED; - -unlock_deref_and_return: - - MmUnlockAddressSpace(AddressSpace); - if (Attached) KeUnstackDetachProcess(&ApcState); - if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); - - return(Status); + } + + MmFreeVirtualMemory(Process, MemoryArea); + Status = STATUS_SUCCESS; + goto unlock_deref_and_return; + + case MEM_DECOMMIT: + Status = + MmAlterRegion(AddressSpace, + MemoryArea->StartingAddress, + (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) ? + &MemoryArea->Data.SectionData.RegionListHead : + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + BaseAddress, + RegionSize, + MEM_RESERVE, + PAGE_NOACCESS, + MmModifyAttributes); + goto unlock_deref_and_return; + } + + Status = STATUS_NOT_IMPLEMENTED; + + unlock_deref_and_return: + + MmUnlockAddressSpace(AddressSpace); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + + return(Status); } NTSTATUS NTAPI MmProtectAnonMem(PMMSUPPORT AddressSpace, - PMEMORY_AREA MemoryArea, - PVOID BaseAddress, - SIZE_T Length, - ULONG Protect, - PULONG OldProtect) + PMEMORY_AREA MemoryArea, + PVOID BaseAddress, + SIZE_T Length, + ULONG Protect, + PULONG OldProtect) { - PMM_REGION Region; - NTSTATUS Status = STATUS_SUCCESS; - ULONG_PTR LengthCount = 0; - - /* Search all Regions in MemoryArea up to Length */ - /* Every Region up to Length must be committed for success */ - for (;;) - { - Region = MmFindRegion(MemoryArea->StartingAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - (PVOID)((ULONG_PTR)BaseAddress + LengthCount), NULL); - - /* If a Region was found and it is committed */ - if ((Region) && (Region->Type == MEM_COMMIT)) - { - LengthCount += Region->Length; - if (Length <= LengthCount) break; - continue; - } - /* If Region was found and it is not commited */ - else if (Region) - { - Status = STATUS_NOT_COMMITTED; - break; - } - /* If no Region was found at all */ - else if (LengthCount == 0) - { - Status = STATUS_INVALID_ADDRESS; - break; - } - } - - if (NT_SUCCESS(Status)) - { - *OldProtect = Region->Protect; - Status = MmAlterRegion(AddressSpace, MemoryArea->StartingAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - BaseAddress, Length, Region->Type, Protect, - MmModifyAttributes); - } - - return (Status); + PMM_REGION Region; + NTSTATUS Status = STATUS_SUCCESS; + ULONG_PTR LengthCount = 0; + + /* Search all Regions in MemoryArea up to Length */ + /* Every Region up to Length must be committed for success */ + for (;;) + { + Region = MmFindRegion(MemoryArea->StartingAddress, + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + (PVOID)((ULONG_PTR)BaseAddress + LengthCount), NULL); + + /* If a Region was found and it is committed */ + if ((Region) && (Region->Type == MEM_COMMIT)) + { + LengthCount += Region->Length; + if (Length <= LengthCount) break; + continue; + } + /* If Region was found and it is not commited */ + else if (Region) + { + Status = STATUS_NOT_COMMITTED; + break; + } + /* If no Region was found at all */ + else if (LengthCount == 0) + { + Status = STATUS_INVALID_ADDRESS; + break; + } + } + + if (NT_SUCCESS(Status)) + { + *OldProtect = Region->Protect; + Status = MmAlterRegion(AddressSpace, MemoryArea->StartingAddress, + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + BaseAddress, Length, Region->Type, Protect, + MmModifyAttributes); + } + + return (Status); } NTSTATUS NTAPI MmQueryAnonMem(PMEMORY_AREA MemoryArea, - PVOID Address, - PMEMORY_BASIC_INFORMATION Info, - PSIZE_T ResultLength) + PVOID Address, + PMEMORY_BASIC_INFORMATION Info, + PSIZE_T ResultLength) { - PMM_REGION Region; - PVOID RegionBase = NULL; - - Info->BaseAddress = (PVOID)PAGE_ROUND_DOWN(Address); - - Region = MmFindRegion(MemoryArea->StartingAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - Address, &RegionBase); - Info->BaseAddress = RegionBase; - Info->AllocationBase = MemoryArea->StartingAddress; - Info->AllocationProtect = MemoryArea->Protect; - Info->RegionSize = Region->Length; - Info->State = Region->Type; - Info->Protect = Region->Protect; - Info->Type = MEM_PRIVATE; - - *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); - return(STATUS_SUCCESS); + PMM_REGION Region; + PVOID RegionBase = NULL; + + Info->BaseAddress = (PVOID)PAGE_ROUND_DOWN(Address); + + Region = MmFindRegion(MemoryArea->StartingAddress, + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + Address, &RegionBase); + Info->BaseAddress = RegionBase; + Info->AllocationBase = MemoryArea->StartingAddress; + Info->AllocationProtect = MemoryArea->Protect; + Info->RegionSize = Region->Length; + Info->State = Region->Type; + Info->Protect = Region->Protect; + Info->Type = MEM_PRIVATE; + + *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); + return(STATUS_SUCCESS); } /* EOF */

12 years, 10 months

[ion] 54365: [KERNEL32]: Fix mailslot code to use the static unicode string in the TEB for conversion, and correctly handle failure cases to bound names to MAX_PATH as Win32 demands. Also fix timeo...

by ion＠svn.reactos.org

Author: ion Date: Sat Nov 12 18:28:16 2011 New Revision: 54365 URL: http://svn.reactos.org/svn/reactos?rev=54365&view=rev Log: [KERNEL32]: Fix mailslot code to use the static unicode string in the TEB for conversion, and correctly handle failure cases to bound names to MAX_PATH as Win32 demands. Also fix timeout conversions to use the correct timeout value for infinite timeout. [KERNEL32]: Reformat since 3-space identation is just murder. Modified: trunk/reactos/dll/win32/kernel32/client/file/mailslot.c trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/dll/win32/kernel32/client/file/mailslot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/mailslot.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/mailslot.c [iso-8859-1] Sat Nov 12 18:28:16 2011 @@ -8,216 +8,226 @@ * UPDATE HISTORY: */ -/* INCLUDES *****************************************************************/ +/* INCLUDES *******************************************************************/ #include <k32.h> #define NDEBUG #include <debug.h> -DEBUG_CHANNEL(kernel32file); - -/* FUNCTIONS ****************************************************************/ - -/* - * @implemented - */ -HANDLE WINAPI -CreateMailslotA(LPCSTR lpName, - DWORD nMaxMessageSize, - DWORD lReadTimeout, - LPSECURITY_ATTRIBUTES lpSecurityAttributes) -{ - HANDLE MailslotHandle; - UNICODE_STRING NameU; - ANSI_STRING NameA; - - RtlInitAnsiString(&NameA, (LPSTR)lpName); - RtlAnsiStringToUnicodeString(&NameU, &NameA, TRUE); - - MailslotHandle = CreateMailslotW(NameU.Buffer, - nMaxMessageSize, - lReadTimeout, - lpSecurityAttributes); - - RtlFreeUnicodeString(&NameU); - - return(MailslotHandle); -} - - -/* - * @implemented - */ -HANDLE WINAPI -CreateMailslotW(LPCWSTR lpName, - DWORD nMaxMessageSize, - DWORD lReadTimeout, - LPSECURITY_ATTRIBUTES lpSecurityAttributes) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING MailslotName; - HANDLE MailslotHandle; - NTSTATUS Status; - BOOLEAN Result; - LARGE_INTEGER DefaultTimeOut; - IO_STATUS_BLOCK Iosb; - ULONG Attributes = OBJ_CASE_INSENSITIVE; - PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; - - Result = RtlDosPathNameToNtPathName_U(lpName, - &MailslotName, - NULL, - NULL); - if (!Result) + +/* FUNCTIONS ******************************************************************/ + +/* + * @implemented + */ +HANDLE +WINAPI +CreateMailslotA(IN LPCSTR lpName, + IN DWORD nMaxMessageSize, + IN DWORD lReadTimeout, + IN LPSECURITY_ATTRIBUTES lpSecurityAttributes) +{ + PUNICODE_STRING NameU; + ANSI_STRING NameA; + NTSTATUS Status; + + NameU = &NtCurrentTeb()->StaticUnicodeString; + + RtlInitAnsiString(&NameA, (LPSTR)lpName); + Status = RtlAnsiStringToUnicodeString(NameU, &NameA, FALSE); + if (!NT_SUCCESS(Status)) + { + if (Status == STATUS_BUFFER_OVERFLOW) + { + SetLastError(ERROR_FILENAME_EXCED_RANGE); + } + else + { + BaseSetLastNTError(Status); + } + + return INVALID_HANDLE_VALUE; + } + + return CreateMailslotW(NameU->Buffer, + nMaxMessageSize, + lReadTimeout, + lpSecurityAttributes); +} + +/* + * @implemented + */ +HANDLE +WINAPI +CreateMailslotW(IN LPCWSTR lpName, + IN DWORD nMaxMessageSize, + IN DWORD lReadTimeout, + IN LPSECURITY_ATTRIBUTES lpSecurityAttributes) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING MailslotName; + HANDLE MailslotHandle; + NTSTATUS Status; + BOOLEAN Result; + LARGE_INTEGER DefaultTimeOut; + IO_STATUS_BLOCK Iosb; + ULONG Attributes = OBJ_CASE_INSENSITIVE; + PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; + + Result = RtlDosPathNameToNtPathName_U(lpName, &MailslotName, NULL, NULL); + if (!Result) + { + SetLastError(ERROR_PATH_NOT_FOUND); + return INVALID_HANDLE_VALUE; + } + + DPRINT("Mailslot name: %wZ\n", &MailslotName); + + if (lpSecurityAttributes) + { + SecurityDescriptor = lpSecurityAttributes->lpSecurityDescriptor; + if(lpSecurityAttributes->bInheritHandle) Attributes |= OBJ_INHERIT; + } + + InitializeObjectAttributes(&ObjectAttributes, + &MailslotName, + Attributes, + NULL, + SecurityDescriptor); + + if (lReadTimeout == MAILSLOT_WAIT_FOREVER) + { + /* Set the max */ + DefaultTimeOut.QuadPart = 0xFFFFFFFFFFFFFFFFLL; + } + else + { + /* Convert to NT format */ + DefaultTimeOut.QuadPart = UInt32x32To64(-10000, lReadTimeout); + } + + Status = NtCreateMailslotFile(&MailslotHandle, + GENERIC_READ | SYNCHRONIZE | WRITE_DAC, + &ObjectAttributes, + &Iosb, + FILE_WRITE_THROUGH, + 0, + nMaxMessageSize, + &DefaultTimeOut); + + if ((Status == STATUS_INVALID_DEVICE_REQUEST) || + (Status == STATUS_NOT_SUPPORTED)) + { + Status = STATUS_OBJECT_NAME_INVALID; + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, MailslotName.Buffer); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateMailslot failed (Status %x)!\n", Status); + BaseSetLastNTError(Status); + return INVALID_HANDLE_VALUE; + } + + return MailslotHandle; +} + +/* + * @implemented + */ +BOOL +WINAPI +GetMailslotInfo(IN HANDLE hMailslot, + IN LPDWORD lpMaxMessageSize, + IN LPDWORD lpNextSize, + IN LPDWORD lpMessageCount, + IN LPDWORD lpReadTimeout) +{ + FILE_MAILSLOT_QUERY_INFORMATION Buffer; + IO_STATUS_BLOCK Iosb; + NTSTATUS Status; + LARGE_INTEGER Timeout; + + Status = NtQueryInformationFile(hMailslot, + &Iosb, + &Buffer, + sizeof(FILE_MAILSLOT_QUERY_INFORMATION), + FileMailslotQueryInformation); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtQueryInformationFile failed (Status %x)!\n", Status); + BaseSetLastNTError(Status); + return FALSE; + } + + if (lpMaxMessageSize) *lpMaxMessageSize = Buffer.MaximumMessageSize; + if (lpNextSize) *lpNextSize = Buffer.NextMessageSize; + if (lpMessageCount) *lpMessageCount = Buffer.MessagesAvailable; + + if (lpReadTimeout) { - SetLastError(ERROR_PATH_NOT_FOUND); - return(INVALID_HANDLE_VALUE); + if (Buffer.ReadTimeout.QuadPart == 0xFFFFFFFFFFFFFFFFLL) + { + *lpReadTimeout = MAILSLOT_WAIT_FOREVER; + } + else + { + Timeout.QuadPart = -Buffer.ReadTimeout.QuadPart; + Timeout = RtlExtendedLargeIntegerDivide(Timeout, 10000, NULL); + if (Timeout.HighPart == 0) + { + *lpReadTimeout = Timeout.LowPart; + } + else + { + *lpReadTimeout = 0xFFFFFFFE; + } + } } - TRACE("Mailslot name: %wZ\n", &MailslotName); - - if(lpSecurityAttributes) - { - SecurityDescriptor = lpSecurityAttributes->lpSecurityDescriptor; - if(lpSecurityAttributes->bInheritHandle) - Attributes |= OBJ_INHERIT; + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +SetMailslotInfo(IN HANDLE hMailslot, + IN DWORD lReadTimeout) +{ + FILE_MAILSLOT_SET_INFORMATION Buffer; + LARGE_INTEGER Timeout; + IO_STATUS_BLOCK Iosb; + NTSTATUS Status; + + if (lReadTimeout == MAILSLOT_WAIT_FOREVER) + { + /* Set the max */ + Timeout.QuadPart = 0xFFFFFFFFFFFFFFFFLL; + } + else + { + /* Convert to NT format */ + Timeout.QuadPart = UInt32x32To64(-10000, lReadTimeout); + } + + Buffer.ReadTimeout = &Timeout; + + Status = NtSetInformationFile(hMailslot, + &Iosb, + &Buffer, + sizeof(FILE_MAILSLOT_SET_INFORMATION), + FileMailslotSetInformation); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetInformationFile failed (Status %x)!\n", Status); + BaseSetLastNTError(Status); + return FALSE; } - InitializeObjectAttributes(&ObjectAttributes, - &MailslotName, - Attributes, - NULL, - SecurityDescriptor); - - if (lReadTimeout == MAILSLOT_WAIT_FOREVER) - { - /* Set the max */ - DefaultTimeOut.LowPart = 0; - DefaultTimeOut.HighPart = 0x80000000; - } - else - { - /* Convert to NT format */ - DefaultTimeOut.QuadPart = UInt32x32To64(-10000, lReadTimeout); - } - - Status = NtCreateMailslotFile(&MailslotHandle, - GENERIC_READ | SYNCHRONIZE | WRITE_DAC, - &ObjectAttributes, - &Iosb, - FILE_WRITE_THROUGH, - 0, - nMaxMessageSize, - &DefaultTimeOut); - - if (Status == STATUS_INVALID_DEVICE_REQUEST || Status == STATUS_NOT_SUPPORTED) - { - Status = STATUS_OBJECT_NAME_INVALID; - } - - RtlFreeHeap(RtlGetProcessHeap(), - 0, - MailslotName.Buffer); - - if (!NT_SUCCESS(Status)) - { - WARN("NtCreateMailslot failed (Status %x)!\n", Status); - BaseSetLastNTError (Status); - return(INVALID_HANDLE_VALUE); - } - - return(MailslotHandle); -} - - -/* - * @implemented - */ -BOOL WINAPI -GetMailslotInfo(HANDLE hMailslot, - LPDWORD lpMaxMessageSize, - LPDWORD lpNextSize, - LPDWORD lpMessageCount, - LPDWORD lpReadTimeout) -{ - FILE_MAILSLOT_QUERY_INFORMATION Buffer; - IO_STATUS_BLOCK Iosb; - NTSTATUS Status; - - Status = NtQueryInformationFile(hMailslot, - &Iosb, - &Buffer, - sizeof(FILE_MAILSLOT_QUERY_INFORMATION), - FileMailslotQueryInformation); - if (!NT_SUCCESS(Status)) - { - WARN("NtQueryInformationFile failed (Status %x)!\n", Status); - BaseSetLastNTError (Status); - return(FALSE); - } - - if (lpMaxMessageSize != NULL) - { - *lpMaxMessageSize = Buffer.MaximumMessageSize; - } - if (lpNextSize != NULL) - { - *lpNextSize = Buffer.NextMessageSize; - } - if (lpMessageCount != NULL) - { - *lpMessageCount = Buffer.MessagesAvailable; - } - if (lpReadTimeout != NULL) - { - if (Buffer.ReadTimeout.LowPart == 0 && - Buffer.ReadTimeout.HighPart == (LONG)0x80000000) - *lpReadTimeout = MAILSLOT_WAIT_FOREVER; - else - *lpReadTimeout = (DWORD)(Buffer.ReadTimeout.QuadPart / -10000); - } - - return(TRUE); -} - - -/* - * @implemented - */ -BOOL WINAPI -SetMailslotInfo(HANDLE hMailslot, - DWORD lReadTimeout) -{ - FILE_MAILSLOT_SET_INFORMATION Buffer; - LARGE_INTEGER Timeout; - IO_STATUS_BLOCK Iosb; - NTSTATUS Status; - - if (lReadTimeout == MAILSLOT_WAIT_FOREVER) - { - /* Set the max */ - Timeout.LowPart = 0; - Timeout.HighPart = 0x80000000; - } - else - { - /* Convert to NT format */ - Timeout.QuadPart = UInt32x32To64(-10000, lReadTimeout); - } - Buffer.ReadTimeout = &Timeout; - - Status = NtSetInformationFile(hMailslot, - &Iosb, - &Buffer, - sizeof(FILE_MAILSLOT_SET_INFORMATION), - FileMailslotSetInformation); - if (!NT_SUCCESS(Status)) - { - WARN("NtSetInformationFile failed (Status %x)!\n", Status); - BaseSetLastNTError (Status); - return(FALSE); - } - - return(TRUE); + return TRUE; } /* EOF */ Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sat Nov 12 18:28:16 2011 @@ -3554,7 +3554,17 @@ Product.QuadPart = (ULONGLONG)Multiplicand * (ULONGLONG)Multiplier; return Product; } + #endif + +NTSYSAPI +LARGE_INTEGER +NTAPI +RtlExtendedLargeIntegerDivide( + IN LARGE_INTEGER Dividend, + IN ULONG Divisor, + OUT PULONG Remainder OPTIONAL +); NTSYSAPI ULONG

12 years, 10 months

← Newer
1
...
16
17
18
19
20
21
22
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2011