Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

[greatlrd] 14774: Swedish translation by Kris Engeman

by greatlrd＠svn.reactos.com

Swedish translation by Kris Engeman irc : nick "Wacko" Modified: trunk/reactos/lib/cpl/ncpa/ncpa.rc Added: trunk/reactos/lib/cpl/ncpa/sv.rc _____ Modified: trunk/reactos/lib/cpl/ncpa/ncpa.rc --- trunk/reactos/lib/cpl/ncpa/ncpa.rc 2005-04-23 14:09:44 UTC (rev 14773) +++ trunk/reactos/lib/cpl/ncpa/ncpa.rc 2005-04-23 14:14:16 UTC (rev 14774) @@ -25,3 +25,4 @@ #include "en.rc" #include "de.rc" #include "dk.rc" +#include "sv.rc" _____ Added: trunk/reactos/lib/cpl/ncpa/sv.rc --- trunk/reactos/lib/cpl/ncpa/sv.rc 2005-04-23 14:09:44 UTC (rev 14773) +++ trunk/reactos/lib/cpl/ncpa/sv.rc 2005-04-23 14:14:16 UTC (rev 14774) @@ -0,0 +1,89 @@ +/* Swedish resources by Kris "Wacko" Engeman */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT + +IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Nõtverksanslutningar" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Nõtverksanslutningar",-1,9,9,217,8 + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Lõgg till",IDC_ADD,9,100,60,14 + PUSHBUTTON "&Ta bort",IDC_REMOVE,72,100,60,14 + PUSHBUTTON "&Egenskaper",IDC_PROPERTIES,179,100,60,14 +END + +IDD_NETPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Allmõnt" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Anslut med:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP + PUSHBUTTON "&Konfigurera", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Markerade komponenter anvõnds av denna anslutning:", -1, 9, 59, 217, 8 + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + PUSHBUTTON "&Installera", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Avinstallera", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Egenskaper", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "Beskrivning", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "Komponentens beskrivning visas hõr...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "Visa ikon i meddelandefõltet nõr jag õr ansluten", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP +END + + +IDD_CARDPROPERTIES DIALOG DISCARDABLE 0, 0, 200,180 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Allmõnt" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Anslutning", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "Status:", -1, 19, 20, 60, 8 + LTEXT "Varaktighet:", -1, 19, 34, 60, 8 + LTEXT "Hastighet:", -1, 19, 48, 60, 8 + GROUPBOX "Aktivitet", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Skickat", -1, 26, 90, 60, 8 + ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20 + ICON IDI_NETSTAT, -1, 110, 85, 18, 20 + ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 + LTEXT "Mottaget", -1, 149, 90, 37, 8 + LTEXT "Paket:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + ICON IDI_VERTICAL, -1, 110, 108, 18, 20 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "&Egenskaper", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Inaktivera", IDC_ENDISABLE, 66, 150, 50, 14 +END + +IDD_TCPIPPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Allmõnt" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Du kan erhÕlla en IP-adress automatiskt om ditt nõtverk st÷djer detta. Annars mÕste du kontakta nõtverksadministrat÷ren f÷r att fÕ de korrekta instõllningarna.", -1, 9, 9, 228, 27 + CONTROL "ErhÕll en IP-adress automatiskt", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12 + GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX + CONTROL "&Anvõnd f÷ljande IP-adress:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12 + LTEXT "IP-adress:", -1, 14, 75, 135, 8 + CONTROL "",IDC_IPADDR,"SysIPAddress32",0,150,75-2,80,12 + LTEXT "Nõtmask:", -1, 14, 90, 135, 8 + CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",0,150,90-2,80,12 + LTEXT "Standard-gateway:", -1, 14, 105, 135, 8 + CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",0,150,105-2,80,12 + CONTROL "ErhÕll adress till DNS-server automatiskt", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 139, 210, 12 + GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX + CONTROL "&Anvõnd f÷ljande adress till DNS-server:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 142, 12 + LTEXT "Ínskad DNS-server:", -1, 14, 171, 135, 8 + CONTROL "",IDC_DNS1,"SysIPAddress32",0,150,171-2,80,12 + LTEXT "Alternativ DNS-server:", -1, 14, 186, 135, 8 + CONTROL "",IDC_DNS2,"SysIPAddress32",0,150,186-2,80,12 + PUSHBUTTON "&Avancerat", IDC_ADVANCED, 186, 209, 50, 14, WS_DISABLED | WS_TABSTOP +} + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Nõtverksanslutningar" + IDS_CPLSYSTEMDESCRIPTION "Konfigurerar nõtverksinstõllningar." +END

19 years, 6 months

[greatlrd] 14773: forget use lates winfile.rc

by greatlrd＠svn.reactos.com

forget use lates winfile.rc Modified: trunk/reactos/subsys/system/winefile/winefile.rc _____ Modified: trunk/reactos/subsys/system/winefile/winefile.rc --- trunk/reactos/subsys/system/winefile/winefile.rc 2005-04-23 14:01:43 UTC (rev 14772) +++ trunk/reactos/subsys/system/winefile/winefile.rc 2005-04-23 14:09:44 UTC (rev 14773) @@ -27,8 +27,9 @@ /* include localised resources */ +#include "en.rc" +#include "cz.rc" #include "de.rc" -#include "en.rc" #include "es.rc" #include "fr.rc" #include "hu.rc" @@ -37,6 +38,6 @@ #include "pt.rc" #include "ru.rc" #include "si.rc" +#include "zh.rc" #include "sv.rc" -#include "zh.rc"

19 years, 6 months

[greatlrd] 14772: Fix a bug in sv.rc so it can compile

by greatlrd＠svn.reactos.com

Fix a bug in sv.rc so it can compile and it is working now in ros Modified: trunk/reactos/subsys/system/winefile/Sv.rc Modified: trunk/reactos/subsys/system/winefile/winefile.rc _____ Modified: trunk/reactos/subsys/system/winefile/Sv.rc --- trunk/reactos/subsys/system/winefile/Sv.rc 2005-04-23 13:42:15 UTC (rev 14771) +++ trunk/reactos/subsys/system/winefile/Sv.rc 2005-04-23 14:01:43 UTC (rev 14772) @@ -24,6 +24,7 @@ /* Menu */ + IDM_WINEFILE MENU FIXED IMPURE { @@ -133,18 +134,19 @@ #endif MENUITEM "Ordna &symboler", ID_WINDOW_ARRANGE MENUITEM "&Uppdatera\tF5", ID_REFRESH - } + } + POPUP "&?" { MENUITEM "&Hjõlpavsnitt\tF1", ID_HELP MENUITEM "Hjõlp &s÷k...\tF1", ID_HELP MENUITEM "&Anvõnda hjõlpen\tF1", ID_HELP_USING MENUITEM SEPARATOR - MENUITEM "Information om &Winefile...", ID_ABOUT_WINEFILE + MENUITEM "Information om &Winefile...", ID_ABOUT /* POPUP "Info..." { MENUITEM "Info about &Wine..." , ID_ABOUT_WINE -// MENUITEM "&License..." ID_LICENSE -// MENUITEM "&NO WARRANTY" ID_NO_WARRANTY + MENUITEM "&License..." ID_LICENSE + MENUITEM "&NO WARRANTY" ID_NO_WARRANTY } */ } } _____ Modified: trunk/reactos/subsys/system/winefile/winefile.rc --- trunk/reactos/subsys/system/winefile/winefile.rc 2005-04-23 13:42:15 UTC (rev 14771) +++ trunk/reactos/subsys/system/winefile/winefile.rc 2005-04-23 14:01:43 UTC (rev 14772) @@ -37,5 +37,6 @@ #include "pt.rc" #include "ru.rc" #include "si.rc" +#include "sv.rc" #include "zh.rc"

19 years, 6 months

[greatlrd] 14771: reverit swedish translation

by greatlrd＠svn.reactos.com

reverit swedish translation Modified: trunk/reactos/subsys/system/winefile/winefile.rc _____ Modified: trunk/reactos/subsys/system/winefile/winefile.rc --- trunk/reactos/subsys/system/winefile/winefile.rc 2005-04-23 13:39:53 UTC (rev 14770) +++ trunk/reactos/subsys/system/winefile/winefile.rc 2005-04-23 13:42:15 UTC (rev 14771) @@ -37,6 +37,5 @@ #include "pt.rc" #include "ru.rc" #include "si.rc" -#include "sv.rc" #include "zh.rc"

19 years, 6 months

[ros-diffs] [greatlrd] 14770: David Nordenberg: Swedish translation, proofread by Andreas Bjerkeholt

by greatlrd＠svn.reactos.com

David Nordenberg: Swedish translation, proofread by Andreas Bjerkeholt Added: trunk/reactos/subsys/system/winefile/Sv.rc Modified: trunk/reactos/subsys/system/winefile/winefile.rc _____ Added: trunk/reactos/subsys/system/winefile/Sv.rc --- trunk/reactos/subsys/system/winefile/Sv.rc 2005-04-23 13:36:06 UTC (rev 14769) +++ trunk/reactos/subsys/system/winefile/Sv.rc 2005-04-23 13:39:53 UTC (rev 14770) @@ -0,0 +1,211 @@ +/* + * WineFile + * Swedish Language Support + * + * Copyright 2005 David Nordenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +#pragma code_page(1252) + + +/* Menu */ + +IDM_WINEFILE MENU FIXED IMPURE +{ + POPUP "&Arkiv" { + MENUITEM "&Íppna\tEnter", 101 + MENUITEM "&Flytta...\tF7", ID_FILE_MOVE + MENUITEM "&Kopiera...\tF8", 107 + MENUITEM "&I urklipp...\tF9", 118 + MENUITEM "&Ta bort\tDel", 108 + MENUITEM "&Byt namn...", 109 + MENUITEM "&Egenskaper...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "&Komprimera...", 119 + MENUITEM "Packa &upp...", 120 + MENUITEM SEPARATOR + MENUITEM "&K÷r...", ID_EXECUTE + MENUITEM "&Skriv ut...", 102 + MENUITEM "Associera...", 103 + MENUITEM SEPARATOR + MENUITEM "Skapa mapp...", 111 + MENUITEM "&S÷k...", 104 + MENUITEM "&Võlj filer...", 116 + MENUITEM SEPARATOR +#ifndef _NO_EXTENSIONS + MENUITEM "&Avsluta\tAlt+X" , ID_FILE_EXIT +#else + MENUITEM "&Avsluta", ID_FILE_EXIT +#endif + } + + POPUP "&Disk" { + MENUITEM "&Kopiera disk...", 201 + MENUITEM "&Namnge disk...", 202 + MENUITEM SEPARATOR + MENUITEM "&Formatera disk...", 203 +#ifdef _WIN95 + MENUITEM "&Skapa systemdisk...", -1 /*TODO*/ +#endif + MENUITEM SEPARATOR + MENUITEM "Anslut &Nõtverksenhet", 252 + MENUITEM "&Koppla ifrÕn Nõtverksenhet", 253 + MENUITEM SEPARATOR + MENUITEM "Dela ut...", 254 + MENUITEM "&Ta bort utdelning...", 255 + MENUITEM SEPARATOR + MENUITEM "&Võlj enhet...", 251 + } + + POPUP "&Trõd" { + MENUITEM "&Nõsta nivÕ\t+", 301 + MENUITEM "Ut÷ka &trõd\t*", 302 + MENUITEM "Ut÷ka &alla\tCtrl+*", 303 + MENUITEM "Kollapsa &trõd\t-", 304 + MENUITEM SEPARATOR + MENUITEM "&Markera undermappar", 505 + } + + POPUP "&Visa" { + MENUITEM "&Trõd och mapp", 413 + MENUITEM "Bara tr&õd", 411 + MENUITEM "Bara &mapp", 412 + MENUITEM SEPARATOR + MENUITEM "De&la", 414 + MENUITEM SEPARATOR + MENUITEM "&Namn", ID_VIEW_NAME + MENUITEM "&Alla Fildetaljer" , ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "&Vissa detaljer..." , ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "&Sortera efter namn", 404 + MENUITEM "Sortera efter t&yp", 405 + MENUITEM "Sortera efter st&orlek", 406 + MENUITEM "Sortera efter &datum", 407 + MENUITEM SEPARATOR + MENUITEM "Sortera efter &...", 409 + } + + POPUP "&Instõllningar" { + MENUITEM "&Bekrõftelse...", -1 + MENUITEM "&Teckensnitt...", ID_SELECT_FONT + MENUITEM "&Konfigurera verktygsfõlt...", -1 + MENUITEM SEPARATOR + MENUITEM "&Verktygsfõlt", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "&Enhetsfõlt", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "St&atusfõlt", ID_VIEW_STATUSBAR, CHECKED +#ifndef _NO_EXTENSIONS + MENUITEM "F&ullskõrm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN +#endif + MENUITEM SEPARATOR + MENUITEM "&Minimera vid k÷rning" , -1 + MENUITEM "&Spara õndringar vid stõngning", 511 + } + + + POPUP "&Sõkerhet" { + MENUITEM "&?tkomst..." , 605 + MENUITEM "&Loggning..." , 606 + MENUITEM "&?gare..." , 607 + } + + POPUP "&F÷nster" { + MENUITEM "Nytt &f÷nster", ID_WINDOW_NEW + MENUITEM "Íverlappande\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "Ordna &horizontellt", ID_WINDOW_TILE_HORZ + MENUITEM "Ordna &vertikalt\tCtrl+F4", ID_WINDOW_TILE_VERT +#ifndef _NO_EXTENSIONS + MENUITEM "Ordna automatiskt", ID_WINDOW_AUTOSORT +#endif + MENUITEM "Ordna &symboler", ID_WINDOW_ARRANGE + MENUITEM "&Uppdatera\tF5", ID_REFRESH + } + + POPUP "&?" { + MENUITEM "&Hjõlpavsnitt\tF1", ID_HELP + MENUITEM "Hjõlp &s÷k...\tF1", ID_HELP + MENUITEM "&Anvõnda hjõlpen\tF1", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "Information om &Winefile...", ID_ABOUT_WINEFILE +/* POPUP "Info..." { + MENUITEM "Info about &Wine..." , ID_ABOUT_WINE +// MENUITEM "&License..." ID_LICENSE +// MENUITEM "&NO WARRANTY" ID_NO_WARRANTY + } */ + } +} + + +IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "K÷r" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Kommando:" , -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + CONTROL "Som &symbol" , 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 + DEFPUSHBUTTON "OK" , 1, 158, 6, 47, 14 + PUSHBUTTON "Avbryt" , 2, 158, 23, 47, 14 + PUSHBUTTON "&Hjõlp" , 254, 158, 43, 47, 14 +} + +IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Võlj mÕl" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&S÷kvõg:" , -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK" , 1, 158, 6, 47, 14 + PUSHBUTTON "Avbryt" , 2, 158, 23, 47, 14 + PUSHBUTTON "&Blõddra" , 254, 158, 43, 47, 14 +} + +STRINGTABLE +{ + IDS_FONT_SEL_DLG_NAME "Verkstõll teckensnittsinstõllningar" + IDS_FONT_SEL_ERROR "Ett fel uppstog nõr ett nytt teckensnitt valdes." +} + +STRINGTABLE +{ + IDS_WINEFILE "Winefile" + IDS_ERROR "Fel" + IDS_ROOT_FS "root fs" + IDS_UNIXFS "unixfs" + IDS_DESKTOP "Skrivbord" + IDS_SHELL "Skal" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "Ej implementerat õnnu" + IDS_WINE "WINE" + IDS_WINE_FILE "Wine File" +} + +STRINGTABLE +{ + IDS_COL_NAME "Namn" + IDS_COL_SIZE "Storlek" + IDS_COL_CDATE "CDatum" + IDS_COL_ADATE "ADatum" + IDS_COL_MDATE "MDatum" + IDS_COL_IDX "Index/Inode" + IDS_COL_LINKS "Lõnkar" + IDS_COL_ATTR "Attribut" + IDS_COL_SEC "Sõkerhet" +} _____ Modified: trunk/reactos/subsys/system/winefile/winefile.rc --- trunk/reactos/subsys/system/winefile/winefile.rc 2005-04-23 13:36:06 UTC (rev 14769) +++ trunk/reactos/subsys/system/winefile/winefile.rc 2005-04-23 13:39:53 UTC (rev 14770) @@ -27,9 +27,8 @@ /* include localised resources */ +#include "de.rc" #include "en.rc" -#include "cz.rc" -#include "de.rc" #include "es.rc" #include "fr.rc" #include "hu.rc" @@ -38,5 +37,6 @@ #include "pt.rc" #include "ru.rc" #include "si.rc" +#include "sv.rc" #include "zh.rc"

19 years, 6 months

[greatlrd] 14769: 2005-04-07 For swedish translations in explorer

by greatlrd＠svn.reactos.com

2005-04-07 For swedish translations in explorer * David Nordenberg: Fixed & on two idetical letters and switched to codepage 1252 Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc _____ Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc --- trunk/reactos/subsys/system/explorer/explorer_intres.rc 2005-04-23 12:44:42 UTC (rev 14768) +++ trunk/reactos/subsys/system/explorer/explorer_intres.rc 2005-04-23 13:36:06 UTC (rev 14769) @@ -126,7 +126,6 @@ IDS_TITLE "ReactOS Explorer" IDS_START "?ncepe" IDS_LOGOFF "?nchide sesiunea ..." - IDS_TERMINATE "?nchide sesiunea" IDS_SHUTDOWN "Oprire calculator ..." IDS_LAUNCH "Pornire ..." IDS_START_HELP "Ajutor" @@ -584,7 +583,6 @@ IDS_TITLE "Reactos Explorer" IDS_START "Start" IDS_LOGOFF "Abmelden..." - IDS_TERMINATE "ROS Explorer beenden" IDS_SHUTDOWN "Herunterfahren..." IDS_LAUNCH "Starten..." IDS_START_HELP "Hilfe" @@ -1077,7 +1075,6 @@ IDS_TITLE "Reactos Explorer" IDS_START "Start" IDS_LOGOFF "Log Off..." - IDS_TERMINATE "Terminate ROS Explorer" IDS_SHUTDOWN "Turn Off..." IDS_LAUNCH "Run..." IDS_START_HELP "Help" @@ -1541,7 +1538,6 @@ IDS_TITLE "Reactos Explorer" IDS_START "Iniciar" IDS_LOGOFF "Salir..." - IDS_TERMINATE "Salir" IDS_SHUTDOWN "Apagar..." IDS_LAUNCH "Ejecutar..." IDS_START_HELP "Ayuda" @@ -1712,7 +1708,6 @@ IDS_TITLE "Explorateur Reactos" IDS_START "DÚmarrer" IDS_LOGOFF "DÚconnexion ..." - IDS_TERMINATE "DÚconnexion" IDS_SHUTDOWN "ArrÛter..." IDS_LAUNCH "ExÚcuter..." IDS_START_HELP "Aide" @@ -1926,7 +1921,6 @@ IDS_TITLE "Explorador do Reactos" IDS_START "Iniciar" IDS_LOGOFF "Terminar sessÒo..." - IDS_TERMINATE "Terminar ROS Explorador" IDS_SHUTDOWN "Desligar..." IDS_LAUNCH "Executar..." IDS_START_HELP "Ajuda" @@ -1988,7 +1982,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SWE) #ifdef _WIN32 LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH -#pragma code_page(850) +#pragma code_page(1252) #endif //_WIN32 //////////////////////////////////////////////////////////////////////// ///// @@ -2030,7 +2024,7 @@ POPUP "&Hjõlp" BEGIN MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ - MENUITEM "&Om Explorer...", ID_ABOUT_EXPLORER + MENUITEM "Om &Explorer...", ID_ABOUT_EXPLORER MENUITEM "Om &OS...", ID_ABOUT_WINDOWS END END @@ -2418,7 +2412,6 @@ IDS_TITLE "Reactos Explorer" IDS_START "Start" IDS_LOGOFF "Logga ut..." - IDS_TERMINATE "Logga ut" IDS_SHUTDOWN "Stõng av..." IDS_LAUNCH "K÷r..." IDS_START_HELP "Hjõlp"

19 years, 6 months

[hbirr] 14767: - Initialized the process create time.

by hbirr＠svn.reactos.com

- Initialized the process create time. - Fixed some minor bugs. Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-04-23 10:16:18 UTC (rev 14766) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-04-23 10:18:43 UTC (rev 14767) @@ -287,6 +287,8 @@ /* Clean up the Object */ DPRINT("Cleaning Process Object\n"); RtlZeroMemory(Process, sizeof(EPROCESS)); + + KeQuerySystemTime(&Process->CreateTime); /* Inherit stuff from the Parent since we now have the object created */ if (pParentProcess) @@ -387,6 +389,7 @@ /* Let's take advantage of this time to kill the reference too */ ObDereferenceObject(pParentProcess); + pParentProcess = NULL; } /* W00T! The process can now be activated */ @@ -407,23 +410,23 @@ &hProcess); if (!NT_SUCCESS(Status)) { - DPRINT1("Could not get a handle to the Process Object\n"); - ObDereferenceObject(Process); - goto exitdereferenceobjects; + DPRINT1("Could not get a handle to the Process Object\n"); + ExAcquireFastMutex(&PspActiveProcessMutex); + RemoveEntryList(&Process->ProcessListEntry); + ExReleaseFastMutex(&PspActiveProcessMutex); + ObDereferenceObject(Process); + goto exitdereferenceobjects; } - + DPRINT("Done. Returning handle: %x\n", hProcess); - if (NT_SUCCESS(Status)) + _SEH_TRY { - _SEH_TRY - { - *ProcessHandle = hProcess; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } _SEH_END; - } + *ProcessHandle = hProcess; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } _SEH_END; /* FIXME: ObGetObjectSecurity(Process, &SecurityDescriptor) SeAccessCheck

19 years, 6 months

[hbirr] 14766: Removed a wrong additional reference in IoCreateDevice.

by hbirr＠svn.reactos.com

Removed a wrong additional reference in IoCreateDevice. Modified: trunk/reactos/ntoskrnl/io/device.c _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-04-23 10:15:49 UTC (rev 14765) +++ trunk/reactos/ntoskrnl/io/device.c 2005-04-23 10:16:18 UTC (rev 14766) @@ -511,8 +511,6 @@ CreatedDeviceObject->NextDevice = DriverObject->DeviceObject; DriverObject->DeviceObject = CreatedDeviceObject; - /* Close the temporary handle, but do an extra reference first so it doesn't die */ - ObReferenceObject(CreatedDeviceObject); NtClose(TempHandle); /* Return to caller */

19 years, 6 months

[gvg] 14765: Revert freeldr back to revision 14697

by gvg＠svn.reactos.com

Revert freeldr back to revision 14697 Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/boot.S Deleted: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c Added: trunk/reactos/boot/freeldr/freeldr/fs/fsrec.h Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: trunk/reactos/boot/freeldr/freeldr/include/fs.h Deleted: trunk/reactos/boot/freeldr/freeldr/include/fsrec.h Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h Modified: trunk/reactos/boot/freeldr/freeldr/inifile/ini.h Modified: trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c Modified: trunk/reactos/boot/freeldr/freeldr/machine.c Modified: trunk/reactos/boot/freeldr/freeldr/miscboot.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S --- trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S 2005-04-23 10:14:29 UTC (rev 14764) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S 2005-04-23 10:15:49 UTC (rev 14765) @@ -47,10 +47,10 @@ .code32 /* Store the boot drive */ - movb %dl,(_i386BootDrive) + movb %dl,(_BootDrive) /* Store the boot partition */ - movb %dh,(_i386BootPartition) + movb %dh,(_BootPartition) /* GO! */ xorl %eax,%eax @@ -275,11 +275,9 @@ * other boot loaders like Grub */ -#define MB_INFO_SIZE 90 #define MB_INFO_FLAGS_OFFSET 0 #define MB_INFO_BOOT_DEVICE_OFFSET 12 #define MB_INFO_COMMAND_LINE_OFFSET 16 -#define CMDLINE_SIZE 256 /* * We want to execute at 0x8000 (to be compatible with bootsector @@ -287,6 +285,7 @@ * above 1MB. So we let Grub load us there and then relocate * ourself to 0x8000 */ +#define CMDLINE_BASE 0x7000 #define FREELDR_BASE 0x8000 #define INITIAL_BASE 0x200000 @@ -329,31 +328,6 @@ movw %dx,%ds movw %dx,%es - /* Check for valid multiboot signature */ - cmpl $MULTIBOOT_BOOTLOADER_MAGIC,%eax - jne mbfail - - /* Store multiboot info in a safe place */ - movl %ebx,%esi - movl $(mb_info + INITIAL_BASE - FREELDR_BASE),%edi - movl $MB_INFO_SIZE,%ecx - rep movsb - - /* Save commandline */ - movl MB_INFO_FLAGS_OFFSET(%ebx),%edx - testl $MB_INFO_FLAG_COMMAND_LINE,MB_INFO_FLAGS_OFFSET(%ebx) - jz mb3 - movl MB_INFO_COMMAND_LINE_OFFSET(%ebx),%esi - movl $(cmdline + INITIAL_BASE - FREELDR_BASE),%edi - movl $CMDLINE_SIZE,%ecx -mb2: lodsb - stosb - testb %al,%al - jz mb3 - dec %ecx - jnz mb2 -mb3: - /* Copy to low mem */ movl $INITIAL_BASE,%esi movl $FREELDR_BASE,%edi @@ -368,8 +342,8 @@ /* Clear prefetch queue & correct CS, * jump to low mem */ - ljmp $PMODE_CS, $mb4 -mb4: + ljmp $PMODE_CS, $mb2 +mb2: /* Reload segment selectors */ movw $PMODE_DS,%dx movw %dx,%ds @@ -379,28 +353,39 @@ movw %dx,%ss movl $STACK32ADDR,%esp - movl $mb_info,%ebx + /* Check for valid multiboot signature */ + cmpl $MULTIBOOT_BOOTLOADER_MAGIC,%eax + jne mbfail + /* See if the boot device was passed in */ movl MB_INFO_FLAGS_OFFSET(%ebx),%edx testl $MB_INFO_FLAG_BOOT_DEVICE,%edx - jz mb5 + jz mb3 /* Retrieve boot device info */ movl MB_INFO_BOOT_DEVICE_OFFSET(%ebx),%eax shrl $16,%eax incb %al - movb %al,_i386BootPartition - movb %ah,_i386BootDrive - jmp mb6 -mb5: /* No boot device known, assume first partition of first harddisk */ - movb $0x80,_i386BootDrive - movb $1,_i386BootPartition -mb6: - /* Check for command line */ - mov $cmdline,%eax - testl $MB_INFO_FLAG_COMMAND_LINE,MB_INFO_FLAGS_OFFSET(%ebx) - jnz mb7 + movb %al,_BootPartition + movb %ah,_BootDrive + jmp mb4 +mb3: /* No boot device known, assume first partition of first harddisk */ + movb $0x80,_BootDrive + movb $1,_BootPartition +mb4: + + /* Check for a command line */ xorl %eax,%eax -mb7: + testl $MB_INFO_FLAG_COMMAND_LINE,%edx + jz mb6 + /* Copy command line to low mem*/ + movl MB_INFO_COMMAND_LINE_OFFSET(%ebx),%esi + movl $CMDLINE_BASE,%edi +mb5: lodsb + stosb + testb %al,%al + jnz mb5 + movl $CMDLINE_BASE,%eax +mb6: /* GO! */ pushl %eax @@ -477,15 +462,8 @@ .word 0x3ff /* Limit */ .long 0 /* Base Address */ -EXTERN(_i386BootDrive) +EXTERN(_BootDrive) .long 0 -EXTERN(_i386BootPartition) +EXTERN(_BootPartition) .long 0 - -.bss -mb_info: - .fill MB_INFO_SIZE, 1, 0 - -cmdline: - .fill CMDLINE_SIZE, 1, 0 _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c 2005-04-23 10:14:29 UTC (rev 14764) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c 2005-04-23 10:15:49 UTC (rev 14765) @@ -27,7 +27,7 @@ #include "rtl.h" VOID -MachInit(char *CmdLine) +MachInit(VOID) { ULONG PciId; @@ -39,11 +39,11 @@ PciId = READ_PORT_ULONG((ULONG*) 0xcfc); if (0x02a510de == PciId) { - XboxMachInit(CmdLine); + XboxMachInit(); } else { - PcMachInit(CmdLine); + PcMachInit(); } HalpCalibrateStallExecution(); _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/boot.S --- trunk/reactos/boot/freeldr/freeldr/arch/i386/boot.S 2005-04-23 10:14:29 UTC (rev 14764) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/boot.S 2005-04-23 10:15:49 UTC (rev 14765) @@ -31,7 +31,7 @@ .code16 /* Set the boot drive */ - movb (_i386BootDrive),%dl + movb (_BootDrive),%dl /* Load segment registers */ cli _____ Deleted: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386.h --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386.h 2005-04-23 10:14:29 UTC (rev 14764) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386.h 2005-04-23 10:15:49 UTC (rev 14765) @@ -1,40 +0,0 @@ -/* - * FreeLoader - * - * Copyright (C) 2003 Eric Kohl - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#ifndef __I386_I386_H_ -#define __I386_I386_H_ - - -extern ULONG i386BootDrive; -extern ULONG i386BootPartition; - -extern BOOL i386DiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, - PULONGLONG SectorCount, int *FsType); -extern BOOL i386DiskGetSystemVolume(char *SystemPath, char *RemainingPath, - PULONG Device, PULONG DriveNumber, - PULONGLONG StartSector, - PULONGLONG SectorCount, int *FsType); -extern BOOL i386DiskGetBootPath(char *BootPath, unsigned Size); -extern VOID i386DiskGetBootDevice(PULONG BootDevice); -extern BOOL i386DiskBootingFromFloppy(VOID); - -#endif /* __I386_I386_H_ */ - -/* EOF */ _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c 2005-04-23 10:14:29 UTC (rev 14764) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c 2005-04-23 10:15:49 UTC (rev 14765) @@ -19,8 +19,6 @@ #include "freeldr.h" #include "debug.h" -#include "i386.h" -#include "fsrec.h" //////////////////////////////////////////////////////////////////////// ///////////////////// // FUNCTIONS @@ -168,244 +166,4 @@ return TRUE; } -BOOL i386DiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType) -{ - PARTITION_TABLE_ENTRY PartitionTableEntry; - UCHAR VolumeType; - - DbgPrint((DPRINT_FILESYSTEM, "FsOpenVolume() DriveNumber: 0x%x PartitionNumber: 0x%x\n", i386BootDrive, i386BootPartition)); - - // Check and see if it is a floppy drive - // If so then just assume FAT12 file system type - if (DiskIsDriveRemovable(i386BootDrive)) - { - DbgPrint((DPRINT_FILESYSTEM, "Drive is a floppy diskette drive. Assuming FAT12 file system.\n")); - - *DriveNumber = i386BootDrive; - *StartSector = 0; - *SectorCount = 2 * 80 * 18; /* FIXME hardcoded for 1.44 Mb */ - *FsType = FS_FAT; - return TRUE; - } - - // Check for ISO9660 file system type - if (i386BootDrive >= 0x80 && FsRecIsIso9660(i386BootDrive)) - { - DbgPrint((DPRINT_FILESYSTEM, "Drive is a cdrom drive. Assuming ISO-9660 file system.\n")); - - *DriveNumber = i386BootDrive; - *StartSector = 0; - *SectorCount = 0; - *FsType = FS_ISO9660; - return TRUE; - } - - // Get the requested partition entry - if (i386BootPartition == 0) - { - // Partition requested was zero which means the boot partition - if (! DiskGetActivePartitionEntry(i386BootDrive, &PartitionTableEntry)) - { - return FALSE; - } - } - else - { - // Get requested partition - if (! MachDiskGetPartitionEntry(i386BootDrive, i386BootPartition, &PartitionTableEntry)) - { - return FALSE; - } - } - - // Check for valid partition - if (PartitionTableEntry.SystemIndicator == PARTITION_ENTRY_UNUSED) - { - return FALSE; - } - - // Try to recognize the file system - if (!FsRecognizeVolume(i386BootDrive, PartitionTableEntry.SectorCountBeforePartition, &VolumeType)) - { - return FALSE; - } - - *DriveNumber = i386BootDrive; - *StartSector = PartitionTableEntry.SectorCountBeforePartition; - *SectorCount = PartitionTableEntry.PartitionSectorCount; - - //switch (PartitionTableEntry.SystemIndicator) - switch (VolumeType) - { - case PARTITION_FAT_12: - case PARTITION_FAT_16: - case PARTITION_HUGE: - case PARTITION_XINT13: - case PARTITION_FAT32: - case PARTITION_FAT32_XINT13: - *FsType = FS_FAT; - return TRUE; - case PARTITION_EXT2: - *FsType = FS_EXT2; - return TRUE; - case PARTITION_NTFS: - *FsType = FS_NTFS; - return TRUE; - default: - *FsType = 0; - return FALSE; - } - - return TRUE; -} - -VOID -i386DiskGetBootDevice(PULONG BootDevice) -{ - ((char *)BootDevice)[0] = (char)i386BootDrive; - ((char *)BootDevice)[1] = (char)i386BootPartition; -} - -BOOL -i386DiskBootingFromFloppy(VOID) -{ - return i386BootDrive < 0x80; -} - -#define IsRecognizedPartition(P) \ - ((P) == PARTITION_FAT_12 || \ - (P) == PARTITION_FAT_16 || \ - (P) == PARTITION_HUGE || \ - (P) == PARTITION_IFS || \ - (P) == PARTITION_EXT2 || \ - (P) == PARTITION_FAT32 || \ - (P) == PARTITION_FAT32_XINT13 || \ - (P) == PARTITION_XINT13) - -BOOL i386DiskGetSystemVolume(char *SystemPath, - char *RemainingPath, - PULONG Device, - PULONG DriveNumber, - PULONGLONG StartSector, - PULONGLONG SectorCount, - int *FsType) -{ - ULONG PartitionNumber; - PARTITION_TABLE_ENTRY PartitionTableEntry; - UCHAR VolumeType; - CHAR BootPath[256]; - unsigned i, RosPartition; - - /* - * Verify system path - */ - if (!DissectArcPath(SystemPath, BootPath, DriveNumber, &PartitionNumber)) - { - return FALSE; - } - if (NULL != RemainingPath) - { - strcpy(RemainingPath, BootPath); - } - - /* 0xff -> no partition table present, use whole device */ - if (0xff == PartitionNumber) - { - PartitionTableEntry.SectorCountBeforePartition = 0; - i = 0xff; - } - else - { - /* recalculate the boot partition for freeldr */ - i = 0; - RosPartition = 0; - while (1) - { - if (!MachDiskGetPartitionEntry(*DriveNumber, ++i, &PartitionTableEntry)) - { - return FALSE; - } - if (IsRecognizedPartition(PartitionTableEntry.SystemIndicator)) - { - if (++RosPartition == PartitionNumber) - { - break; - } - } - } - } - - /* Check for ISO9660 file system type */ - if (*DriveNumber >= 0x80 && FsRecIsIso9660(*DriveNumber)) - { - DbgPrint((DPRINT_FILESYSTEM, "Drive is a cdrom drive. Assuming ISO-9660 file system.\n")); - - if (NULL != Device) - { - ((char *)Device)[0] = (char)(*DriveNumber); - ((char *)Device)[1] = (char)i; - } - *StartSector = 0; - *SectorCount = 0; - *FsType = FS_ISO9660; - return TRUE; - } - - if (!FsRecognizeVolume(*DriveNumber, PartitionTableEntry.SectorCountBeforePartition, &VolumeType)) - { - return FALSE; - } - - if (NULL != Device) - { - ((char *)Device)[0] = (char)(*DriveNumber); - ((char *)Device)[1] = (char)i; - } - *StartSector = PartitionTableEntry.SectorCountBeforePartition; - *SectorCount = PartitionTableEntry.PartitionSectorCount; - - switch (VolumeType) - { - case PARTITION_FAT_12: - case PARTITION_FAT_16: - case PARTITION_HUGE: - case PARTITION_XINT13: - case PARTITION_FAT32: - case PARTITION_FAT32_XINT13: - *FsType = FS_FAT; - return TRUE; - case PARTITION_EXT2: - *FsType = FS_EXT2; - return TRUE; - case PARTITION_NTFS: - *FsType = FS_NTFS; - return TRUE; - default: - *FsType = 0; - return FALSE; - } - - return FALSE; -} - -BOOL -i386DiskGetBootPath(char *BootPath, unsigned Size) -{ - static char Path[] = "multi(0)disk(0)"; - char Device[4]; - - itoa(i386BootDrive, Device, 10); - if (Size <= sizeof(Path) + 6 + strlen(Device)) - { - return FALSE; - } - strcpy(BootPath, Path); - strcat(BootPath, MachDiskBootingFromFloppy() ? "fdisk" : "cdrom"); - strcat(strcat(strcat(BootPath, "("), Device), ")"); - - return TRUE; -} - -#endif /* defined __i386__ */ - -/* EOF */ +#endif // defined __i386__ _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.S --- trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.S 2005-04-23 10:14:29 UTC (rev 14764) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.S 2005-04-23 10:15:49 UTC (rev 14765) @@ -30,7 +30,7 @@ .code16 /* Set the boot drive */ - movb (_i386BootDrive),%dl + movb (_BootDrive),%dl /* Load segment registers */ cli @@ -66,7 +66,7 @@ .code16 /* Set the boot drive */ - movb (_i386BootDrive),%dl + movb (_BootDrive),%dl /* Load segment registers */ cli _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c 2005-04-23 10:14:29 UTC (rev 14764) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c 2005-04-23 10:15:49 UTC (rev 14765) @@ -23,10 +23,9 @@ #include "machine.h" #include "machpc.h" #include "rtl.h" -#include "i386.h" VOID -PcMachInit(char *CmdLine) +PcMachInit(VOID) { EnableA20(); @@ -49,11 +48,6 @@ MachVtbl.VideoSync = PcVideoSync; MachVtbl.VideoPrepareForReactOS = PcVideoPrepareForReactOS; MachVtbl.GetMemoryMap = PcMemGetMemoryMap; - MachVtbl.DiskGetBootVolume = i386DiskGetBootVolume; - MachVtbl.DiskGetSystemVolume = i386DiskGetSystemVolume; - MachVtbl.DiskGetBootPath = i386DiskGetBootPath; - MachVtbl.DiskGetBootDevice = i386DiskGetBootDevice; - MachVtbl.DiskBootingFromFloppy = i386DiskBootingFromFloppy; MachVtbl.DiskReadLogicalSectors = PcDiskReadLogicalSectors; MachVtbl.DiskGetPartitionEntry = PcDiskGetPartitionEntry; MachVtbl.DiskGetDriveGeometry = PcDiskGetDriveGeometry; _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h 2005-04-23 10:14:29 UTC (rev 14764) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h 2005-04-23 10:15:49 UTC (rev 14765) @@ -26,7 +26,7 @@ #include "mm.h" #endif -VOID PcMachInit(char *CmdLine); +VOID PcMachInit(VOID); VOID PcConsPutChar(int Ch); BOOL PcConsKbHit(); _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c 2005-04-23 10:14:29 UTC (rev 14764) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c 2005-04-23 10:15:49 UTC (rev 14765) @@ -21,10 +21,9 @@ #include "mm.h" #include "machine.h" #include "machxbox.h" -#include "i386.h" VOID -XboxMachInit(char *CmdLine) +XboxMachInit(VOID) { /* Initialize our stuff */ XboxMemInit(); @@ -47,11 +46,6 @@ MachVtbl.VideoSync = XboxVideoSync; MachVtbl.VideoPrepareForReactOS = XboxVideoPrepareForReactOS; MachVtbl.GetMemoryMap = XboxMemGetMemoryMap; - MachVtbl.DiskGetBootVolume = i386DiskGetBootVolume; - MachVtbl.DiskGetSystemVolume = i386DiskGetSystemVolume; - MachVtbl.DiskGetBootPath = i386DiskGetBootPath; - MachVtbl.DiskGetBootDevice = i386DiskGetBootDevice; - MachVtbl.DiskBootingFromFloppy = i386DiskBootingFromFloppy; MachVtbl.DiskReadLogicalSectors = XboxDiskReadLogicalSectors; MachVtbl.DiskGetPartitionEntry = XboxDiskGetPartitionEntry; MachVtbl.DiskGetDriveGeometry = XboxDiskGetDriveGeometry; _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h 2005-04-23 10:14:29 UTC (rev 14764) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h 2005-04-23 10:15:49 UTC (rev 14765) @@ -26,7 +26,7 @@ UCHAR XboxFont8x16[256 * 16]; -VOID XboxMachInit(char *CmdLine); +VOID XboxMachInit(VOID); VOID XboxConsPutChar(int Ch); BOOL XboxConsKbHit(); _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c 2005-04-23 10:14:29 UTC (rev 14764) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c 2005-04-23 10:15:49 UTC (rev 14765) @@ -279,7 +279,7 @@ BootMain("freeldr-ppc"); } -void MachInit(char *CmdLine) { +void MachInit() { int len; printf( "Determining boot device:\n" ); len = ofw_getprop(chosen_package, "bootpath", _____ Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c 2005-04-23 10:14:29 UTC (rev 14764) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c 2005-04-23 10:15:49 UTC (rev 14765) @@ -49,13 +49,6 @@ LONG TimeOut; ULONG SelectedOperatingSystem; - if (!FsOpenBootVolume()) - { - printf("Error opening boot partition for file access.\n"); - MachConsGetCh(); - return; - } - if (!IniFileInitialize()) { printf("Press any key to reboot.\n"); _____ Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c --- trunk/reactos/boot/freeldr/freeldr/disk/partition.c 2005-04-23 10:14:29 UTC (rev 14764) +++ trunk/reactos/boot/freeldr/freeldr/disk/partition.c 2005-04-23 10:15:49 UTC (rev 14765) @@ -28,8 +28,7 @@ BOOL DiskGetActivePartitionEntry(ULONG DriveNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry) { - ULONG BootablePartitionCount = 0; - ULONG ActivePartition = 0; + ULONG BootablePartitionCount = 0; MASTER_BOOT_RECORD MasterBootRecord; // Read master boot record @@ -42,22 +41,22 @@ if (MasterBootRecord.PartitionTable[0].BootIndicator == 0x80) { BootablePartitionCount++; - ActivePartition = 0; + BootPartition = 0; } if (MasterBootRecord.PartitionTable[1].BootIndicator == 0x80) { BootablePartitionCount++; - ActivePartition = 1; + BootPartition = 1; } if (MasterBootRecord.PartitionTable[2].BootIndicator == 0x80) { BootablePartitionCount++; - ActivePartition = 2; + BootPartition = 2; } if (MasterBootRecord.PartitionTable[3].BootIndicator == 0x80) { BootablePartitionCount++; - ActivePartition = 3; + BootPartition = 3; } // Make sure there was only one bootable partition @@ -73,7 +72,7 @@ } // Copy the partition table entry - RtlCopyMemory(PartitionTableEntry, &MasterBootRecord.PartitionTable[ActivePartition], sizeof(PARTITION_TABLE_ENTRY)); + RtlCopyMemory(PartitionTableEntry, &MasterBootRecord.PartitionTable[BootPartition], sizeof(PARTITION_TABLE_ENTRY)); return TRUE; } _____ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c --- trunk/reactos/boot/freeldr/freeldr/freeldr.c 2005-04-23 10:14:29 UTC (rev 14764) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c 2005-04-23 10:15:49 UTC (rev 14765) @@ -31,7 +31,7 @@ { CmdLineParse(CmdLine); - MachInit(CmdLine); + MachInit(); DebugInit(); _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c --- trunk/reactos/boot/freeldr/freeldr/fs/fs.c 2005-04-23 10:14:29 UTC (rev 14764) +++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c 2005-04-23 10:15:49 UTC (rev 14765) @@ -51,78 +51,110 @@ /* * - * BOOL FsOpenVolume(ULONG DriveNumber, ULONGLONG StartSector, ULONGLONG SectorCount, int Type); + * BOOL FsOpenVolume(ULONG DriveNumber, ULONG PartitionNumber); * * This function is called to open a disk volume for file access. * It must be called before any of the file functions will work. + * It takes two parameters: * + * Drive: The BIOS drive number of the disk to open + * Partition: This is zero for floppy drives. + * If the disk is a hard disk then this specifies + * The partition number to open (1 - 4) + * If it is zero then it opens the active (bootable) partition + * */ -static BOOL FsOpenVolume(ULONG DriveNumber, ULONGLONG StartSector, ULONGLONG SectorCount, int Type) +BOOL FsOpenVolume(ULONG DriveNumber, ULONG PartitionNumber) { - UCHAR ErrorText[80]; + PARTITION_TABLE_ENTRY PartitionTableEntry; + UCHAR ErrorText[80]; + UCHAR VolumeType; - FsType = Type; + DbgPrint((DPRINT_FILESYSTEM, "FsOpenVolume() DriveNumber: 0x%x PartitionNumber: 0x%x\n", DriveNumber, PartitionNumber)); - switch (FsType) + // Check and see if it is a floppy drive + // If so then just assume FAT12 file system type + if (DiskIsDriveRemovable(DriveNumber)) { - case FS_FAT: - return FatOpenVolume(DriveNumber, StartSector, SectorCount); - case FS_EXT2: - return Ext2OpenVolume(DriveNumber, StartSector); - case FS_NTFS: - return NtfsOpenVolume(DriveNumber, StartSector); - case FS_ISO9660: + DbgPrint((DPRINT_FILESYSTEM, "Drive is a floppy diskette drive. Assuming FAT12 file system.\n")); + + FsType = FS_FAT; + return FatOpenVolume(DriveNumber, 0, 0); + } + + // Check for ISO9660 file system type + if (DriveNumber >= 0x80 && FsRecIsIso9660(DriveNumber)) + { + DbgPrint((DPRINT_FILESYSTEM, "Drive is a cdrom drive. Assuming ISO-9660 file system.\n")); + + FsType = FS_ISO9660; return IsoOpenVolume(DriveNumber); - default: - FsType = 0; - sprintf(ErrorText, "Unsupported file system. Type: 0x%x", Type); - FileSystemError(ErrorText); } - return FALSE; -} -/* - * - * BOOL FsOpenBootVolume() - * - * This function is called to open the boot disk volume for file access. - * It must be called before any of the file functions will work. - */ -BOOL FsOpenBootVolume() -{ - ULONG DriveNumber; - ULONGLONG StartSector; - ULONGLONG SectorCount; - int Type; + // Set the boot partition + BootPartition = PartitionNumber; - if (! MachDiskGetBootVolume(&DriveNumber, &StartSector, &SectorCount, &Type)) + // Get the requested partition entry + if (PartitionNumber == 0) { - FileSystemError("Unable to locate boot partition\n"); + // Partition requested was zero which means the boot partition + if (DiskGetActivePartitionEntry(DriveNumber, &PartitionTableEntry) == FALSE) + { + FileSystemError("No active partition."); + return FALSE; + } + } + else + { + // Get requested partition + if (MachDiskGetPartitionEntry(DriveNumber, PartitionNumber, &PartitionTableEntry) == FALSE) + { + FileSystemError("Partition not found."); + return FALSE; + } + } + + // Check for valid partition + if (PartitionTableEntry.SystemIndicator == PARTITION_ENTRY_UNUSED) + { + FileSystemError("Invalid partition."); return FALSE; } - return FsOpenVolume(DriveNumber, StartSector, SectorCount, Type); -} + // Try to recognize the file system + if (!FsRecognizeVolume(DriveNumber, PartitionTableEntry.SectorCountBeforePartition, &VolumeType)) + { + FileSystemError("Unrecognized file system."); + return FALSE; + } -BOOL FsOpenSystemVolume(char *SystemPath, char *RemainingPath, PULONG Device) -{ - ULONG DriveNumber; - ULONGLONG StartSector; - ULONGLONG SectorCount; - int Type; - - if (! MachDiskGetSystemVolume(SystemPath, RemainingPath, Device, - &DriveNumber, &StartSector, &SectorCount, - &Type)) + //switch (PartitionTableEntry.SystemIndicator) + switch (VolumeType) { - FileSystemError("Unable to locate system partition\n"); + case PARTITION_FAT_12: + case PARTITION_FAT_16: + case PARTITION_HUGE: + case PARTITION_XINT13: + case PARTITION_FAT32: + case PARTITION_FAT32_XINT13: + FsType = FS_FAT; + return FatOpenVolume(DriveNumber, PartitionTableEntry.SectorCountBeforePartition, PartitionTableEntry.PartitionSectorCount); + case PARTITION_EXT2: + FsType = FS_EXT2; + return Ext2OpenVolume(DriveNumber, PartitionTableEntry.SectorCountBeforePartition); + case PARTITION_NTFS: + FsType = FS_NTFS; + return NtfsOpenVolume(DriveNumber, PartitionTableEntry.SectorCountBeforePartition); + default: + FsType = 0; + sprintf(ErrorText, "Unsupported file system. Type: 0x%x", VolumeType); + FileSystemError(ErrorText); return FALSE; } - return FsOpenVolume(DriveNumber, StartSector, SectorCount, Type); + return TRUE; } - PFILE FsOpenFile(PUCHAR FileName) { PFILE FileHandle = NULL; _____ Copied: trunk/reactos/boot/freeldr/freeldr/fs/fsrec.h (from rev 14697, trunk/reactos/boot/freeldr/freeldr/fs/fsrec.h) Property changes on: trunk/reactos/boot/freeldr/freeldr/fs/fsrec.h ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h 2005-04-23 10:14:29 UTC (rev 14764) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h 2005-04-23 10:15:49 UTC (rev 14765) @@ -38,6 +38,8 @@ #define ROUND_DOWN(N, S) ((N) & ~((S) - 1)) #define Ke386EraseFlags(x) __asm__ __volatile__("pushl $0 ; popfl\n") +extern ULONG BootDrive; /* BIOS boot drive, 0-A:, 1-B:, 0x80-C:, 0x81-D:, etc. */ +extern ULONG BootPartition; /* Boot Partition, 1-4 */ extern BOOL UserInterfaceUp; /* Tells us if the user interface is displayed */ VOID BootMain(LPSTR CmdLine); _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/fs.h --- trunk/reactos/boot/freeldr/freeldr/include/fs.h 2005-04-23 10:14:29 UTC (rev 14764) +++ trunk/reactos/boot/freeldr/freeldr/include/fs.h 2005-04-23 10:15:49 UTC (rev 14765) @@ -33,8 +33,7 @@ #define PFILE FILE * VOID FileSystemError(PUCHAR ErrorString); -BOOL FsOpenBootVolume(); -BOOL FsOpenSystemVolume(char *SystemPath, char *RemainingPath, PULONG BootDevice); +BOOL FsOpenVolume(ULONG DriveNumber, ULONG PartitionNumber); PFILE FsOpenFile(PUCHAR FileName); VOID FsCloseFile(PFILE FileHandle); BOOL FsReadFile(PFILE FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer); _____ Deleted: trunk/reactos/boot/freeldr/freeldr/include/fsrec.h --- trunk/reactos/boot/freeldr/freeldr/include/fsrec.h 2005-04-23 10:14:29 UTC (rev 14764) +++ trunk/reactos/boot/freeldr/freeldr/include/fsrec.h 2005-04-23 10:15:49 UTC (rev 14765) @@ -1,29 +0,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#ifndef __FSREC_H -#define __FSREC_H - -BOOL FsRecognizeVolume(ULONG DriveNumber, ULONG VolumeStartSector, UCHAR* VolumeType); -BOOL FsRecIsIso9660(ULONG DriveNumber); -BOOL FsRecIsExt2(ULONG DriveNumber, ULONG VolumeStartSector); -BOOL FsRecIsFat(ULONG DriveNumber, ULONG VolumeStartSector); -BOOL FsRecIsNtfs(ULONG DriveNumber, ULONG VolumeStartSector); - -#endif // #defined __FSREC_H _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h --- trunk/reactos/boot/freeldr/freeldr/include/machine.h 2005-04-23 10:14:29 UTC (rev 14764) +++ trunk/reactos/boot/freeldr/freeldr/include/machine.h 2005-04-23 10:15:49 UTC (rev 14765) @@ -56,11 +56,6 @@ ULONG (*GetMemoryMap)(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize); - BOOL (*DiskGetBootVolume)(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType); - BOOL (*DiskGetSystemVolume)(char *SystemPath, char *RemainingPath, PULONG Device, PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType); - BOOL (*DiskGetBootPath)(char *BootPath, unsigned Size); - VOID (*DiskGetBootDevice)(PULONG BootDevice); - BOOL (*DiskBootingFromFloppy)(VOID); BOOL (*DiskReadLogicalSectors)(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); BOOL (*DiskGetPartitionEntry)(ULONG DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); BOOL (*DiskGetDriveGeometry)(ULONG DriveNumber, PGEOMETRY DriveGeometry); @@ -71,7 +66,7 @@ VOID (*HwDetect)(VOID); } MACHVTBL, *PMACHVTBL; -VOID MachInit(char *CmdLine); +VOID MachInit(VOID); extern MACHVTBL MachVtbl; @@ -92,11 +87,6 @@ #define MachVideoSync() MachVtbl.VideoSync() #define MachVideoPrepareForReactOS() MachVtbl.VideoPrepareForReactOS() #define MachGetMemoryMap(MMap, Size) MachVtbl.GetMemoryMap((MMap), (Size)) -#define MachDiskGetBootVolume(Drv, Start, Cnt, FsType) MachVtbl.DiskGetBootVolume((Drv), (Start), (Cnt), (FsType)) -#define MachDiskGetSystemVolume(SysPath, RemPath, Dev, Drv, Start, Cnt, FsType) MachVtbl.DiskGetSystemVolume((SysPath), (RemPath), (Dev), (Drv), (Start), (Cnt), (FsType)) -#define MachDiskGetBootPath(Path, Size) MachVtbl.DiskGetBootPath((Path), (Size)) -#define MachDiskGetBootDevice(BootDevice) MachVtbl.DiskGetBootDevice(BootDevice) -#define MachDiskBootingFromFloppy() MachVtbl.DiskBootingFromFloppy() #define MachDiskReadLogicalSectors(Drive, Start, Count, Buf) MachVtbl.DiskReadLogicalSectors((Drive), (Start), (Count), (Buf)) #define MachDiskGetPartitionEntry(Drive, Part, Entry) MachVtbl.DiskGetPartitionEntry((Drive), (Part), (Entry)) #define MachDiskGetDriveGeometry(Drive, Geom) MachVtbl.DiskGetDriveGeometry((Drive), (Geom)) _____ Modified: trunk/reactos/boot/freeldr/freeldr/inifile/ini.h --- trunk/reactos/boot/freeldr/freeldr/inifile/ini.h 2005-04-23 10:14:29 UTC (rev 14764) +++ trunk/reactos/boot/freeldr/freeldr/inifile/ini.h 2005-04-23 10:15:49 UTC (rev 14765) @@ -57,7 +57,7 @@ extern ULONG IniFileSectionCount; extern ULONG IniFileSettingCount; -PFILE IniOpenIniFile(); +PFILE IniOpenIniFile(UCHAR BootDriveNumber, UCHAR BootPartitionNumber); BOOL IniParseFile(PUCHAR IniFileData, ULONG IniFileSize); ULONG IniGetNextLineSize(PUCHAR IniFileData, ULONG IniFileSize, ULONG CurrentOffset); _____ Modified: trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c --- trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c 2005-04-23 10:14:29 UTC (rev 14764) +++ trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c 2005-04-23 10:15:49 UTC (rev 14765) @@ -33,8 +33,23 @@ BOOL Success; // Open freeldr.ini - Freeldr_Ini = IniOpenIniFile(); + // BootDrive & BootPartition are passed + // in from the boot sector code in the + // DL & DH registers. + Freeldr_Ini = IniOpenIniFile(BootDrive, BootPartition); + // If we couldn't open freeldr.ini on the partition + // they specified in the boot sector then try + // opening the active (boot) partition. + if ((Freeldr_Ini == NULL) && (BootPartition != 0)) + { + BootPartition = 0; + + Freeldr_Ini = IniOpenIniFile(BootDrive, BootPartition); + + return FALSE; + } [truncated at 1000 lines; 544 more skipped]

19 years, 6 months

[hbirr] 14764: Do not remove an entry from the parent for twice.

by hbirr＠svn.reactos.com

Do not remove an entry from the parent for twice. Modified: trunk/reactos/ntoskrnl/ob/namespc.c _____ Modified: trunk/reactos/ntoskrnl/ob/namespc.c --- trunk/reactos/ntoskrnl/ob/namespc.c 2005-04-23 10:11:37 UTC (rev 14763) +++ trunk/reactos/ntoskrnl/ob/namespc.c 2005-04-23 10:14:29 UTC (rev 14764) @@ -221,7 +221,11 @@ DPRINT("ObpRemoveEntryDirectory(Header %x)\n",Header); KeAcquireSpinLock(&(Header->Parent->Lock),&oldlvl); - RemoveEntryList(&(Header->Entry)); + if (Header->Entry.Flink && Header->Entry.Blink) + { + RemoveEntryList(&(Header->Entry)); + Header->Entry.Flink = Header->Entry.Blink = NULL; + } KeReleaseSpinLock(&(Header->Parent->Lock),oldlvl); }

19 years, 6 months

← Newer
1
...
9
10
11
12
13
14
15
...
48
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 April 2005