Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 23313: patch from LMH1 : Bug#: 1682 : Norwegian translation note : sm are not include in building process, the source code have got begin to be rotten, it can not longer be build. shall we delete it ? or shall some look into and make it work again, I am not voluntary todo either of it. some else for todo that.
by greatlrd＠svn.reactos.org 27 Jul '06

27 Jul '06

Author: greatlrd Date: Thu Jul 27 12:35:46 2006 New Revision: 23313 URL: http://svn.reactos.org/svn/reactos?rev=23313&view=rev Log: patch from LMH1 : Bug#: 1682 : Norwegian translation note : sm are not include in building process, the source code have got begin to be rotten, it can not longer be build. shall we delete it ? or shall some look into and make it work again, I am not voluntary todo either of it. some else for todo that. Modified: trunk/reactos/base/applications/sm/sm.rc Modified: trunk/reactos/base/applications/sm/sm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sm/sm.rc… ============================================================================== --- trunk/reactos/base/applications/sm/sm.rc (original) +++ trunk/reactos/base/applications/sm/sm.rc Thu Jul 27 12:35:46 2006 @@ -8,4 +8,6 @@ #include "De.rc" #include "Ja.rc" #include "Hu.rc" +#include "No.rc" #include "Ru.rc" +

1 0

[mbosma] 23312: Page out the pages when they are not dirty. They were not freed at all before.
by mbosma＠svn.reactos.org 27 Jul '06

27 Jul '06

Author: mbosma Date: Thu Jul 27 12:21:54 2006 New Revision: 23312 URL: http://svn.reactos.org/svn/reactos?rev=23312&view=rev Log: Page out the pages when they are not dirty. They were not freed at all before. Modified: branches/cache_manager_rewrite/mm/freelist.c branches/cache_manager_rewrite/mm/section.c Modified: branches/cache_manager_rewrite/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/freeli… ============================================================================== --- branches/cache_manager_rewrite/mm/freelist.c (original) +++ branches/cache_manager_rewrite/mm/freelist.c Thu Jul 27 12:21:54 2006 @@ -981,6 +981,12 @@ return MmPageArray[Pfn].ShareCount; } +ULONG +MmGetMemoryConsumerPage(PFN_TYPE Pfn) +{ + return MmPageArray[Pfn].Flags.Consumer; +} + PFN_TYPE NTAPI MmAllocPage(ULONG Consumer, SWAPENTRY SavedSwapEntry) Modified: branches/cache_manager_rewrite/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/sectio… ============================================================================== --- branches/cache_manager_rewrite/mm/section.c (original) +++ branches/cache_manager_rewrite/mm/section.c Thu Jul 27 12:21:54 2006 @@ -125,6 +125,9 @@ ULONG MmGetShareCountPage(PFN_TYPE Pfn); +ULONG +MmGetMemoryConsumerPage (PFN_TYPE Pfn); + ULONG NTAPI MmGetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment, @@ -564,6 +567,7 @@ { ULONG Entry; ULONG ShareCount; + ULONG Consumer; PFN_TYPE Page; Entry = MmGetPageEntrySectionSegment(Segment, Offset); @@ -578,6 +582,7 @@ KEBUGCHECK(0); } Page = PFN_FROM_SSE(Entry); + Consumer = MmGetMemoryConsumerPage(Page); /* * If we reducing the share count of this entry to zero then set the entry * to zero and tell the cache the page is no longer mapped. @@ -599,7 +604,8 @@ if (PageOut) { MmSetPageEntrySectionSegment(Segment, Offset, 0); - MmReleasePageMemoryConsumer(MC_USER, Page); + if(!Dirty && !(Entry & 0x2)) + MmReleasePageMemoryConsumer(Consumer, Page); } else { @@ -660,7 +666,7 @@ if (PageOut) { MmSetPageEntrySectionSegment(Segment, Offset, 0); - MmReleasePageMemoryConsumer(MC_USER, Page); + MmReleasePageMemoryConsumer(Consumer, Page); } else { @@ -672,7 +678,7 @@ if (PageOut && !Dirty && !(Entry & 0x2)) { MmSetPageEntrySectionSegment(Segment, Offset, 0); - MmReleasePageMemoryConsumer(MC_USER, Page); + MmReleasePageMemoryConsumer(Consumer, Page); } else { @@ -685,7 +691,7 @@ else { MmSetPageEntrySectionSegment(Segment, Offset, 0); - MmReleasePageMemoryConsumer(MC_USER, Page); + MmReleasePageMemoryConsumer(Consumer, Page); } } } @@ -720,7 +726,7 @@ CHECKPOINT1; // MmSetPageEntrySectionSegment(Segment, Offset, 0); } - MmReleasePageMemoryConsumer(MC_USER, Page); + MmReleasePageMemoryConsumer(Consumer, Page); } else { @@ -2387,7 +2393,7 @@ MmDeleteRmap(OldPage, AddressSpace->Process, PAddress); MmInsertRmap(NewPage, AddressSpace->Process, PAddress); MmLockSectionSegment(Segment); - MmUnsharePageEntrySectionSegment(Section, Segment, Offset, FALSE, FALSE); + MmUnsharePageEntrySectionSegment(Section, Segment, Offset, FALSE, TRUE); MmUnlockSectionSegment(Segment); PageOp->Status = STATUS_SUCCESS; @@ -4906,7 +4912,7 @@ { MmDeleteRmap(Page, AddressSpace->Process, Address); DPRINT("%x\n", Address); - MmUnsharePageEntrySectionSegment(Section, Segment, Offset, Dirty, FALSE); + MmUnsharePageEntrySectionSegment(Section, Segment, Offset, Dirty, TRUE); } } } @@ -6506,7 +6512,7 @@ if (Pfn) { MmDeleteRmap(Pfn, NULL, (PVOID)((ULONG_PTR)CacheView->BaseAddress + Offset)); - MmUnsharePageEntrySectionSegment(Section, Segment, CacheView->SectionData.ViewOffset + Offset, Dirty, FALSE); + MmUnsharePageEntrySectionSegment(Section, Segment, CacheView->SectionData.ViewOffset + Offset, Dirty, TRUE); } } MmUnlockSectionSegment(Segment);

1 0

[greatlrd] 23311: patch from LMH1 : Bug#: 1681 : Norwegian translation
by greatlrd＠svn.reactos.org 27 Jul '06

27 Jul '06

Author: greatlrd Date: Thu Jul 27 12:21:29 2006 New Revision: 23311 URL: http://svn.reactos.org/svn/reactos?rev=23311&view=rev Log: patch from LMH1 : Bug#: 1681 : Norwegian translation Added: trunk/reactos/base/applications/reporterror/no.rc (with props) Modified: trunk/reactos/base/applications/reporterror/reporterror.rc Added: trunk/reactos/base/applications/reporterror/no.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… ============================================================================== --- trunk/reactos/base/applications/reporterror/no.rc (added) +++ trunk/reactos/base/applications/reporterror/no.rc Thu Jul 27 12:21:29 2006 @@ -1,0 +1,54 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Feil rapportering assistent" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "systemet gjenopprettet fra feilen.", -1, 115, 15, 160, 24 + LTEXT "Vil du rapportere feilen til ReactOS stiftelse?", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Feil rapportering assistent" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Vennligst beskriv hva du prøvde å gjøre når du oppdaget feilen.\n\nTrykk på 'Neste' for å sende rapporten til ReactOS foundation eller trykk 'Avbryt' for å ikke sende noe informasjon.",-1,10,0,225,40 + LTEXT "Din e-post addresse (valgfri):",-1,10,40,120,20 + EDITTEXT IDE_SUBMIT_REPORT_YOUR_EMAIL, 110,40,150,12 + LTEXT "Beskrivelse av problemet (valgfri):",-1,10,55,120,20 + EDITTEXT IDE_SUBMIT_REPORT_PROBLEM_DESCRIPTION,10,65,250,55,ES_WANTRETURN|ES_MULTILINE|ES_LEFT|WS_BORDER|WS_TABSTOP|WS_VSCROLL +END + +IDD_SUBMITTING_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Feil rapportering assistent" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "{STATUS}",IDC_SUBMISSION_STATUS,25,58,225,8 + CONTROL "", IDC_SUBMITTING_IN_PROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 +END + +IDD_SUBMITTED_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Feil rapportering assistent" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Din feil rapport ble vellykket sent til ReactOS stiftelse.",-1,25,5,225,20 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME "Rapporter feil til ReactOS stiftelse" + IDS_FAILED_TO_CONTACT_SERVER "systemet ble utilgjengelig for å kontakte feil rapportering server.\nVennligst vær sikker på at systemet er koblet til internett." + IDS_FAILED_TO_DELIVER_ERROR_REPORT "systemet var ikke i stand til levere feil rapporten." +END + +STRINGTABLE +BEGIN + IDS_CONTACTING_SERVER "Kontakter feil rapportering server..." + IDS_FAILED_TO_INITIALIZE_WINSOCK "Mislykkes å initialise winsock (windows feil kode %d)" + IDS_FAILED_TO_LOCATE_SERVER "Mislykket å kontakte feil rapportering server" +END + Propchange: trunk/reactos/base/applications/reporterror/no.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/reporterror/reporterror.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… ============================================================================== --- trunk/reactos/base/applications/reporterror/reporterror.rc (original) +++ trunk/reactos/base/applications/reporterror/reporterror.rc Thu Jul 27 12:21:29 2006 @@ -22,3 +22,4 @@ #include "hu.rc" #include "Nl.rc" #include "ru.rc" +#include "no.rc"

1 0

[greatlrd] 23310: patch from LMH1 : Bug#: 1680 : Norwegian translation
by greatlrd＠svn.reactos.org 27 Jul '06

27 Jul '06

Author: greatlrd Date: Thu Jul 27 12:17:00 2006 New Revision: 23310 URL: http://svn.reactos.org/svn/reactos?rev=23310&view=rev Log: patch from LMH1 : Bug#: 1680 : Norwegian translation Added: trunk/reactos/base/system/regsvr32/No.rc (with props) Modified: trunk/reactos/base/system/regsvr32/regsvr32.rc Added: trunk/reactos/base/system/regsvr32/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/No.rc… ============================================================================== --- trunk/reactos/base/system/regsvr32/No.rc (added) +++ trunk/reactos/base/system/regsvr32/No.rc Thu Jul 27 12:17:00 2006 @@ -1,0 +1,32 @@ +#include "resource.h" +/* + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com + */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ + +IDS_UsageMessage, "%s\n\nUsage: regsvr32 [/u] [/s] [/c] [/n] [/i[:cmdlinje]] dllnavn\n\ +/u - Uregistert server\n\ +/s - Stille; vis ingen melding bokser\n\ +/c - Konsoll utbytte\n\ +/i - Kall DllInstall pasning det en valgfri [cmdlinje]; når brukt med /u kalles dll avinstall\n\ +/n - Ikke kall DllRegisterServer; denne mulighet må bli brukt med /i" + +IDS_NoDllSpecified, "Ingen DLL navn spesifisert." + +IDS_InvalidFlag, "ikke gjenkjent flagg: %s" + +IDS_SwitchN_NoI, "ikke gjenkjent flagg: /n må bli brukt med /i bryter" + +IDS_DllNotLoaded, "LoadLibrary('%s') mislykket.\nGetLastError retur 0x%08x." + +IDS_MissingEntry, "%s var lastet, men %s oppføring moment ble ikke funnet.\n\n\ +%s kan kanskje ikke bli eksportert, eller en forfalsket versjon av %s kan kanskje være i minnet. Tenk å bruke PView for å oppspore og fjerne det." + +IDS_FailureMessage, "%s inngående %s mislykket.\nretur kode ble: 0x%08x" + +IDS_SuccessMessage "%s inngående %s lykkes." +} Propchange: trunk/reactos/base/system/regsvr32/No.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/regsvr32/regsvr32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/regsv… ============================================================================== --- trunk/reactos/base/system/regsvr32/regsvr32.rc (original) +++ trunk/reactos/base/system/regsvr32/regsvr32.rc Thu Jul 27 12:17:00 2006 @@ -12,3 +12,4 @@ #include "Hu.rc" #include "Ru.rc" #include "Ja.rc" +#include "No.rc"

1 0

[greatlrd] 23309: patch from LMH1 : Bug#: 1687 : Norwegian translation
by greatlrd＠svn.reactos.org 27 Jul '06

27 Jul '06

Author: greatlrd Date: Thu Jul 27 11:59:35 2006 New Revision: 23309 URL: http://svn.reactos.org/svn/reactos?rev=23309&view=rev Log: patch from LMH1 : Bug#: 1687 : Norwegian translation Added: trunk/reactos/base/system/winlogon/No.rc (with props) Modified: trunk/reactos/base/system/winlogon/winlogon.rc Added: trunk/reactos/base/system/winlogon/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/No.rc… ============================================================================== --- trunk/reactos/base/system/winlogon/No.rc (added) +++ trunk/reactos/base/system/winlogon/No.rc Thu Jul 27 11:59:35 2006 @@ -1,0 +1,45 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +IDD_SHUTDOWNCOMPUTER DIALOG 45, 22, 164, 52 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Slår av datamaskin" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Du kan slå av datamaskinen nå.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 + DEFPUSHBUTTON "&Restart", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 +END + +IDD_GINALOADFAILED DIALOG 58, 83, 231, 119 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Bruker grensesnitt mislykkes" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Logg på bruker Interface DLL %s mislykkes å laste.", IDC_GINALOADFAILED, 39, 16, 156, 24 + LTEXT "Kontakt din system administrator for å erstatte DLL, eller få tilbake orginale DLL.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 + DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14 +END + +STRINGTABLE +BEGIN + IDS_PREPARENETWORKCONNECTIONS "Forbreder nettverk tilkoblinger..." + IDS_APPLYINGCOMPUTERSETTINGS "Bruker datamaskin innstillinger..." + IDS_RUNNINGSTARTUPSCRIPTS "Kjører oppstart skripter..." + IDS_RUNNINGSHUTDOWNSCRIPTS "Kjører avsluttende skripter..." + IDS_APPLYINGYOURPERSONALSETTINGS "Bruker dine personlige innstillinger..." + IDS_RUNNINGLOGOFFSCRIPTS "Kjører logg av skripter..." + IDS_RUNNINGLOGONSCRIPTS "Kjører pålogging skripter..." + IDS_LOADINGYOURPERSONALSETTINGS "Laster dine personlige innstillinger..." + IDS_CLOSINGNETWORKCONNECTIONS "Avslutter nettverk tilkoblinger..." + IDS_REACTOSISSHUTTINGDOWN "ReactOS avsluttes..." + IDS_PREPARETOSTANDBY "Forbreder ventemodus..." + IDS_PREPARETOHIBERNATE "Forbreder dvalemodus..." + IDS_SAVEYOURSETTINGS "Lagrer innstillingene..." + IDS_REACTOSISSTARTINGUP "ReactOS starter opp..." +END + +STRINGTABLE +BEGIN + IDS_FAILEDACTIVATEUSERSHELL "Winlogon mislykket å aktivere bruker skall!" +END + Propchange: trunk/reactos/base/system/winlogon/No.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/winlogon/winlogon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.rc (original) +++ trunk/reactos/base/system/winlogon/winlogon.rc Thu Jul 27 11:59:35 2006 @@ -20,6 +20,7 @@ #include "Hu.rc" #include "Ja.rc" #include "Nl.rc" +#include "No.rc" #include "Pl.rc" #include "Ru.rc" #include "Sv.rc"

1 0

[greatlrd] 23308: patch from LMH1 : Bug#: 1686 : Norwegian translation
by greatlrd＠svn.reactos.org 27 Jul '06

27 Jul '06

Author: greatlrd Date: Thu Jul 27 11:55:55 2006 New Revision: 23308 URL: http://svn.reactos.org/svn/reactos?rev=23308&view=rev Log: patch from LMH1 : Bug#: 1686 : Norwegian translation Added: trunk/reactos/base/setup/welcome/No.rc (with props) Modified: trunk/reactos/base/setup/welcome/welcome.rc Added: trunk/reactos/base/setup/welcome/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/No.rc?r… ============================================================================== --- trunk/reactos/base/setup/welcome/No.rc (added) +++ trunk/reactos/base/setup/welcome/No.rc Thu Jul 27 11:55:55 2006 @@ -1,0 +1,62 @@ +/* $Id: En.rc 21325 2006-03-17 22:07:04Z fireball $ */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +/* String Tables */ + +/* Default settings */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "ReactOS - Velkommen" + IDS_DEFAULTTOPICTITLE "ReactOS" + IDS_DEFAULTTOPICDESC "Velkommen til React Operativsystem.\n\nTrykk et emne til venstre." +// IDS_CHECKTEXT "Vis denne dialoget igjen" +// IDS_CLOSETEXT "Avslutt" +END + +/* Topic buttons */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICBUTTON0 "Innstaller ReactOS" + IDS_TOPICBUTTON1 "Utforsk denne CD" + IDS_TOPICBUTTON2 "Avslutt" +// IDS_TOPICBUTTON3 "Tomt emne 3" +// IDS_TOPICBUTTON4 "Tomt emne 4" +// IDS_TOPICBUTTON5 "Tomt emne 5" +// IDS_TOPICBUTTON6 "Tomt emne 6" +// IDS_TOPICBUTTON7 "Tomt emne 7" +// IDS_TOPICBUTTON8 "Tomt emne 8" +// IDS_TOPICBUTTON9 "Tomt emne 9" +END + +/* Topic titles */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICTITLE0 "Innstaller ReactOS" + IDS_TOPICTITLE1 "Utforsk denne CD" + IDS_TOPICTITLE2 "Avslutt" +// IDS_TOPICTITLE3 "Tomt emne tittel 3" +// IDS_TOPICTITLE4 "Tomt emne tittel 4" +// IDS_TOPICTITLE5 "Tomt emne tittel 5" +// IDS_TOPICTITLE6 "Tomt emne tittel 6" +// IDS_TOPICTITLE7 "Tomt emne tittel 7" +// IDS_TOPICTITLE8 "Tomt emne tittel 8" +// IDS_TOPICTITLE9 "Tomt emne tittel 9" +END + +/* Topic descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICDESC0 "Opprett en ny ReactOS innstallasjon på din datamaskin eller oppgrader eksisterende innstallasjon." + IDS_TOPICDESC1 "Utforsk CDen." + IDS_TOPICDESC2 "Trykk avslutt for å avslutte denne applikasjonen." +// IDS_TOPICDESC3 "Emner beskrivelse 3.\n\nBeskriv emner 3 her." +// IDS_TOPICDESC4 "Emner beskrivelse 4.\n\nBeskriv emner 4 her." +// IDS_TOPICDESC5 "Emner beskrivelse 5.\n\nBeskriv emner 5 her." +// IDS_TOPICDESC6 "Emner beskrivelse 6.\n\nBeskriv emner 6 her." +// IDS_TOPICDESC7 "Emner beskrivelse 7.\n\nBeskriv emner 7 her." +// IDS_TOPICDESC8 "Emner beskrivelse 8.\n\nBeskriv emner 8 her." +// IDS_TOPICDESC9 "Emner beskrivelse 9.\n\nBeskriv emner 9 her." +END + +/* EOF */ Propchange: trunk/reactos/base/setup/welcome/No.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/welcome/welcome.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.rc (original) +++ trunk/reactos/base/setup/welcome/welcome.rc Thu Jul 27 11:55:55 2006 @@ -61,5 +61,6 @@ #include "Ru.rc" #include "Uk.rc" #include "It.rc" +#include "No.rc" /* EOF */

1 0

[greatlrd] 23307: patch from LMH1 : Bug#: 1683 : Norwegian translation
by greatlrd＠svn.reactos.org 27 Jul '06

27 Jul '06

Author: greatlrd Date: Thu Jul 27 11:50:33 2006 New Revision: 23307 URL: http://svn.reactos.org/svn/reactos?rev=23307&view=rev Log: patch from LMH1 : Bug#: 1683 : Norwegian translation Added: trunk/reactos/base/applications/taskmgr/No.rc (with props) Modified: trunk/reactos/base/applications/taskmgr/taskmgr.rc Added: trunk/reactos/base/applications/taskmgr/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/No.rc (added) +++ trunk/reactos/base/applications/taskmgr/No.rc Thu Jul 27 11:50:33 2006 @@ -1,0 +1,686 @@ +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDR_TASKMANAGER MENU DISCARDABLE +BEGIN + POPUP "&Fil" + BEGIN + MENUITEM "&Ny oppgave (Kjør...)", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "A&vslutt oppgavebehandlingen", ID_FILE_EXIT + END + POPUP "&Alternativer" + BEGIN + MENUITEM "&Alltid øverst", ID_OPTIONS_ALWAYSONTOP + , CHECKED + MENUITEM "&Minimer ved bruk", ID_OPTIONS_MINIMIZEONUSE + , CHECKED + MENUITEM "&Skjul når Minimert", ID_OPTIONS_HIDEWHENMINIMIZED + , CHECKED + MENUITEM "&Vis 16-bites oppgaver", ID_OPTIONS_SHOW16BITTASKS + , CHECKED + END + POPUP "&Vis" + BEGIN + MENUITEM "&Oppdater nå", ID_VIEW_REFRESH + POPUP "&Oppdateringshastighet" + BEGIN + MENUITEM "&Høy", ID_VIEW_UPDATESPEED_HIGH + MENUITEM "&Normal", ID_VIEW_UPDATESPEED_NORMAL + , CHECKED + MENUITEM "&Lav", ID_VIEW_UPDATESPEED_LOW + MENUITEM "&Midlertidig stanset", ID_VIEW_UPDATESPEED_PAUSED + + END + MENUITEM SEPARATOR + MENUITEM "St&ore Ikoner", ID_VIEW_LARGE + MENUITEM "S&må Ikoner", ID_VIEW_SMALL + MENUITEM "&Detaljer", ID_VIEW_DETAILS, CHECKED + MENUITEM "&Velg tospaltet...", ID_VIEW_SELECTCOLUMNS + POPUP "&CPU Historie" + BEGIN + MENUITEM "&En graf, per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHALL + + MENUITEM "EN graf &per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU + , CHECKED + END + MENUITEM "&Vis Kjernetider", ID_VIEW_SHOWKERNELTIMES + END + POPUP "&Vindu" + BEGIN + MENUITEM "Hele &horisontalt", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Hele &vertikalt", ID_WINDOWS_TILEVERTICALLY + MENUITEM "&Minimer", ID_WINDOWS_MINIMIZE + MENUITEM "Ma&ksimer", ID_WINDOWS_MAXIMIZE + MENUITEM "&Overlappet", ID_WINDOWS_CASCADE + MENUITEM "&Plasser lengst frem", ID_WINDOWS_BRINGTOFRONT + END + POPUP "&Hjelp" + BEGIN + MENUITEM "Emner i &hjelp for Oppgavebehandling", ID_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "&Om Oppgavebehandling", ID_HELP_ABOUT + END +END + +IDR_WINDOWSMENU MENU DISCARDABLE +BEGIN + MENUITEM "Hele &horisontalt", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Hele &vertikalt", ID_WINDOWS_TILEVERTICALLY + MENUITEM "&Minimer", ID_WINDOWS_MINIMIZE + MENUITEM "Ma&ksimer", ID_WINDOWS_MAXIMIZE + MENUITEM "&Cascade", ID_WINDOWS_CASCADE + MENUITEM "&Plasser lengst frem", ID_WINDOWS_BRINGTOFRONT +END + +IDR_APPLICATION_PAGE_CONTEXT1 MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Ny oppgave (Kjør...)", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "Sto&re ikoner", ID_VIEW_LARGE + MENUITEM "S&må ikoner", ID_VIEW_SMALL + MENUITEM "&Detaljer", ID_VIEW_DETAILS, CHECKED + END +END + +IDR_APPLICATION_PAGE_CONTEXT2 MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Bytt til", ID_APPLICATION_PAGE_SWITCHTO + MENUITEM "&Plasser lengst frem", ID_WINDOWS_BRINGTOFRONT + MENUITEM SEPARATOR + MENUITEM "Hele &horisontalt", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Hele &vertikalt", ID_WINDOWS_TILEVERTICALLY + MENUITEM "&Minimer", ID_WINDOWS_MINIMIZE + MENUITEM "Ma&ksimer", ID_WINDOWS_MAXIMIZE + MENUITEM "&Overlappet", ID_WINDOWS_CASCADE + MENUITEM SEPARATOR + MENUITEM "&Avslutt oppgave", ID_APPLICATION_PAGE_ENDTASK + MENUITEM "&Gå til Prosess", ID_APPLICATION_PAGE_GOTOPROCESS + + END +END + +IDR_TRAY_POPUP MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Få tilbake", ID_RESTORE + MENUITEM "&Avslutt", ID_FILE_EXIT + MENUITEM SEPARATOR + MENUITEM "&Alltid på topp", ID_OPTIONS_ALWAYSONTOP + END +END + +IDR_PROCESS_PAGE_CONTEXT MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Avslutt Prosess", ID_PROCESS_PAGE_ENDPROCESS + MENUITEM "Avslutt Prosess&tre", ID_PROCESS_PAGE_ENDPROCESSTREE + + MENUITEM "&Feilsøking", ID_PROCESS_PAGE_DEBUG + MENUITEM SEPARATOR + POPUP "Angi &prioritet" + BEGIN + MENUITEM "&Sanntid", ID_PROCESS_PAGE_SETPRIORITY_REALTIME + + MENUITEM "&Høy", ID_PROCESS_PAGE_SETPRIORITY_HIGH + + MENUITEM "&Høyere enn normalt", ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL + + MENUITEM "&Normal", ID_PROCESS_PAGE_SETPRIORITY_NORMAL + + MENUITEM "&Lavere enn normal", ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL + + MENUITEM "&Lav", ID_PROCESS_PAGE_SETPRIORITY_LOW + + END + MENUITEM "Sett &tiltrekning ...", ID_PROCESS_PAGE_SETAFFINITY + MENUITEM "Rediger Debug &kanaler...", ID_PROCESS_PAGE_DEBUGCHANNELS + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Om Oppgavebehandling" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Oppgavebehandler v1.0\nCopyright (C) 1999 - 2001\nby Brian Palmer (brianp(a)reactos.org)", + IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, + 122,26 + DEFPUSHBUTTON "OK",IDOK,183,189,44,14,WS_GROUP + ICON IDI_TASKMANAGER,IDC_STATIC,19,30,20,20 + EDITTEXT IDC_LICENSE_EDIT,53,63,174,107,ES_MULTILINE | + ES_READONLY | WS_VSCROLL +END + +IDD_TASKMGR_DIALOG DIALOG DISCARDABLE 0, 0, 264, 246 +STYLE DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "Oppgavebehandler" +MENU IDR_TASKMANAGER +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 +END + +IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Liste2",IDC_APPLIST,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 + PUSHBUTTON "&Ny oppgave...",IDC_NEWTASK,187,189,53,14 + PUSHBUTTON "&Bytt til",IDC_SWITCHTO,131,189,53,14,WS_DISABLED + PUSHBUTTON "&Avslutt oppgave",IDC_ENDTASK,75,189,53,14,WS_DISABLED +END + +IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Liste2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + WS_BORDER | WS_TABSTOP,7,7,233,177 + PUSHBUTTON "&Avslutt prosess",IDC_ENDPROCESS,171,189,69,14 + CONTROL "&Vis prosesser fra alle brukere",IDC_SHOWALLPROCESSES, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 +END + +//IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 +IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Bruk av CPU",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "Bruk av vekslefil",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT + GROUPBOX "Totalt",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Tildelt minne (kb)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Fysisk minne (kb)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Kjerne minne (kb)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT + LTEXT "Referanser",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 + LTEXT "Tråder",IDS_TOTALS_THREAD_COUNT,12,140,27,8 + LTEXT "Prosesser",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT,65,131,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_TOTALS_THREAD_COUNT,65,140,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + LTEXT "Totalt",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 + LTEXT "Begrensning",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8 + LTEXT "Topp",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_COMMIT_CHARGE_LIMIT,65,184,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_COMMIT_CHARGE_PEAK,65,193,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + LTEXT "Totalt",IDS_PHYSICAL_MEMORY_TOTAL,137,131,27,8 + LTEXT "Tilgjengelig",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,30,8 + LTEXT "Systembuffer",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL,185,131,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE,185,140,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + LTEXT "Totalt",IDS_KERNEL_MEMORY_TOTAL,137,174,27,8 + LTEXT "Sidevekslet",IDS_KERNEL_MEMORY_PAGED,137,184,21,8 + LTEXT "Ikke sidevekslet",IDS_KERNEL_MEMORY_NONPAGED,137,193,34,8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL,185,174,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_KERNEL_MEMORY_PAGED,185,184,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED,185,193,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + GROUPBOX "Bruk av CPU",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT + GROUPBOX "Logg for bruk av sidevekslingsfil",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT + PUSHBUTTON "Vis bruk av CPU",IDC_CPU_USAGE_GRAPH,12,17,47,37,0, + WS_EX_CLIENTEDGE + PUSHBUTTON "Vis bruk av MEM",IDC_MEM_USAGE_GRAPH,12,75,47,37,0, + WS_EX_CLIENTEDGE + PUSHBUTTON "Logg for bruk av CPU",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, + 153,37,0,WS_EX_CLIENTEDGE + PUSHBUTTON "MEM bruk historie",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, + 153,37,0,WS_EX_CLIENTEDGE +END + +IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Debug kanaler" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | + LVS_SORTASCENDING,7,7,233,177 + PUSHBUTTON "Avslutt",IDOK,171,189,69,14 +END + +IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Prosessor slektskap" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,120,133,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,174,133,50,14 + LTEXT "Prosessor slektskap innstilling kontrols som CPU prosessen vil bli godtatt til å kjøre på.", + IDC_STATIC,5,5,220,16 + CONTROL "CPU 0",IDC_CPU0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 11,28,37,10 + CONTROL "CPU 1",IDC_CPU1,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,41,37,10 + CONTROL "CPU 2",IDC_CPU2,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,54,37,10 + CONTROL "CPU 3",IDC_CPU3,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,67,37,10 + CONTROL "CPU 4",IDC_CPU4,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,80,37,10 + CONTROL "CPU 5",IDC_CPU5,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,93,37,10 + CONTROL "CPU 6",IDC_CPU6,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,106,37,10 + CONTROL "CPU 7",IDC_CPU7,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,119,37,10 + CONTROL "CPU 8",IDC_CPU8,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,61,28,37,10 + CONTROL "CPU 9",IDC_CPU9,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,61,41,37,10 + CONTROL "CPU 10",IDC_CPU10,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,54,41,10 + CONTROL "CPU 11",IDC_CPU11,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,67,41,10 + CONTROL "CPU 12",IDC_CPU12,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,80,41,10 + CONTROL "CPU 13",IDC_CPU13,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,93,41,10 + CONTROL "CPU 14",IDC_CPU14,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,106,41,10 + CONTROL "CPU 15",IDC_CPU15,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,119,41,10 + CONTROL "CPU 16",IDC_CPU16,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,28,41,10 + CONTROL "CPU 17",IDC_CPU17,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,41,41,10 + CONTROL "CPU 18",IDC_CPU18,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,54,41,10 + CONTROL "CPU 19",IDC_CPU19,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,67,41,10 + CONTROL "CPU 20",IDC_CPU20,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,80,41,10 + CONTROL "CPU 21",IDC_CPU21,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,93,41,10 + CONTROL "CPU 22",IDC_CPU22,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,106,41,10 + CONTROL "CPU 23",IDC_CPU23,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,119,41,10 + CONTROL "CPU 24",IDC_CPU24,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,28,41,10 + CONTROL "CPU 25",IDC_CPU25,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,41,41,10 + CONTROL "CPU 26",IDC_CPU26,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,54,41,10 + CONTROL "CPU 27",IDC_CPU27,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,67,41,10 + CONTROL "CPU 28",IDC_CPU28,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,80,41,10 + CONTROL "CPU 29",IDC_CPU29,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,93,41,10 + CONTROL "CPU 30",IDC_CPU30,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,106,41,10 + CONTROL "CPU 31",IDC_CPU31,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,119,41,10 +END + +IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 195, 199 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Velg spaltevis" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,84,178,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,138,178,50,14 + LTEXT "Velg spaltevis det vil oppstå på Prosess side av oppgavebehandler.", + IDC_STATIC,7,7,181,17 + CONTROL "&Bilde navn",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,7,28,56,10 + CONTROL "&PID (Prosess identifikator)",IDC_PID,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,39,88,10 + CONTROL "&CPU brukt",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,50,53,10 + CONTROL "CPU Ti&d",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,61,48,10 + CONTROL "&Minne brukt",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,72,63,10 + CONTROL "Minne brukt &Delta",IDC_MEMORYUSAGEDELTA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,83,82,10 + CONTROL "Ma&ks minne bruk",IDC_PEAKMEMORYUSAGE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,94,82,10 + CONTROL "Side &mangeler",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,105,53,10 + CONTROL "&Bruker objekt",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,116,62,10 + CONTROL "I/O Leser",IDC_IOREADS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,127,49,10 + CONTROL "I/O Leser Bytes",IDC_IOREADBYTES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,138,65,10 + CONTROL "&Sesjon ID",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,149,50,10 + CONTROL "Bruker &Navn",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,160,51,10 + CONTROL "Side &mangel Delta",IDC_PAGEFAULTSDELTA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,28,72,10 + CONTROL "&Virtuelt minne Størrelse",IDC_VIRTUALMEMORYSIZE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,39,77,10 + CONTROL "Si&de innsats",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,50,53,10 + CONTROL "I&ngen-side innsats",IDC_NONPAGEDPOOL,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,61,67,10 + CONTROL "Base P&rioritet",IDC_BASEPRIORITY,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,72,55,10 + CONTROL "&Handle regne",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,83,59,10 + CONTROL "&Tråd medregne",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,94,59,10 + CONTROL "GDI Objekt",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,105,55,10 + CONTROL "I/O skriver",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,116,49,10 + CONTROL "I/O skriver Bytes",IDC_IOWRITEBYTES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,127,65,10 + CONTROL "I/O Annet",IDC_IOOTHER,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,138,46,10 + CONTROL "I/O Annet Byte",IDC_IOOTHERBYTES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,149,65,10 +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""resource.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_ABOUTBOX, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 252 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_TASKMGR_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 3 + RIGHTMARGIN, 260 + TOPMARGIN, 3 + BOTTOMMARGIN, 231 + END + + IDD_APPLICATION_PAGE, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 240 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_PROCESS_PAGE, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 240 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_PERFORMANCE_PAGE, DIALOG + BEGIN + LEFTMARGIN, 5 + RIGHTMARGIN, 242 + VERTGUIDE, 12 + VERTGUIDE, 65 + VERTGUIDE, 110 + TOPMARGIN, 5 + BOTTOMMARGIN, 205 + END + + IDD_AFFINITY_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 224 + VERTGUIDE, 11 + VERTGUIDE, 61 + VERTGUIDE, 116 + VERTGUIDE, 175 + TOPMARGIN, 7 + BOTTOMMARGIN, 147 + HORZGUIDE, 28 + HORZGUIDE, 38 + HORZGUIDE, 51 + HORZGUIDE, 64 + HORZGUIDE, 77 + HORZGUIDE, 90 + HORZGUIDE, 103 + HORZGUIDE, 116 + HORZGUIDE, 129 + END + + IDD_COLUMNS_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 188 + VERTGUIDE, 107 + TOPMARGIN, 7 + BOTTOMMARGIN, 192 + HORZGUIDE, 28 + END +END +#endif // APSTUDIO_INVOKED + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "Oppgavebehandling" + IDC_TASKMGR "Oppgavebehandling" + IDS_IDLE_PROCESS "System Idle Process" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_FILE_NEW "Kjør et nytt program" + ID_OPTIONS_ALWAYSONTOP "Oppgavebehandler fortsette å være forran av alle andre vinduer uten minimert" + ID_OPTIONS_MINIMIZEONUSE + "Oppgavebehandelen er minimert når en SwitchTo operasjon er oppført" + ID_OPTIONS_HIDEWHENMINIMIZED "Skjule oppgavebehandelen når det er minimert" + ID_VIEW_REFRESH "Nødvendighet for oppgavebehandelen å oppdateres nå, hensynsløs av oppdatering hastighet innstillingen" + ID_VIEW_LARGE "Vis oppgavene ved å bruke store ikoner" + ID_VIEW_SMALL "Vis oppgavene ved å bruke små ikoner" + ID_VIEW_DETAILS "Vis informasjon om hver oppgave" + ID_VIEW_UPDATESPEED_HIGH "Oppdater skjermen to ganger per sekund" + ID_VIEW_UPDATESPEED_NORMAL "Oppdater skjermen hver to sekunds" + ID_VIEW_UPDATESPEED_LOW "Oppdater skjermen hver fire sekund" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_VIEW_UPDATESPEED_PAUSED "Kan ikke automatisk oppdateres" + ID_WINDOWS_TILEHORIZONTALLY + "Tittel vindu horisontalt på skrivebordet" + ID_WINDOWS_TILEVERTICALLY "Tittel vindu vertikalt på skrivebordet" + ID_WINDOWS_MINIMIZE "Minimalisere vinduet" + ID_WINDOWS_MAXIMIZE "Maksimere vinduet" + ID_WINDOWS_CASCADE "Cascades vinduet diagonalt på skrivebordet" + ID_WINDOWS_BRINGTOFRONT "Bringe vinduet front, men kan ikke bryter til det" + ID_HELP_TOPICS "Vis oppgavebehandler emner i hjelp" + ID_HELP_ABOUT "Vis program informasjon, versjon nummer, og enerett" + ID_FILE_EXIT "Avslutt oppgavebehandler applikasjon" + ID_OPTIONS_SHOW16BITTASKS + "Vis 16-bit oppgaver under assosiert ntvdm.exe" + ID_VIEW_SELECTCOLUMNS "Velg hva kolonner vil bli synlig på Prosess side" + ID_VIEW_SHOWKERNELTIMES "Vis kernel tid i utførelse diagramer" + ID_VIEW_CPUHISTORY_ONEGRAPHALL + "En singel historie graf viser totalt CPU bruk" + ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "Hver CPU har dems egene historie graf" + ID_APPLICATION_PAGE_SWITCHTO + "Skaffe en oppgave til forgrunn, endre fokus til den oppgaven" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_ENDTASK "Fortell valgte oppgave for å avsluttes" + ID_GOTOPROCESS "Endre fokus til prosess av valgte oppgave" + ID_RESTORE "Gjenopprette oppgavebehandelen fra dens skjulte stand" + ID_PROCESS_PAGE_ENDPROCESS "Fjern prosessen fra systemet" + ID_PROCESS_PAGE_ENDPROCESSTREE + "Flytte denne prosessen og alle etterkommer fra systemet" + ID_PROCESS_PAGE_DEBUG "Tilknytte feilsøkingsprogram til denne prosess" + ID_PROCESS_PAGE_SETAFFINITY + "Kontroll hvilken prosessorer prosessen vil bli godtatt å kjøre på" + ID_PROCESS_PAGE_SETPRIORITY_REALTIME + "Sett prosess til EKTETID prioritet klasse" + ID_PROCESS_PAGE_SETPRIORITY_HIGH "Sett prosess til HØY prioritet klasse" + ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL + "Sett prosess til OVER NORMAL prioritet klasse" + ID_PROCESS_PAGE_SETPRIORITY_NORMAL + "Sett prosess til NORMAL prioritet klasse" + ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL + "Sett prosess til NEDENFOR NORMAL prioritet klasse" + ID_PROCESS_PAGE_SETPRIORITY_LOW "Sett prosess til LAV prioritet klasse" + IDS_LICENSE "Dette programet er gratis programvare; 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.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TAB_APPS "Programmer" + IDS_TAB_PROCESSES "Prosesser" + IDS_TAB_PERFORMANCE "Ytelse" + IDS_TAB_TASK "Oppgave" + IDS_TAB_STATUS "Status" + IDS_TAB_IMAGENAME "Prosessnavn" + IDS_TAB_PID "PID" + IDS_TAB_USERNAME "Brukernavn" + IDS_TAB_SESSIONID "Sesjon ID" + IDS_TAB_CPU "CPU" + IDS_TAB_CPUTIME "CPU Tid" + IDS_TAB_MEMUSAGE "Bruk av vekslefil" + IDS_TAB_PEAKMEMUSAGE "Maks bruk av Mem" + IDS_TAB_MEMDELTA "Mem Delta" + IDS_TAB_PAGEFAULT "Side mangel" + IDS_TAB_PFDELTA "PF Delta" + IDS_TAB_VMSIZE "VM Størrelse" + IDS_TAB_PAGEDPOOL "Sideveksling samle" + IDS_TAB_NPPOOL "NP samle" + IDS_TAB_BASEPRI "Base Pri" + IDS_TAB_HANDLES "Referanser" + IDS_TAB_THREADS "Tråder" + IDS_TAB_USERPBJECTS "BRUKER Objekt" + IDS_TAB_GDIOBJECTS "GDI Objekt" + IDS_TAB_IOREADS "I/O Leser" + IDS_TAB_IOWRITES "I/O Skriver" + IDS_TAB_IOOTHER "I/O Annet" + IDS_TAB_IOREADBYTES "I/O Leser Byte" + IDS_TAB_IOWRITESBYTES "I/O Skriver Byte" + IDS_TAB_IOOTHERBYTES "I/O Annet Byte" + IDS_MENU_SELECTCOLUMNS "&Velg kollone..." + IDS_MENU_16BITTASK "&Vis 16-biter oppgave" + IDS_MENU_WINDOWS "&Vinduer" + IDS_MENU_LARGEICONS "St&ore Ikoner" + IDS_MENU_SMALLICONS "S&må Ikoner" + IDS_MENU_DETAILS "&Detaljer" + IDS_MENU_ONEGRAPHALLCPUS "&En Graf, Alle CPU" + IDS_MENU_ONEGRAPHPERCPU "En Graf &Per CPU" + IDS_MENU_CPUHISTORY "&CPU Historie" + IDS_MENU_SHOWKERNELTIMES "&Vis Kernel tider" + IDS_CREATENEWTASK "Opprett ny oppgave" + IDS_CREATENEWTASK_DESC "Skriv navnet av et program, mappe, dokument, eller Internett-ressursen, og oppgavebehandelen vil åpne det for deg." + IDS_MSG_ACCESSPROCESSAFF "Ikke i stand til tilgang eller sette Prosess slektskap" + IDS_MSG_PROCESSONEPRO "Prosessen må ha tiltrekning med minst en prosessor." + IDS_MSG_INVALIDOPTION "Ugyldig Operasjon" + IDS_MSG_UNABLEDEBUGPROCESS "Ute av stand til feilsøking prosess" + IDS_MSG_WARNINGDEBUG "ADVARSEL: Feilretning denne prosess kan følge å miste data.\nEr du sikker du vil tilknytte feilsøkingsprogramet?" + IDS_MSG_TASKMGRWARNING "Oppgavebehandler advarsel" + IDS_MSG_WARNINGTERMINATING "ADVARSEL: Avsluttes en prosess kan forutsake uønsket\nresultat inkluderer miste av data og systemet kan bli ustabilt. \nprosessen vil ikke kunne gjenopprette sin tilstand eller \ndata slik de var før avslutting. Er du sikker på at du vil\navslutte prosessen?" + IDS_MSG_UNABLETERMINATEPRO "Ikke i stand til å avslutte prosess" + IDS_MSG_UNABLECHANGEPRIORITY "Ikke i stand til endre prioritet" + IDS_MSG_WARNINGCHANGEPRIORITY "ADVARSEL: Endring av prioritet klasse av denne prosess kan\nforutsake uønsket resultat inkluderer systemet kan bli ustabilt. Er du\nsikker på at du vil endre prioritet klassen?" + IDS_MSG_TRAYICONCPUUSAGE "Bruk av CPU : %d%%" + IDS_STATUS_MEMUSAGE "Tildelt minne: %dK / %dK" + IDS_STATUS_CPUUSAGE "Bruk av CPU: %3d%%" + IDS_STATUS_PROCESSES "Prosesser: %d" + IDS_Not_Responding "Ingen reaksjon" + IDS_Running "Kjører" +END + + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Propchange: trunk/reactos/base/applications/taskmgr/No.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/taskmgr/taskmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.rc (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.rc Thu Jul 27 11:50:33 2006 @@ -210,5 +210,6 @@ #include "Hu.rc" #include "Ja.rc" #include "Nl.rc" +#include "No.rc" #include "Sv.rc" #include "Uk.rc"

1 0

[greatlrd] 23306: patch from LMH1 : Bug#: 1700 : Norwegian translation
by greatlrd＠svn.reactos.org 27 Jul '06

27 Jul '06

Author: greatlrd Date: Thu Jul 27 11:46:08 2006 New Revision: 23306 URL: http://svn.reactos.org/svn/reactos?rev=23306&view=rev Log: patch from LMH1 : Bug#: 1700 : Norwegian translation Added: trunk/reactos/base/applications/cacls/No.rc (with props) Modified: trunk/reactos/base/applications/cacls/rsrc.rc Added: trunk/reactos/base/applications/cacls/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/No… ============================================================================== --- trunk/reactos/base/applications/cacls/No.rc (added) +++ trunk/reactos/base/applications/cacls/No.rc Thu Jul 27 11:46:08 2006 @@ -1,0 +1,74 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + +IDS_HELP, "Viser eller endrer tilgang kontroll lister (ACL) av filer\n\n\ +CACLS filnavn [/T] [/E] [/C] [/G bruker:perm [...]] [/R user [...]]\n\ + [/P bruker:perm [...]] [/D bruker [...]]\n\ + filnavn Viser ACL.\n\ + /T Endrer ACL av spesifiserte filer i\n\ + nåværende katalog og alle under-mapper.\n\ + /E Rediger ACL isteden for erstatte det.\n\ + /C Fortsett på tilgang nektet feiler.\n\ + /G user:perm Innrømme spesifiert bruker tilgang rettigheter.\n\ + Perm kan bli: L Les\n\ + S Skriv\n\ + E Endre (skriv)\n\ + F Full kontroll\n\ + /R bruker Tilbakekalle spesifisert bruker tilgang rettighet (bare gyldig med /E).\n\ + /P bruker:perm Erstatte spesifisert bruker tilgang rettighet.\n\ + Perm kan bli: I Ingen\n\ + L Les\n\ + S Skrive\n\ + E Endre (skriv)\n\ + F Full kontroll\n\ + /D bruker Avslå spesifisert bruker tilgang.\n\ +Wildcards kan bli brukt for å spesifisere mere enn en fil i en kommando.\n\ +Du kan spesifisere mere enn en bruker i en kommando.\n\n\ +Forkortelse:\n\ + CI - Container Inherit.\n\ + ACE vil bli inherited av directories.\n\ + OI - Object Inherit.\n\ + ACE will be inherited by files.\n\ + IO - Inherit Only.\n\ + ACE gjelder ikke til nåværende fil/katalog.\n" + +IDS_ABBR_CI, "(CI)" +IDS_ABBR_OI, "(OI)" +IDS_ABBR_IO, "(IO)" +IDS_ABBR_FULL, "F" +IDS_ABBR_READ, "R" +IDS_ABBR_WRITE, "W" +IDS_ABBR_CHANGE, "C" +IDS_ABBR_NONE, "N" +IDS_ALLOW, "" +IDS_DENY, "(NEKTE)" +IDS_SPECIAL_ACCESS, "(spesiell tilgang:)" +IDS_GENERIC_READ, "GENERISK_LESE" +IDS_GENERIC_WRITE, "GENERISK_SKRIVE" +IDS_GENERIC_EXECUTE, "GENERISK_KJØRE" +IDS_GENERIC_ALL, "GENERISK_ALT" +IDS_FILE_GENERIC_EXECUTE, "FIL_GENERISK_KJØRE" +IDS_FILE_GENERIC_READ, "FIL_GENERISK_LESE" +IDS_FILE_GENERIC_WRITE, "FIL_GENERISK_SKRIVE" +IDS_FILE_READ_DATA, "FIL_LES_DATA" +IDS_FILE_WRITE_DATA, "FIL_SKRIV_DATA" +IDS_FILE_APPEND_DATA, "FIL_TILFØYE_DATA" +IDS_FILE_READ_EA, "FIL_LESE_EA" +IDS_FILE_WRITE_EA, "FIL_SKRIVE_EA" +IDS_FILE_EXECUTE, "FIL_KJØRE" +IDS_FILE_DELETE_CHILD, "FIL_SLETT_BARN" +IDS_FILE_READ_ATTRIBUTES, "FIL_LESE_ATTRIBUTTER" +IDS_FILE_WRITE_ATTRIBUTES, "FIL_SKRIVE_ATTRIBUTTER" +IDS_MAXIMUM_ALLOWED, "MAKSIMUM_TILATT" +IDS_ACCESS_SYSTEM_SECURITY, "TILGANG_SYSTEM_SIKKERHET" +IDS_SPECIFIC_RIGHTS_ALL, "SPESIFIKT_RETTIGHETER_ALT" +IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RETTIGHETER_PÅBUDT" +IDS_SYNCHRONIZE, "SYNKRONISERE" +IDS_WRITE_OWNER, "SKRIVE_EIER" +IDS_WRITE_DAC, "SKRIVE_DAC" +IDS_READ_CONTROL, "LESE_KONTROLL" +IDS_DELETE, "SLETT" +IDS_STANDARD_RIGHTS_ALL, "STANDARD_RETTIGHETER_ALT" +} Propchange: trunk/reactos/base/applications/cacls/No.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cacls/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/rs… ============================================================================== --- trunk/reactos/base/applications/cacls/rsrc.rc (original) +++ trunk/reactos/base/applications/cacls/rsrc.rc Thu Jul 27 11:46:08 2006 @@ -12,4 +12,5 @@ #include "Nl.rc" #include "Ru.rc" #include "De.rc" +#include "No.rc"

1 0

[ion] 23305: - Remove PspGetImagePath and use the new SeLocateProcessImageName instead. It's still not fully XP-compatible, because it should return the entire name with the \Device\HardDisk0 path, but that is easily fixable by modifying the OB Type info for the device object to also use IopQueryNameFile (TODO). - Update kernel fun with specifics about Cc-branch dereference bug and re-prioritize an I/O Bug.
by ion＠svn.reactos.org 27 Jul '06

27 Jul '06

Author: ion Date: Thu Jul 27 09:03:03 2006 New Revision: 23305 URL: http://svn.reactos.org/svn/reactos?rev=23305&view=rev Log: - Remove PspGetImagePath and use the new SeLocateProcessImageName instead. It's still not fully XP-compatible, because it should return the entire name with the \Device\HardDisk0 path, but that is easily fixable by modifying the OB Type info for the device object to also use IopQueryNameFile (TODO). - Update kernel fun with specifics about Cc-branch dereference bug and re-prioritize an I/O Bug. Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=233… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Thu Jul 27 09:03:03 2006 @@ -10,9 +10,9 @@ // // Io: // - Fix double-reference in IopCreateFile. +// - See why queueing IRPs and cancelling them causes crashes. // - Add SEH to some places where it's missing (MDLs, etc) (iofunc). // - Add a generic Cleanup/Exception Routine (iofunc). -// - See why queueing IRPs and cancelling them causes crashes // - Add another parameter to IopCleanupFailedIrp. // - Add Access Checks in IopParseDevice. // - Add validation checks in IoCreateFile. @@ -28,10 +28,9 @@ // - Generate process cookie for user-more thread. // // Ob: -// - Possible bug in deferred deletion under Cc Rewrite branch. +// - Fix bug related to Deferred Loading (don't requeue active work item). // - Add Directory Lock. // - Use Object Type Mutex/Lock. -// - Implement handle database if anyone needs it. // // Ex: // - Use pushlocks for handle implementation. Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Thu Jul 27 09:03:03 2006 @@ -46,59 +46,6 @@ /* Return status */ return Section ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; -} - -/* FIXME: - * This entire API is messed up because: - * 1) Directly pokes SECTION_OBJECT/FILE_OBJECT without special reffing. - * 2) Ignores SeAuditProcessImageFileName stuff added in XP (and ROS). - * 3) Doesn't use ObQueryNameString. - */ -NTSTATUS -NTAPI -PspGetImagePath(IN PEPROCESS Process, - OUT PUNICODE_STRING DstPath, - IN ULONG ProcessInformationLength) -{ - NTSTATUS Status; - ULONG ImagePathLen = 0; - PROS_SECTION_OBJECT Section; - PWSTR SrcBuffer = NULL, DstBuffer = (PWSTR)(DstPath + 1); - - Section = (PROS_SECTION_OBJECT)Process->SectionObject; - if ((Section)&& (Section->FileObject)) - { - /* FIXME - check for SEC_IMAGE and/or SEC_FILE instead - of relying on FileObject being != NULL? */ - SrcBuffer = Section->FileObject->FileName.Buffer; - if (SrcBuffer) ImagePathLen = Section->FileObject->FileName.Length; - } - - if (ProcessInformationLength < (sizeof(UNICODE_STRING) + - ImagePathLen + - sizeof(WCHAR))) - { - return STATUS_INFO_LENGTH_MISMATCH; - } - - Status = STATUS_SUCCESS; - _SEH_TRY - { - /* copy the string manually, don't use RtlCopyUnicodeString with DstPath! */ - DstPath->Length = ImagePathLen; - DstPath->MaximumLength = ImagePathLen + sizeof(WCHAR); - DstPath->Buffer = DstBuffer; - if (ImagePathLen) RtlCopyMemory(DstBuffer, SrcBuffer, ImagePathLen); - DstBuffer[ImagePathLen / sizeof(WCHAR)] = L'\0'; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - /* Return status */ - return Status; } /* PUBLIC FUNCTIONS **********************************************************/ @@ -126,6 +73,7 @@ (PPROCESS_SESSION_INFORMATION)ProcessInformation; PVM_COUNTERS VmCounters = (PVM_COUNTERS)ProcessInformation; PROCESS_DEVICEMAP_INFORMATION DeviceMap; + PUNICODE_STRING ImageName; ULONG Cookie; PAGED_CODE(); @@ -414,9 +362,36 @@ case ProcessImageFileName: /* Get the image path */ - Status = PspGetImagePath(Process, - (PUNICODE_STRING)ProcessInformation, - ProcessInformationLength); + Status = SeLocateProcessImageName(Process, &ImageName); + if (NT_SUCCESS(Status)) + { + /* Set return length */ + Length = ImageName->MaximumLength + + sizeof(OBJECT_NAME_INFORMATION); + + /* Make sure it's large enough */ + if (Length <= ProcessInformationLength) + { + /* Enter SEH to protect write */ + _SEH_TRY + { + /* Copy it */ + RtlMoveMemory(ProcessInformation, + ImageName, + Length); + + /* Update pointer */ + ((PUNICODE_STRING)ProcessInformation)->Buffer = + (PWSTR)((PUNICODE_STRING)ProcessInformation + 1); + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + } break; /* Per-process security cookie */

1 0

[jimtabor] 23304: - Part 2, Menu.c, cosmetic fixes. Fixed most of all the drawing issues. One outstanding needed fix is Lazarus. There maybe some tweaking needed, over all menus look nice.
by jimtabor＠svn.reactos.org 27 Jul '06

27 Jul '06

Author: jimtabor Date: Thu Jul 27 05:21:21 2006 New Revision: 23304 URL: http://svn.reactos.org/svn/reactos?rev=23304&view=rev Log: - Part 2, Menu.c, cosmetic fixes. Fixed most of all the drawing issues. One outstanding needed fix is Lazarus. There maybe some tweaking needed, over all menus look nice. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Thu Jul 27 05:21:21 2006 @@ -116,6 +116,8 @@ static HBITMAP StdMnArrow = NULL; static HBITMAP BmpSysMenu = NULL; + +static SIZE MenuCharSize; /*********************************************************************** * MenuGetRosMenuInfo @@ -768,7 +770,9 @@ SelectObject(DcMem, OrigBitmap); DeleteDC(DcMem); } - Rect.left += CheckBitmapWidth; + Rect.left += 4; + if( !(MenuInfo->dwStyle & MNS_NOCHECK)) + Rect.left += CheckBitmapWidth; Rect.right -= ArrowBitmapWidth; } else if (Item->hbmpItem) /* Draw the bitmap */ @@ -785,6 +789,9 @@ UINT uFormat = MenuBar ? DT_CENTER | DT_VCENTER | DT_SINGLELINE : DT_LEFT | DT_VCENTER | DT_SINGLELINE; + if( !(MenuInfo->dwStyle & MNS_CHECKORBMP)) + Rect.left += MenuInfo->maxBmpSize.cx; + if (0 != (Item->fState & MFS_DEFAULT)) { FontOld = SelectObject(Dc, hMenuFontBold); @@ -837,6 +844,7 @@ } else { + Rect.right = Item->XTab; uFormat = DT_RIGHT | DT_VCENTER | DT_SINGLELINE; } @@ -1178,7 +1186,7 @@ INT OrgX, INT OrgY, BOOL MenuBar) { PWCHAR p; - SIZE MenuCharSize; + INT itemheight = 0; UINT CheckBitmapWidth = GetSystemMetrics(SM_CXMENUCHECK); DPRINT("dc=%x owner=%x (%d,%d)\n", Dc, WndOwner, OrgX, OrgY); @@ -1231,83 +1239,114 @@ ItemInfo->Rect.right += ArrowBitmapWidth + MenuCharSize.cx; return; } - + + ItemInfo->XTab = 0; + if (ItemInfo->hbmpItem) - { + { SIZE Size; - if (!MenuBar) + if (!MenuBar) /* hbmpItem */ { MenuGetBitmapItemSize(ItemInfo, &Size, WndOwner ); - /* Keep the size of the bitmap in callback mode to be able - * to draw it correctly */ - ItemInfo->Rect.right = ItemInfo->Rect.left + Size.cx; - if (MenuInfo->maxBmpSize.cx < abs(Size.cx) + MENU_ITEM_HBMP_SPACE || - MenuInfo->maxBmpSize.cy < abs(Size.cy)) - { - MenuInfo->maxBmpSize.cx = abs(Size.cx) + MENU_ITEM_HBMP_SPACE; - MenuInfo->maxBmpSize.cy = abs(Size.cy); - } - MenuSetRosMenuInfo(MenuInfo); - - ItemInfo->Rect.right += 2 * CheckBitmapWidth; - if (0 != (ItemInfo->fType & MF_POPUP)) - { - ItemInfo->Rect.right += ArrowBitmapWidth; - } + /* Keep the size of the bitmap in callback mode to be able + * to draw it correctly */ + ItemInfo->Rect.right = ItemInfo->Rect.left + Size.cx; + if (MenuInfo->maxBmpSize.cx < abs(Size.cx) + MENU_ITEM_HBMP_SPACE || + MenuInfo->maxBmpSize.cy < abs(Size.cy)) + { + MenuInfo->maxBmpSize.cx = abs(Size.cx) + MENU_ITEM_HBMP_SPACE; + MenuInfo->maxBmpSize.cy = abs(Size.cy); + } + MenuSetRosMenuInfo(MenuInfo); + ItemInfo->Rect.right += Size.cx + 2; + itemheight = Size.cy + 2; + + if( !(MenuInfo->dwStyle & MNS_NOCHECK)) + ItemInfo->Rect.right += 2 * CheckBitmapWidth; + ItemInfo->Rect.right += 4 + MenuCharSize.cx; + ItemInfo->XTab = ItemInfo->Rect.right; + ItemInfo->Rect.right += ArrowBitmapWidth; } - else + else /* hbmpItem & MenuBar */ { MenuGetBitmapItemSize(ItemInfo, &Size, WndOwner ); ItemInfo->Rect.right += Size.cx; - ItemInfo->Rect.bottom += Size.cy; - - /* Leave space for the sunken border */ - ItemInfo->Rect.right += 2; - ItemInfo->Rect.bottom += 2; + if( ItemInfo->Text) ItemInfo->Rect.right += 2; + itemheight = Size.cy; /* Special case: Minimize button doesn't have a space behind it. */ if (ItemInfo->hbmpItem == (HBITMAP)HBMMENU_MBAR_MINIMIZE || ItemInfo->hbmpItem == (HBITMAP)HBMMENU_MBAR_MINIMIZE_D) ItemInfo->Rect.right -= 1; } - } + } + else if (!MenuBar) + { + if( !(MenuInfo->dwStyle & MNS_NOCHECK)) + ItemInfo->Rect.right += CheckBitmapWidth; + ItemInfo->Rect.right += 4 + MenuCharSize.cx; + ItemInfo->XTab = ItemInfo->Rect.right; + ItemInfo->Rect.right += ArrowBitmapWidth; + } /* it must be a text item - unless it's the system menu */ if (0 == (ItemInfo->fType & MF_SYSMENU) && ItemInfo->Text) - { - SIZE Size; - - GetTextExtentPoint32W(Dc, (LPWSTR) ItemInfo->dwTypeData, - strlenW((LPWSTR) ItemInfo->dwTypeData), &Size); - - ItemInfo->Rect.right += Size.cx; - ItemInfo->Rect.bottom += max(Size.cy, GetSystemMetrics(SM_CYMENU) - 1); - ItemInfo->XTab = 0; - - if (MenuBar) - { - ItemInfo->Rect.right += MENU_BAR_ITEMS_SPACE; - } - else if ((p = wcschr((LPWSTR) ItemInfo->dwTypeData, L'\t' )) != NULL) - { - /* Item contains a tab (only meaningful in popup menus) */ - GetTextExtentPoint32W(Dc, (LPWSTR) ItemInfo->dwTypeData, - (int)(p - (LPWSTR) ItemInfo->dwTypeData), &Size); - ItemInfo->XTab = CheckBitmapWidth + MENU_TAB_SPACE + Size.cx; - ItemInfo->Rect.right += MENU_TAB_SPACE; - } - else - { - if (NULL != wcschr((LPWSTR) ItemInfo->dwTypeData, L'\b')) - { - ItemInfo->Rect.right += MENU_TAB_SPACE; - } - ItemInfo->XTab = ItemInfo->Rect.right - CheckBitmapWidth - - ArrowBitmapWidth; - } - } - + { + HFONT hfontOld = NULL; + RECT rc = ItemInfo->Rect; + LONG txtheight, txtwidth; + + if ( ItemInfo->fState & MFS_DEFAULT ) + { + hfontOld = SelectObject( Dc, hMenuFontBold ); + } + if (MenuBar) + { + txtheight = DrawTextW( Dc, ItemInfo->dwTypeData, -1, &rc, + DT_SINGLELINE|DT_CALCRECT); + ItemInfo->Rect.right += rc.right - rc.left; + itemheight = max( max( itemheight, txtheight), + GetSystemMetrics( SM_CYMENU) - 1); + ItemInfo->Rect.right += 2 * MenuCharSize.cx; + } + else + { + if ((p = strchrW( ItemInfo->dwTypeData, '\t' )) != NULL) + { + RECT tmprc = rc; + LONG tmpheight; + int n = (int)( p - ItemInfo->dwTypeData); + /* Item contains a tab (only meaningful in popup menus) */ + /* get text size before the tab */ + txtheight = DrawTextW( Dc, ItemInfo->dwTypeData, n, &rc, + DT_SINGLELINE|DT_CALCRECT); + txtwidth = rc.right - rc.left; + p += 1; /* advance past the Tab */ + /* get text size after the tab */ + tmpheight = DrawTextW( Dc, p, -1, &tmprc, DT_SINGLELINE|DT_CALCRECT); + ItemInfo->XTab += txtwidth; + txtheight = max( txtheight, tmpheight); + txtwidth += MenuCharSize.cx + /* space for the tab */ + tmprc.right - tmprc.left; /* space for the short cut */ + } + else + { + txtheight = DrawTextW( Dc, ItemInfo->dwTypeData, -1, &rc, + DT_SINGLELINE|DT_CALCRECT); + txtwidth = rc.right - rc.left; + ItemInfo->XTab += txtwidth; + } + ItemInfo->Rect.right += 2 + txtwidth; + itemheight = max( itemheight, max( txtheight + 2, MenuCharSize.cy + 4)); + } + if (hfontOld) SelectObject (Dc, hfontOld); + } + else if( MenuBar) + { + itemheight = max( itemheight, GetSystemMetrics(SM_CYMENU)-1); + } + ItemInfo->Rect.bottom += itemheight; DPRINT("(%ld,%ld)-(%ld,%ld)\n", ItemInfo->Rect.left, ItemInfo->Rect.top, ItemInfo->Rect.right, ItemInfo->Rect.bottom); } @@ -1336,6 +1375,9 @@ Start = 0; MaxX = 2 + 1; + + MenuInfo->maxBmpSize.cx = 0; + MenuInfo->maxBmpSize.cy = 0; MenuInitRosMenuItemInfo(&ItemInfo); while (Start < MenuInfo->MenuItemCount) @@ -1441,6 +1483,9 @@ Start = 0; HelpPos = -1; + MenuInfo->maxBmpSize.cx = 0; + MenuInfo->maxBmpSize.cy = 0; + MenuInitRosMenuItemInfo(&ItemInfo); while (Start < MenuInfo->MenuItemCount) { @@ -1467,7 +1512,6 @@ DPRINT("calling MENU_CalcItemSize org=(%d, %d)\n", OrgX, OrgY); MenuCalcItemSize(Dc, &ItemInfo, MenuInfo, WndOwner, OrgX, OrgY, TRUE); - if (! MenuSetRosMenuItemInfo(MenuInfo->Self, i, &ItemInfo)) { MenuCleanupRosMenuItemInfo(&ItemInfo); @@ -1770,7 +1814,7 @@ if (GetSystemMetrics(SM_CXSCREEN ) < X + Width) { - if (0 != XAnchor) + if (0 != XAnchor && X >= Width - XAnchor) { X -= Width - XAnchor; } @@ -1786,7 +1830,7 @@ if (GetSystemMetrics(SM_CYSCREEN) < Y + Height) { - if (0 != YAnchor) + if (0 != YAnchor && Y >= Height + YAnchor) { Y -= Height + YAnchor; } @@ -2201,9 +2245,10 @@ if (0 != (MenuInfo->Flags & MF_POPUP)) { Rect.left += ItemInfo.Rect.right - GetSystemMetrics(SM_CXBORDER); - Rect.top += ItemInfo.Rect.top; + Rect.top += ItemInfo.Rect.top - 3; Rect.right = ItemInfo.Rect.left - ItemInfo.Rect.right + GetSystemMetrics(SM_CXBORDER); - Rect.bottom = ItemInfo.Rect.top - ItemInfo.Rect.bottom; + Rect.bottom = ItemInfo.Rect.top - ItemInfo.Rect.bottom - 3 - 2 + - GetSystemMetrics(SM_CYBORDER); } else {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs