Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[navaraf] 20106: Check for failed allocations. Spotted by Martin Bealby.

by navaraf＠svn.reactos.com

Check for failed allocations. Spotted by Martin Bealby. Modified: trunk/reactos/lib/ntdll/csr/capture.c Modified: trunk/reactos/lib/ntdll/csr/connect.c Modified: trunk/reactos/lib/ntdll/ldr/startup.c Modified: trunk/reactos/lib/ntdll/ldr/utils.c _____ Modified: trunk/reactos/lib/ntdll/csr/capture.c --- trunk/reactos/lib/ntdll/csr/capture.c 2005-12-12 18:15:19 UTC (rev 20105) +++ trunk/reactos/lib/ntdll/csr/capture.c 2005-12-12 19:23:52 UTC (rev 20106) @@ -95,6 +95,7 @@ /* Allocate memory from the port heap */ CaptureBuffer = RtlAllocateHeap(CsrPortHeap, 0, BufferSize); + if (CaptureBuffer == NULL) return NULL; /* Initialize the header */ CaptureBuffer->Size = BufferSize; _____ Modified: trunk/reactos/lib/ntdll/csr/connect.c --- trunk/reactos/lib/ntdll/csr/connect.c 2005-12-12 18:15:19 UTC (rev 20105) +++ trunk/reactos/lib/ntdll/csr/connect.c 2005-12-12 19:23:52 UTC (rev 20106) @@ -203,6 +203,10 @@ /* Allocate a buffer for it */ PortName.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, PortNameLength); + if (PortName.Buffer == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } /* Create the name */ RtlAppendUnicodeToString(&PortName, ObjectDirectory ); @@ -255,6 +259,13 @@ 0, 0, &SystemSid); + if (!NT_SUCCESS(Status)) + { + /* Failure */ + DPRINT1("Couldn't allocate SID\n"); + NtClose(CsrSectionHandle); + return Status; + } /* Connect to the port */ Status = NtSecureConnectPort(&CsrApiPort, @@ -293,6 +304,12 @@ PAGE_SIZE, 0, 0); + if (CsrPortHeap == NULL) + { + NtClose(CsrApiPort); + CsrApiPort = NULL; + return STATUS_INSUFFICIENT_RESOURCES; + } /* Return success */ return STATUS_SUCCESS; @@ -399,6 +416,10 @@ /* Setup a buffer for the connection info */ CaptureBuffer = CsrAllocateCaptureBuffer(1, ClientConnect->ConnectionInfoSize); + if (CaptureBuffer == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } /* Allocate a pointer for the connection info*/ CsrAllocateMessagePointer(CaptureBuffer, _____ Modified: trunk/reactos/lib/ntdll/ldr/startup.c --- trunk/reactos/lib/ntdll/ldr/startup.c 2005-12-12 18:15:19 UTC (rev 20105) +++ trunk/reactos/lib/ntdll/ldr/startup.c 2005-12-12 19:23:52 UTC (rev 20106) @@ -266,7 +266,7 @@ if (ImageBase <= (PVOID)0x1000) { DPRINT("ImageBase is null\n"); - ZwTerminateProcess(NtCurrentProcess(), STATUS_UNSUCCESSFUL); + ZwTerminateProcess(NtCurrentProcess(), STATUS_INVALID_IMAGE_FORMAT); } /* If MZ header exists */ @@ -278,7 +278,7 @@ *(PULONG)((PUCHAR)ImageBase + PEDosHeader->e_lfanew) != IMAGE_NT_SIGNATURE) { DPRINT1("Image has bad header\n"); - ZwTerminateProcess(NtCurrentProcess(), STATUS_UNSUCCESSFUL); + ZwTerminateProcess(NtCurrentProcess(), STATUS_INVALID_IMAGE_FORMAT); } /* normalize process parameters */ @@ -321,7 +321,7 @@ if (Peb->ProcessHeap == 0) { DPRINT1("Failed to create process heap\n"); - ZwTerminateProcess(NtCurrentProcess(),STATUS_UNSUCCESSFUL); + ZwTerminateProcess(NtCurrentProcess(), STATUS_INSUFFICIENT_RESOURCES); } /* initialized vectored exception handling */ @@ -345,6 +345,11 @@ RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(PVOID) * (USER32_CALLBACK_MAXIMUM + 1)); + if (Peb->KernelCallbackTable == NULL) + { + DPRINT1("Failed to create callback table\n"); + ZwTerminateProcess(NtCurrentProcess(),STATUS_INSUFFICIENT_RESOURCES); + } /* initalize loader lock */ RtlInitializeCriticalSection (&LoaderLock); @@ -357,7 +362,7 @@ if (Peb->Ldr == NULL) { DPRINT1("Failed to create loader data\n"); - ZwTerminateProcess(NtCurrentProcess(),STATUS_UNSUCCESSFUL); + ZwTerminateProcess(NtCurrentProcess(), STATUS_INSUFFICIENT_RESOURCES); } Peb->Ldr->Length = sizeof(PEB_LDR_DATA); Peb->Ldr->Initialized = FALSE; @@ -383,7 +388,7 @@ if (NtModule == NULL) { DPRINT1("Failed to create loader module entry (NTDLL)\n"); - ZwTerminateProcess(NtCurrentProcess(),STATUS_UNSUCCESSFUL); + ZwTerminateProcess(NtCurrentProcess(), STATUS_INSUFFICIENT_RESOURCES); } memset(NtModule, 0, sizeof(LDR_DATA_TABLE_ENTRY)); @@ -422,7 +427,7 @@ if (ExeModule == NULL) { DPRINT1("Failed to create loader module infomation\n"); - ZwTerminateProcess(NtCurrentProcess(),STATUS_UNSUCCESSFUL); + ZwTerminateProcess(NtCurrentProcess(), STATUS_INSUFFICIENT_RESOURCES); } ExeModule->DllBase = Peb->ImageBaseAddress; @@ -473,7 +478,7 @@ if (EntryPoint == NULL) { DPRINT1("Failed to initialize image\n"); - ZwTerminateProcess(NtCurrentProcess(),STATUS_UNSUCCESSFUL); + ZwTerminateProcess(NtCurrentProcess(), STATUS_INVALID_IMAGE_FORMAT); } } /* attach the thread */ _____ Modified: trunk/reactos/lib/ntdll/ldr/utils.c --- trunk/reactos/lib/ntdll/ldr/utils.c 2005-12-12 18:15:19 UTC (rev 20105) +++ trunk/reactos/lib/ntdll/ldr/utils.c 2005-12-12 19:23:52 UTC (rev 20106) @@ -2986,6 +2986,11 @@ KeyInfo = RtlAllocateHeap (RtlGetProcessHeap(), HEAP_ZERO_MEMORY, KeyInfoSize); + if (KeyInfo == NULL) + { + NtClose (KeyHandle); + return STATUS_INSUFFICIENT_RESOURCES; + } RtlInitUnicodeString (&ValueNameString, (PWSTR)ValueName); @@ -3007,7 +3012,7 @@ if (KeyInfo == NULL) { NtClose (KeyHandle); - return Status; + return STATUS_INSUFFICIENT_RESOURCES; } Status = NtQueryValueKey (KeyHandle,

18 years, 9 months

[gvg] 20105: FRy2oo5 <fRy2oo5@gmail.com>

by gvg＠svn.reactos.com

FRy2oo5 <fRy2oo5(a)gmail.com> German translation of getfirefox Added: trunk/reactos/apps/utils/getfirefox/De.rc Modified: trunk/reactos/apps/utils/getfirefox/getfirefox.rc _____ Added: trunk/reactos/apps/utils/getfirefox/De.rc --- trunk/reactos/apps/utils/getfirefox/De.rc 2005-12-12 17:12:58 UTC (rev 20104) +++ trunk/reactos/apps/utils/getfirefox/De.rc 2005-12-12 18:15:19 UTC (rev 20105) @@ -0,0 +1,44 @@ +/* + * PROJECT: ReactOS utilities + * LICENSE: GPL - See COPYING in the top level directory + * FILE: apps/utils/getfirefox/En.rc + * PURPOSE: English resources + * COPYRIGHT: Copyright 2004 Mike McCormack for CodeWeavers + * Copyright 2005 Ge van Geldorp (gvg(a)reactos.org) + */ +/* + * Based on Wine dlls/shdocvw/En.rc + * + * 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_GERMAN, SUBLANG_DEFAULT + +IDD_GETFIREFOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Lade Firefox herunter" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10, 200,12 + LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER + CHECKBOX "Entferne \"Get Firefox\" nach Fertigstellung aus dem Startmen³", IDC_REMOVE, + 10, 44, 200, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE +BEGIN + IDS_START_MENU_NAME "Get Firefox" +END Property changes on: trunk/reactos/apps/utils/getfirefox/De.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/apps/utils/getfirefox/getfirefox.rc --- trunk/reactos/apps/utils/getfirefox/getfirefox.rc 2005-12-12 17:12:58 UTC (rev 20104) +++ trunk/reactos/apps/utils/getfirefox/getfirefox.rc 2005-12-12 18:15:19 UTC (rev 20105) @@ -23,3 +23,4 @@ 1 ICON "firefox.ico" #include "En.rc" +#include "De.rc"

18 years, 9 months

[greatlrd] 20104: update translation hu from tally

by greatlrd＠svn.reactos.com

update translation hu from tally Modified: trunk/reactos/lib/devmgr/Hu.rc _____ Modified: trunk/reactos/lib/devmgr/Hu.rc --- trunk/reactos/lib/devmgr/Hu.rc 2005-12-12 16:44:09 UTC (rev 20103) +++ trunk/reactos/lib/devmgr/Hu.rc 2005-12-12 17:12:58 UTC (rev 20104) @@ -12,6 +12,7 @@ IDS_UNKNOWN "Ismeretlen" IDS_LOCATIONSTR "Hely %1!u! (%2)" IDS_DEVCODE " (Code %1!u!)" + IDS_DEVCODE2 " (Code %2!u!)" IDS_ENABLEDEVICE "Eszk÷z hasznßlata (bekapcsolva)" IDS_DISABLEDEVICE "Ne hasznßlja ezt az eszk÷zt (kikapcsolva)" IDS_UNKNOWNDEVICE "Ismeretlen eszk÷z" @@ -19,59 +20,74 @@ IDS_DEVONPARENT "on %1" IDS_TROUBLESHOOTDEV "&HibakeresÚs..." IDS_ENABLEDEV "Eszk÷z &bekapcsolßsa" + IDS_REINSTALLDRV "Meghajt¾programok ·j&ratelepÝtÚse" + IDS_PROPERTIES "&Tulajdonsßgok" + IDS_UPDATEDRV "Meghajt¾programok &frissÝtÚse..." + IDS_REBOOT "SzßmÝt¾gÚp &·jraindÝtßsa..." END STRINGTABLE BEGIN IDS_DEV_NO_PROBLEM "Ez az eszk÷z megfelel§en m¹k÷dik." - IDS_DEV_NOT_CONFIGURED "CM_PROB_NOT_CONFIGURED" - IDS_DEV_OUT_OF_MEMORY "CM_PROB_DEVLOADER_FAILED" - IDS_DEV_ENTRY_IS_WRONG_TYPE "CM_PROB_ENTRY_IS_WRONG_TYPE" - IDS_DEV_LACKED_ARBITRATOR "CM_PROB_LACKED_ARBITRATOR" - IDS_DEV_BOOT_CONFIG_CONFLICT "CM_PROB_BOOT_CONFIG_CONFLICT" - IDS_DEV_FAILED_FILTER "CM_PROB_FAILED_FILTER" - IDS_DEV_DEVLOADER_NOT_FOUND "CM_PROB_DEVLOADER_NOT_FOUND" - IDS_DEV_INVALID_DATA "CM_PROB_INVALID_DATA" - IDS_DEV_FAILED_START "CM_PROB_FAILED_START" - IDS_DEV_LIAR "CM_PROB_LIAR" - IDS_DEV_NORMAL_CONFLICT "CM_PROB_NORMAL_CONFLICT" - IDS_DEV_NOT_VERIFIED "CM_PROB_NOT_VERIFIED" - IDS_DEV_NEED_RESTART "CM_PROB_NEED_RESTART" - IDS_DEV_REENUMERATION "CM_PROB_REENUMERATION" - IDS_DEV_PARTIAL_LOG_CONF "CM_PROB_PARTIAL_LOG_CONF" - IDS_DEV_UNKNOWN_RESOURCE "CM_PROB_UNKNOWN_RESOURCE" - IDS_DEV_REINSTALL "CM_PROB_REINSTALL" - IDS_DEV_REGISTRY "CM_PROB_REGISTRY" - IDS_DEV_WILL_BE_REMOVED "CM_PROB_WILL_BE_REMOVED" - IDS_DEV_DISABLED "CM_PROB_DISABLED" - IDS_DEV_DEVLOADER_NOT_READY "CM_PROB_DEVLOADER_NOT_READY" - IDS_DEV_DEVICE_NOT_THERE "CM_PROB_DEVICE_NOT_THERE" - IDS_DEV_MOVED "CM_PROB_MOVED" - IDS_DEV_TOO_EARLY "CM_PROB_TOO_EARLY" - IDS_DEV_NO_VALID_LOG_CONF "CM_PROB_NO_VALID_LOG_CONF" - IDS_DEV_FAILED_INSTALL "CM_PROB_FAILED_INSTALL" - IDS_DEV_HARDWARE_DISABLED "CM_PROB_HARDWARE_DISABLED" - IDS_DEV_CANT_SHARE_IRQ "CM_PROB_CANT_SHARE_IRQ" - IDS_DEV_FAILED_ADD "CM_PROB_FAILED_ADD" - IDS_DEV_DISABLED_SERVICE "CM_PROB_DISABLED_SERVICE" - IDS_DEV_TRANSLATION_FAILED "CM_PROB_TRANSLATION_FAILED" - IDS_DEV_NO_SOFTCONFIG "CM_PROB_NO_SOFTCONFIG" - IDS_DEV_BIOS_TABLE "CM_PROB_BIOS_TABLE" - IDS_DEV_IRQ_TRANSLATION_FAILED "CM_PROB_IRQ_TRANSLATION_FAILED" - IDS_DEV_FAILED_DRIVER_ENTRY "CM_PROB_FAILED_DRIVER_ENTRY" - IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "CM_PROB_DRIVER_FAILED_PRIOR_UNLOAD" - IDS_DEV_DRIVER_FAILED_LOAD "CM_PROB_DRIVER_FAILED_LOAD" - IDS_DEV_DRIVER_SERVICE_KEY_INVALID "CM_PROB_DRIVER_SERVICE_KEY_INVALID" - IDS_DEV_LEGACY_SERVICE_NO_DEVICES "CM_PROB_LEGACY_SERVICE_NO_DEVICES" - IDS_DEV_DUPLICATE_DEVICE "CM_PROB_DUPLICATE_DEVICE" - IDS_DEV_FAILED_POST_START "CM_PROB_FAILED_POST_START" - IDS_DEV_HALTED "CM_PROB_HALTED" - IDS_DEV_PHANTOM "CM_PROB_PHANTOM" - IDS_DEV_SYSTEM_SHUTDOWN "CM_PROB_SYSTEM_SHUTDOWN" - IDS_DEV_HELD_FOR_EJECT "CM_PROB_HELD_FOR_EJECT" - IDS_DEV_DRIVER_BLOCKED "CM_PROB_DRIVER_BLOCKED" - IDS_DEV_REGISTRY_TOO_LARGE "CM_PROB_REGISTRY_TOO_LARGE" - IDS_DEV_SETPROPERTIES_FAILED "CM_PROB_SETPROPERTIES_FAILED" + IDS_DEV_NOT_CONFIGURED "Ez az eszk÷z rosszul van beßllÝtva." + IDS_DEV_DEVLOADER_FAILED "A ReactOS nem tudja bet÷lteni a meghajt¾programot ehhez az eszk÷zh÷z, mert a szßmÝt¾gÚp kÚt $1 busz tÝpust lßt." + IDS_DEV_DEVLOADER_FAILED2 "A(z) $1 eszk÷zvezÚrl§ bet÷lt§ nem tudjßk bet÷lteni ennek az eszk÷znek a meghajt¾programjßt." + IDS_DEV_OUT_OF_MEMORY "Az eszk÷z meghajt¾program hibßs lehet, vagy nincs elÚg mem¾ria a bet÷ltÚsÚhez." + IDS_DEV_ENTRY_IS_WRONG_TYPE "Ez az eszk÷z nem tud m¹k÷dni, mert a meghajt¾programjai vagy a rendszerleÝr¾ bejegyzÚsei hibßsak." + IDS_DEV_LACKED_ARBITRATOR "Az eszk÷z meghajt¾programja egy olyan er§forrßst igÚnyel amit nem tud a ReactOS kezelni." + IDS_DEV_BOOT_CONFIG_CONFLICT "Egy mßsik eszk÷z hasznßlja azokat az er§forrßsokat amelyeket ez az eszk÷z igÚnyel." + IDS_DEV_FAILED_FILTER "Az eszk÷z meghajt¾programjait ·jra kell telepÝteni." + IDS_DEV_DEVLOADER_NOT_FOUND "Ez az eszk÷z nem m¹k÷dik, mert a ReactOS nem tudja bet÷lteni a meghajt¾programjait, mivel a(z) $1 elÚrhetetlen." + IDS_DEV_DEVLOADER_NOT_FOUND2 "Ez az eszk÷z nem m¹k÷dik, mert a ReactOS nem tudja bet÷lteni a meghajt¾programjait, mivel a(z) $1 sÚr³lt." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Eszk÷z hiba: pr¾bßld meg kicserÚlni a meghajt¾programokat, Ús ha ez sem segÝt akkor nÚzd meg a felhasznßl¾i k÷nyvÚt." + IDS_DEV_INVALID_DATA "Ez az eszk÷z lehet, hogy nem fog megfelel§en m¹k÷dni, mert a szßmÝt¾gÚp BIOS-a rossz er§forrßsokat osztott ki." + IDS_DEV_INVALID_DATA2 "Ez az eszk÷z lehet, hogy nem fog megfelel§en m¹k÷dni, mert az eszk÷z BIOS-a rossz er§forrßsokat igÚnyelt." + IDS_DEV_FAILED_START "Ez az eszk÷z mßr nincs jelen, elromlott vagy nincs minden meghajt¾program feltelepÝtve hozzß." + IDS_DEV_LIAR "A ReactOS megßllt mik÷zben megpr¾bßlta elindÝtani ezt az eszk÷zt, ezÚrt nem fogja mÚgegyszer megpr¾bßlni." + IDS_DEV_NORMAL_CONFLICT "Az eszk÷z nem tud szabad $1 er§forrßst talßlni." + IDS_DEV_NOT_VERIFIED "Az eszk÷z meghajt¾programja nem talßlja az eszk÷zt." + IDS_DEV_NEED_RESTART "Ez az eszk÷z nem tud megfelel§en m¹k÷dni, amÝg nem indÝtod ·jra a gÚpet." + IDS_DEV_REENUMERATION "Az eszk÷z er§forrßs ³tk÷zÚst okozott el§." + IDS_DEV_PARTIAL_LOG_CONF "A ReactOS nem tudja azonosÝtani az eszk÷z ßltal hasznßlt er§forrßsokat." + IDS_DEV_UNKNOWN_RESOURCE "A meghajt¾program olyan er§forrßs hasznßlatßra kÚnyszerÝti az eszk÷zt, amelyet nem tud kezelni a szßmÝt¾gÚp eszk÷zvezÚrl§je." + IDS_DEV_REINSTALL "Az eszk÷z meghajt¾programjait ·jra kell telepÝteni." + IDS_DEV_REGISTRY "A rendszerleÝr¾ hibßs lehet." + IDS_DEV_WILL_BE_REMOVED "A ReactOS eltßvolÝtja ezt az eszk÷zt." + IDS_DEV_DISABLED "Az eszk÷z nincs bekapcsolva." + IDS_DEV_DISABLED2 "Az eszk÷z nincs bekapcsolva." + IDS_DEV_DEVLOADER_NOT_READY "Nem lehet bet÷lteni az igÚnyelt eszk÷z meghajt¾ programokat." + IDS_DEV_DEVLOADER_NOT_READY2 "Ez a megjelenÝt§ megfelel§en m¹k÷dik." + IDS_DEV_DEVLOADER_NOT_READY3 "Nem lehet bet÷lteni az igÚnyelt eszk÷z meghajt¾ programokat." + IDS_DEV_DEVICE_NOT_THERE "Ez az eszk÷z mßr nincs jelen, elromlott vagy nincs minden meghajt¾program feltelepÝtve hozzß." + IDS_DEV_MOVED "A ReactOS Úpp az eszk÷zt telepÝti." + IDS_DEV_TOO_EARLY "A ReactOS Úpp az eszk÷zt telepÝti." + IDS_DEV_NO_VALID_LOG_CONF "A ReactOS nemtudja megßllapÝtani, hogy milyen er§forrßsokat igÚnyel az eszk÷z." + IDS_DEV_FAILED_INSTALL "Az eszk÷zhoz nincsenek meghajt¾programok telepÝtve." + IDS_DEV_HARDWARE_DISABLED "Az eszk÷z levan tiltva, mivel a BIOS-a nem adott neki er§forrßst." + IDS_DEV_CANT_SHARE_IRQ "Ez az eszk÷z egy olyan megszakÝtßst (IRQ) igÚnyelt, amit egy mßsik eszk÷z hasznßl Ús nem oszthatja meg. "\ + "Meg kell vßltoztatnod az er§forrßs kiosztßst, vagy eltßvolÝtanod a real-mode (16 bites) meghajt¾programot." + IDS_DEV_FAILED_ADD "Ez az eszk÷z nem tud megfelel§en m¹k÷dni, mivel a(z) $1 sem m¹k÷dik megfelel§en." + IDS_DEV_DISABLED_SERVICE "A ReactOS nem tudja feltelepÝteni az eszk÷z meghajt¾programjait, mivel a programokat tartalmaz¾ hely nem elÚrhet§." + IDS_DEV_TRANSLATION_FAILED "Ez az eszk÷z nem vßlaszol a meghajt¾programjßnak." + IDS_DEV_NO_SOFTCONFIG "A ReactOS nem tudja kitalßlni a beßllÝtßsokat ehhez az eszk÷zh÷z. Hasznßld a felhasznßl¾i utasÝtßst, ami ehhez az eszk÷zh÷z jßr, Ús ßllÝtsd be az er§forrßsait." + IDS_DEV_BIOS_TABLE "A szßmÝt¾gÚp nem tud elÚg informßci¾t adni, hogy ezt az eszk÷zt megfelel§en hasznßlja. "\ + "Konzultßlj a gÚp karbantart¾jßval, illetve a cÚggel aki szßllÝtotta, hogy igÚnyelj egy firmware vagy BIOS frissÝtÚst." + IDS_DEV_IRQ_TRANSLATION_FAILED "Ez az eszk÷z egy PCI megszakÝtßst igÚnyelt de ISA megszakÝtßst hasznßl (vagy fordÝtva). "\ + "Hasznßld a gÚphez kapott meghajt¾programokat, hogy beßllÝthasd megfelel§en." + IDS_DEV_FAILED_DRIVER_ENTRY "A ReactOS nem tudja elindÝtani az eszk÷z meghajt¾programjßt." + IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "A ReactOS nem tudja elindÝtani az eszk÷z meghajt¾programjßt mivel egy el§z§ meghajt¾program mßr bevan t÷ltve a mem¾rißban." + IDS_DEV_DRIVER_FAILED_LOAD "A ReactOS nem tudja elindÝtani az eszk÷z meghajt¾programjßt. A meghajt¾program sÚr³lt vagy hißnyzik." + IDS_DEV_DRIVER_SERVICE_KEY_INVALID "A ReactOS nem tudja elÚrni ezt az eszk÷zt, mivel a szervÝz beßllÝtßsai a rendszerleÝr¾ban hibßsak vagy hißnyoznak." + IDS_DEV_LEGACY_SERVICE_NO_DEVICES "A ReactOS betudta t÷lteni az eszk÷z meghajt¾programjßt, de nem talßlja az eszk÷zt." + IDS_DEV_DUPLICATE_DEVICE "A ReactOS nem tudja elindÝtani az eszk÷z meghajt¾programjßt mivel mßr fut egy ilyen meghajt¾program." + IDS_DEV_FAILED_POST_START "A ReactOS leßllÝtotta ezt az eszk÷zt mert problÚmßk lÚptek fel." + IDS_DEV_HALTED "Egy alkalmazßs vagy szolgßltatßs leßllÝtotta ezt az eszk÷zt." + IDS_DEV_PHANTOM "Jelenleg ez az eszk÷z nincs a szßmÝt¾gÚphez csatlakoztatva." + IDS_DEV_SYSTEM_SHUTDOWN "A ReactOS nem tud hozzßfÚrni ehhez az eszk÷zh÷z, mivel a rendszer a leßllÝtßs folyamatßban van." + IDS_DEV_HELD_FOR_EJECT "A ReactOS nem tudja hasznßlni ezt az eszk÷zt, mivel a \"Biztonsßgos eltßvolÝtßs\" fßzisba ker³lt de mÚg nem lett eltßvolÝtva." + IDS_DEV_DRIVER_BLOCKED "Az eszk÷zh÷z tartoz¾ szoftver nem lett elindÝtva mivel nem m¹k÷dik a ReactOS-al. KÚrj egy friss meghajt¾program csomagot a gyßrt¾jßt¾l." + IDS_DEV_REGISTRY_TOO_LARGE "A ReactOS nem tudja elindÝtani ezt az eszk÷zt mert a rendszerleÝr¾ elÚrte a maximum mÚretÚt." + IDS_DEV_SETPROPERTIES_FAILED "A ReactOS nem tudta megvßltoztatni az eszk÷z beßllÝtßsait." END IDD_HARDWARE DIALOG DISCARDABLE 0, 0, 300, 400

18 years, 9 months

[hpoussin] 20103: Fix the case when IRP_MN_QUERY_DEVICE_TEXT returns nothing

by hpoussin＠svn.reactos.com

Fix the case when IRP_MN_QUERY_DEVICE_TEXT returns nothing Set DN_DRIVER_LOADED and DN_STARTED flags Modified: trunk/reactos/ntoskrnl/io/device.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnproot.c _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-12-12 09:06:40 UTC (rev 20102) +++ trunk/reactos/ntoskrnl/io/device.c 2005-12-12 16:44:09 UTC (rev 20103) @@ -163,7 +163,10 @@ } ObDereferenceObject(Fdo); - + + if (NT_SUCCESS(Status)) + DeviceNode->Flags |= DN_STARTED; + return Status; } _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-12-12 09:06:40 UTC (rev 20102) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-12-12 16:44:09 UTC (rev 20103) @@ -1753,7 +1753,7 @@ RtlInitUnicodeString(&ValueName, L"DeviceDesc"); if (ZwQueryValueKey(InstanceKey, &ValueName, KeyValueBasicInformation, NULL, 0, &RequiredLength) == STATUS_OBJECT_NAME_NOT_FOUND) { - if (NT_SUCCESS(IoStatusBlock.Status) && + if (NT_SUCCESS(Status) && IoStatusBlock.Information && (*(PWSTR)IoStatusBlock.Information != 0)) { @@ -1768,16 +1768,15 @@ } else { - UNICODE_STRING DeviceDesc; - RtlInitUnicodeString(&DeviceDesc, L"Unknown Device"); - DPRINT("Driver didn't return DeviceDesc (Status %x), so place unknown device there\n", Status); + UNICODE_STRING DeviceDesc = RTL_CONSTANT_STRING(L"Unknown device"); + DPRINT("Driver didn't return DeviceDesc (Status 0x%08lx), so place unknown device there\n", Status); Status = ZwSetValueKey(InstanceKey, &ValueName, 0, REG_SZ, - &DeviceDesc, - (wcslen((PWSTR)&DeviceDesc) + 1) * sizeof(WCHAR)); + DeviceDesc.Buffer, + DeviceDesc.MaximumLength); if (!NT_SUCCESS(Status)) { @@ -2014,6 +2013,7 @@ * device is started */ DPRINT("%wZ is using NULL driver\n", &DeviceNode->InstancePath); IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED); + DeviceNode->Flags |= DN_STARTED; } return STATUS_SUCCESS; } @@ -2095,8 +2095,11 @@ if (NT_SUCCESS(Status) || Status == STATUS_IMAGE_ALREADY_LOADED) { if (Status != STATUS_IMAGE_ALREADY_LOADED) + { + DeviceNode->Flags |= DN_DRIVER_LOADED; Status = IopInitializeDriverModule(DeviceNode, ModuleObject, &DeviceNode->ServiceName, FALSE, &DriverObject); + } else { /* get existing DriverObject pointer */ _____ Modified: trunk/reactos/ntoskrnl/io/pnproot.c --- trunk/reactos/ntoskrnl/io/pnproot.c 2005-12-12 09:06:40 UTC (rev 20102) +++ trunk/reactos/ntoskrnl/io/pnproot.c 2005-12-12 16:44:09 UTC (rev 20103) @@ -579,7 +579,7 @@ if (!NT_SUCCESS(Status)) { - /* FIXME: */ + Device->DeviceDescription.Buffer = NULL; } DPRINT("Got device description: %S\n", DeviceDesc->Buffer); @@ -1184,8 +1184,8 @@ { DPRINT("Called\n"); - DriverObject->MajorFunction[IRP_MJ_PNP] = (PDRIVER_DISPATCH) PnpRootPnpControl; - DriverObject->MajorFunction[IRP_MJ_POWER] = (PDRIVER_DISPATCH) PnpRootPowerControl; + DriverObject->MajorFunction[IRP_MJ_PNP] = PnpRootPnpControl; + DriverObject->MajorFunction[IRP_MJ_POWER] = PnpRootPowerControl; DriverObject->DriverExtension->AddDevice = PnpRootAddDevice; return STATUS_SUCCESS;

18 years, 9 months

[gvg] 20102: Benoit Plante <cmoibenlepro@hotmail.com>

by gvg＠svn.reactos.com

Benoit Plante <cmoibenlepro(a)hotmail.com> French translations Added: trunk/reactos/lib/user32/Fr.rc Modified: trunk/reactos/lib/user32/user32.rc Added: trunk/reactos/subsys/system/taskmgr/Fr.rc Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.rc _____ Added: trunk/reactos/lib/user32/Fr.rc --- trunk/reactos/lib/user32/Fr.rc 2005-12-12 08:58:57 UTC (rev 20101) +++ trunk/reactos/lib/user32/Fr.rc 2005-12-12 09:06:40 UTC (rev 20102) @@ -0,0 +1,79 @@ +//French Translation +//Benoit Plante (aka cmoibenlepro) +//2005 + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +/////////////////////////////////////////////////////////////////////// ////// +// +// Dialogs +// + +SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140 +STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +FONT 8, "Bitstream Vera Sans" +CAPTION "Select Window" +BEGIN + LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL + PUSHBUTTON "&OK", 1, 60, 120, 40, 15, BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Cancel", 2, 120, 120, 40, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menus +// + +EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE +{ + POPUP "DUMMY" + BEGIN + MENUITEM "Ann&uler", EM_UNDO + MENUITEM SEPARATOR + MENUITEM "&Couper", WM_CUT + MENUITEM "Co&pier", WM_COPY + MENUITEM "C&oller", WM_PASTE + MENUITEM "&Supprimer", WM_CLEAR + MENUITEM SEPARATOR + MENUITEM "&Tout sÚlectionner", EM_SETSEL + END +} + + +SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE +{ + MENUITEM "&Restaurer", 61728 + MENUITEM "&DÚplacer", 61456 + MENUITEM "&Taille", 61440 + MENUITEM "RÚ&duire", 61472 + MENUITEM "A&grandir", 61488 + MENUITEM SEPARATOR + MENUITEM "&Fermer\tAlt-F4", 61536 +} + +/////////////////////////////////////////////////////////////////////// ////// +// +// Strings +// + +STRINGTABLE +{ + IDS_ERROR, "Erreur" + IDS_OK, "OK" + IDS_CANCEL, "Annuler" + IDS_ABORT, "&Abandonner" + IDS_RETRY, "&RÚessayer" + IDS_IGNORE, "&Ignorer" + IDS_YES, "&Oui" + IDS_NO, "&Non" + IDS_HELP, "Aide" + IDS_TRYAGAIN, "R&ecommencer" + IDS_CONTINUE, "&Continuer" +} + +STRINGTABLE +{ + IDS_MDI_MOREWINDOWS, "Nouvelle &fenÛtre..." +} + Property changes on: trunk/reactos/lib/user32/Fr.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/user32/user32.rc --- trunk/reactos/lib/user32/user32.rc 2005-12-12 08:58:57 UTC (rev 20101) +++ trunk/reactos/lib/user32/user32.rc 2005-12-12 09:06:40 UTC (rev 20102) @@ -61,6 +61,7 @@ #include "En.rc" #include "Da.rc" #include "De.rc" +#include "Fr.rc" #include "Nl.rc" #include "Pl.rc" #include "Ja.rc" _____ Added: trunk/reactos/subsys/system/taskmgr/Fr.rc --- trunk/reactos/subsys/system/taskmgr/Fr.rc 2005-12-12 08:58:57 UTC (rev 20101) +++ trunk/reactos/subsys/system/taskmgr/Fr.rc 2005-12-12 09:06:40 UTC (rev 20102) @@ -0,0 +1,686 @@ +/////////////////////////////////////////////////////////////////////// ////// +// French (Fr) resources by Benoit Plante (aka cmoibenlepro) + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif //_WIN32 + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDR_TASKMANAGER MENU DISCARDABLE +BEGIN + POPUP "&Fichier" + BEGIN + MENUITEM "&Nouvelle tÔche (?xÚcuter...)", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "&Quitter le Gestionnaire des tÔches", ID_FILE_EXIT + END + POPUP "&Options" + BEGIN + MENUITEM "&Toujours visible", ID_OPTIONS_ALWAYSONTOP + , CHECKED + MENUITEM "&RÚduire Ó l'exÚcution", ID_OPTIONS_MINIMIZEONUSE + , CHECKED + MENUITEM "&Masquer l'ic¶ne rÚduite", ID_OPTIONS_HIDEWHENMINIMIZED + , CHECKED + MENUITEM "Afficher les &tÔches 16-bits", ID_OPTIONS_SHOW16BITTASKS + , CHECKED + END + POPUP "&Affichage" + BEGIN + MENUITEM "&Actualiser maintenant", ID_VIEW_REFRESH + POPUP "&FrÚquence d'actualisation" + BEGIN + MENUITEM "&Haute", ID_VIEW_UPDATESPEED_HIGH + MENUITEM "&Normale", ID_VIEW_UPDATESPEED_NORMAL + , CHECKED + MENUITEM "&Basse", ID_VIEW_UPDATESPEED_LOW + MENUITEM "&En pause", ID_VIEW_UPDATESPEED_PAUSED + + END + MENUITEM SEPARATOR + MENUITEM "&Grandes ic¶nes", ID_VIEW_LARGE + MENUITEM "&Petites ic¶nes", ID_VIEW_SMALL + MENUITEM "&DÚtails", ID_VIEW_DETAILS, CHECKED + MENUITEM "&SÚlectionner les colonnes...", ID_VIEW_SELECTCOLUMNS + POPUP "&Historique du processeur" + BEGIN + MENUITEM "&Un graphique pour tous les UC", ID_VIEW_CPUHISTORY_ONEGRAPHALL + + MENUITEM "Un graphique &par UC", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU + , CHECKED + END + MENUITEM "Aff&icher les temps du noyau", ID_VIEW_SHOWKERNELTIMES + END + POPUP "&FenÛtres" + BEGIN + MENUITEM "Mosa´que &horizontale", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Mosa´que &verticale", ID_WINDOWS_TILEVERTICALLY + MENUITEM "RÚd&uire", ID_WINDOWS_MINIMIZE + MENUITEM "Agra&ndir", ID_WINDOWS_MAXIMIZE + MENUITEM "&Cascade", ID_WINDOWS_CASCADE + MENUITEM "Mettre au &premier plan", ID_WINDOWS_BRINGTOFRONT + END + POPUP "&Aide" + BEGIN + MENUITEM "&Rubriques d'aide du Gestionnaire des tÔches", ID_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "? &propos du Gestionnaire des tÔches", ID_HELP_ABOUT + END +END + +IDR_WINDOWSMENU MENU DISCARDABLE +BEGIN + MENUITEM "Mosa´que &horizontale", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Mosa´que &verticale", ID_WINDOWS_TILEVERTICALLY + MENUITEM "RÚd&uire", ID_WINDOWS_MINIMIZE + MENUITEM "Agra&ndir", ID_WINDOWS_MAXIMIZE + MENUITEM "&Cascade", ID_WINDOWS_CASCADE + MENUITEM "Mettre au &premier plan", ID_WINDOWS_BRINGTOFRONT +END + +IDR_APPLICATION_PAGE_CONTEXT1 MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Nouvelle tÔche (?xÚcuter...)", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "&Grandes ic¶nes", ID_VIEW_LARGE + MENUITEM "&Petites ic¶nes", ID_VIEW_SMALL + MENUITEM "&DÚtails", ID_VIEW_DETAILS, CHECKED + END +END + +IDR_APPLICATION_PAGE_CONTEXT2 MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Basculer vers", ID_APPLICATION_PAGE_SWITCHTO + MENUITEM "Mettre au &premier plan", ID_WINDOWS_BRINGTOFRONT + MENUITEM SEPARATOR + MENUITEM "Mosa´que &horizontale", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Mosa´que &verticale", ID_WINDOWS_TILEVERTICALLY + MENUITEM "RÚd&uire", ID_WINDOWS_MINIMIZE + MENUITEM "Agra&ndir", ID_WINDOWS_MAXIMIZE + MENUITEM "&Cascade", ID_WINDOWS_CASCADE + MENUITEM SEPARATOR + MENUITEM "F&in de tÔche", ID_APPLICATION_PAGE_ENDTASK + MENUITEM "&Aller dans le processus", ID_APPLICATION_PAGE_GOTOPROCESS + + END +END + +IDR_TRAY_POPUP MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Restorer", ID_RESTORE + MENUITEM "&Fermer", ID_FILE_EXIT + MENUITEM SEPARATOR + MENUITEM "&Toujours visible", ID_OPTIONS_ALWAYSONTOP + END +END + +IDR_PROCESS_PAGE_CONTEXT MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Terminer le processus", ID_PROCESS_PAGE_ENDPROCESS + MENUITEM "T&erminer l'arborescence du processus", ID_PROCESS_PAGE_ENDPROCESSTREE + + MENUITEM "&DÚboguer", ID_PROCESS_PAGE_DEBUG + MENUITEM SEPARATOR + POPUP "DÚ&finir la prioritÚ" + BEGIN + MENUITEM "&Temps rÚel", ID_PROCESS_PAGE_SETPRIORITY_REALTIME + + MENUITEM "&Haute", ID_PROCESS_PAGE_SETPRIORITY_HIGH + + MENUITEM "&SupÚrieure Ó la normale", ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL + + MENUITEM "&Normale", ID_PROCESS_PAGE_SETPRIORITY_NORMAL + + MENUITEM "&InfÚrieure Ó la normale", ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL + + MENUITEM "&Basse", ID_PROCESS_PAGE_SETPRIORITY_LOW + + END + MENUITEM "DÚfinir l'&affinitÚ...", ID_PROCESS_PAGE_SETAFFINITY + MENUITEM "?diter les &canaux de dÚbogage...", ID_PROCESS_PAGE_DEBUGCHANNELS + END +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Ó propos du Gestionnaire des tÔches" +FONT 8, "Tahoma" +BEGIN + CONTROL "Gestionnaire des tÔches v1.0\nCopyright (C) 1999 - 2001\nby Brian Palmer (brianp(a)reactos.org)\nTraduit par Benoit Plante - 2005", + 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 "Gestionnaire des tÔches" +MENU IDR_TASKMANAGER +FONT 8, "Tahoma" +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, "Tahoma" +BEGIN + CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 + PUSHBUTTON "&Nouvelle tÔche (ExÚcuter...)",IDC_NEWTASK,187,189,53,14 + PUSHBUTTON "&Basculer vers",IDC_SWITCHTO,131,189,53,14,WS_DISABLED + PUSHBUTTON "F&in de tÔche",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, "Tahoma" +BEGIN + CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + WS_BORDER | WS_TABSTOP,7,7,233,177 + PUSHBUTTON "&Terminer le processus",IDC_ENDPROCESS,171,189,69,14 + CONTROL "Aff&icher les processus de tous les utilisateurs",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, "Tahoma" +BEGIN + GROUPBOX "Util. de l'UC",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "Util. du fichier",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT + GROUPBOX "Totaux",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Charge dÚdiÚe (Ko)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "MÚmoire physique (K)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Kernel Memory (Ko)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT + LTEXT "Handles",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 + LTEXT "Threads",IDS_TOTALS_THREAD_COUNT,12,140,27,8 + LTEXT "Processus",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 "Total",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 + LTEXT "Limite",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8 + LTEXT "Pic",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 "Total",IDS_PHYSICAL_MEMORY_TOTAL,137,131,27,8 + LTEXT "Disponible",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,30,8 + LTEXT "Cache systÞme",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 "Total",IDS_KERNEL_MEMORY_TOTAL,137,174,27,8 + LTEXT "PaginÚe",IDS_KERNEL_MEMORY_PAGED,137,184,21,8 + LTEXT "Non paginÚe",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 "Historique de l'utilisation de l'UC",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT + GROUPBOX "Historique d'utilisation du fichier d'Úchange",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARE NT + PUSHBUTTON "Affichage de l'utilisation de l'UC",IDC_CPU_USAGE_GRAPH,12,17,47,37,0, + WS_EX_CLIENTEDGE + PUSHBUTTON "Affichage de l'utilisation du fichier d'Úchange",IDC_MEM_USAGE_GRAPH,12,75,47,37,0, + WS_EX_CLIENTEDGE + PUSHBUTTON "Historique de l'utilisation de l'UC",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, + 153,37,0,WS_EX_CLIENTEDGE + PUSHBUTTON "Historique d'utilisation du fichier d'Úchange",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 "Cannaux de dÚbogage" +FONT 8, "Tahoma" +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 "Fermer",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 "AffinitÚ du processeur" +FONT 8, "Tahoma" +BEGIN + DEFPUSHBUTTON "OK",IDOK,120,133,50,14 + PUSHBUTTON "Annuler",IDCANCEL,174,133,50,14 + LTEXT "La configuration de l'affinitÚ du processeur contr¶le l'UC sur lequel un processus sera autorisÚ d'Ûtre exÚcutÚ", + IDC_STATIC,5,5,220,16 + CONTROL "UC 0",IDC_CPU0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 11,28,37,10 + CONTROL "UC 1",IDC_CPU1,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,41,37,10 + CONTROL "UC 2",IDC_CPU2,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,54,37,10 + CONTROL "UC 3",IDC_CPU3,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,67,37,10 + CONTROL "UC 4",IDC_CPU4,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,80,37,10 + CONTROL "UC 5",IDC_CPU5,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,93,37,10 + CONTROL "UC 6",IDC_CPU6,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,106,37,10 + CONTROL "UC 7",IDC_CPU7,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,119,37,10 + CONTROL "UC 8",IDC_CPU8,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,61,28,37,10 + CONTROL "UC 9",IDC_CPU9,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,61,41,37,10 + CONTROL "UC 10",IDC_CPU10,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,54,41,10 + CONTROL "UC 11",IDC_CPU11,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,67,41,10 + CONTROL "UC 12",IDC_CPU12,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,80,41,10 + CONTROL "UC 13",IDC_CPU13,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,93,41,10 + CONTROL "UC 14",IDC_CPU14,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,106,41,10 + CONTROL "UC 15",IDC_CPU15,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,119,41,10 + CONTROL "UC 16",IDC_CPU16,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,28,41,10 + CONTROL "UC 17",IDC_CPU17,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,41,41,10 + CONTROL "UC 18",IDC_CPU18,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,54,41,10 + CONTROL "UC 19",IDC_CPU19,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,67,41,10 + CONTROL "UC 20",IDC_CPU20,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,80,41,10 + CONTROL "UC 21",IDC_CPU21,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,93,41,10 + CONTROL "UC 22",IDC_CPU22,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,106,41,10 + CONTROL "UC 23",IDC_CPU23,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,119,41,10 + CONTROL "UC 24",IDC_CPU24,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,28,41,10 + CONTROL "UC 25",IDC_CPU25,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,41,41,10 + CONTROL "UC 26",IDC_CPU26,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,54,41,10 + CONTROL "UC 27",IDC_CPU27,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,67,41,10 + CONTROL "UC 28",IDC_CPU28,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,80,41,10 + CONTROL "UC 29",IDC_CPU29,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,93,41,10 + CONTROL "UC 30",IDC_CPU30,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,106,41,10 + CONTROL "UC 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 "SÚlection de colonnes" +FONT 8, "Tahoma" +BEGIN + DEFPUSHBUTTON "OK",IDOK,84,178,50,14 + PUSHBUTTON "Annuler",IDCANCEL,138,178,50,14 + LTEXT "SÚlectionnez les colones qui appara¯tront dans la page Processus du Gestionnaire des tÔches", + IDC_STATIC,7,7,181,17 + CONTROL "&Nom de l'image",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,7,28,56,10 + CONTROL "&PID (Identificateur du Processus)",IDC_PID,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,39,88,10 + CONTROL "Utilisation de l'UC",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,50,53,10 + CONTROL "T&emps processeur",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,61,48,10 + CONTROL "Utilisation de la &mÚmoire",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,72,63,10 + CONTROL "?cart &d'utilisation de la mÚmoire",IDC_MEMORYUSAGEDELTA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,83,82,10 + CONTROL "Utilisation ma&ximale de la mÚmoire",IDC_PEAKMEMORYUSAGE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,94,82,10 + CONTROL "Erreurs de page",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,105,53,10 + CONTROL "Objets &USER",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,116,62,10 + CONTROL "Lectures E/S",IDC_IOREADS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,127,49,10 + CONTROL "Octets de lecture E/S",IDC_IOREADBYTES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,138,65,10 + CONTROL "Identificateur de &session",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,149,50,10 + CONTROL "&Nom de l'utilisateur",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,160,51,10 + CONTROL "?c&art d'erreurs de pagination",IDC_PAGEFAULTSDELTA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,28,72,10 + CONTROL "Taille de la mÚmoire &virtuelle",IDC_VIRTUALMEMORYSIZE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,39,77,10 + CONTROL "RÚserve pa&ginÚe",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,50,53,10 + CONTROL "RÚserve &non paginÚe",IDC_NONPAGEDPOOL,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,61,67,10 + CONTROL "P&rioritÚ de base",IDC_BASEPRIORITY,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,72,55,10 + CONTROL "Nombre de &handles",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,83,59,10 + CONTROL "Nombre de &threads",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,94,59,10 + CONTROL "Objets GDI",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,105,55,10 + CONTROL "?critures E/S",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,116,49,10 + CONTROL "Octets d'Úcriture E/S",IDC_IOWRITEBYTES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,127,65,10 + CONTROL "Autres E/S",IDC_IOOTHER,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,138,46,10 + CONTROL "Octets d'autres E/S",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 "Gestionnaire des tÔches" + IDC_TASKMGR "Gestionnaire des tÔches" + IDS_IDLE_PROCESS "Processus systÞme en atente" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_FILE_NEW "ExÚcute un nouveau programme" + ID_OPTIONS_ALWAYSONTOP "Le Gestionnaire des tÔches reste devant toutes les autres fenÛtre Ó moins d'Ûtre rÚduit" + ID_OPTIONS_MINIMIZEONUSE + "Le Gestionnaire des tÔches est rÚduite lorqu'une action Basculer vers est rÚalisÚe" + ID_OPTIONS_HIDEWHENMINIMIZED "Masquer le Gestionnaire des tÔches lorsqu'il est rÚduit" + ID_VIEW_REFRESH "Actualise l'affichage maintenant, sans tenir compte de la frÚquence d'actualisation" + ID_VIEW_LARGE "Affiche les tÔches en utilisant des grandes ic¶nes" + ID_VIEW_SMALL "Affiche les tÔches en utilisant des petites ic¶nes" + ID_VIEW_DETAILS "Affiche des informations Ó propos de chaque tÔche" + ID_VIEW_UPDATESPEED_HIGH "Actualise l'Úcran deux fois par seconde" + ID_VIEW_UPDATESPEED_NORMAL "Actualise l'Úcran une fois toutes les deux secondes" + ID_VIEW_UPDATESPEED_LOW "Actualise l'Úcran toutes les quatre secondes" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_VIEW_UPDATESPEED_PAUSED "L'affichage n'est pas automatiquement actualisÚ" + ID_WINDOWS_TILEHORIZONTALLY + "Dispose les fenÛtres en mosa´que horizontale sur le bureau" + ID_WINDOWS_TILEVERTICALLY "Dispose les fenÛtres en mosa´que verticale sur le bureau" + ID_WINDOWS_MINIMIZE "Minimise les fenÛtres" + ID_WINDOWS_MAXIMIZE "Maximise les fenÛtres" + ID_WINDOWS_CASCADE "Dispose les fenÛtres en cascade diagonale sur le bureau" + ID_WINDOWS_BRINGTOFRONT "AmÞne une fenÛtre au premier plan, sans basculer vers elle" + ID_HELP_TOPICS "Affiche les rubriques d'aide du Gestionnaire des tÔches" + ID_HELP_ABOUT "Affiche les information sur le programme, la version et le copyright" + ID_FILE_EXIT "Quitte l'application Gestionnaire des tÔches" + ID_OPTIONS_SHOW16BITTASKS + "Affiche les tÔches 16-bits sous le ntvdm.exe associÚ" + ID_VIEW_SELECTCOLUMNS "SÚlectionne quelles colonnes seront affichÚs dans la page des processus" + ID_VIEW_SHOWKERNELTIMES "Affiche les temps du noyau dans les graphiques de performances" + ID_VIEW_CPUHISTORY_ONEGRAPHALL + "Un seul graphique montre l'usage de tous les UC" + ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "Chaque UC a son propre graphique" + ID_APPLICATION_PAGE_SWITCHTO + "AmÞne une tÔche en avant-plan, mettre le focus sur cette tÔche" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_ENDTASK "Ferme la tÔche sÚlectionnÚe" + ID_GOTOPROCESS "Met le focus sur le processus de la tÔche sÚlectionnÚe" + ID_RESTORE "Restaure le Gestionnaire des tÔches de son Útat masquÚ" + ID_PROCESS_PAGE_ENDPROCESS "EnlÞve le processus du systÞme" + ID_PROCESS_PAGE_ENDPROCESSTREE + "EnlÞve ce processus et tous ses descendants du systÞme" + ID_PROCESS_PAGE_DEBUG "Attache le dÚbogueur Ó ce processus" + ID_PROCESS_PAGE_SETAFFINITY + "Contr¶le le processeur sur lequel le processus sera autorisÚ de s'exÚcuter" + ID_PROCESS_PAGE_SETPRIORITY_REALTIME + "Place le processus dans la prioritÚ TEMPS R?EL" + ID_PROCESS_PAGE_SETPRIORITY_HIGH "Place le processus dans la prioritÚ HAUTE" + ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL + "Place le processus dans la prioritÚ SUP?RIEURE ? LA NORMALE" + ID_PROCESS_PAGE_SETPRIORITY_NORMAL + "Place le processus dans la prioritÚ NORMALE" + ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL + "Place le processus dans la prioritÚ INF?RIRIEURE ? LA NORMALE" + ID_PROCESS_PAGE_SETPRIORITY_LOW "Place le processus dans la prioritÚ BASSE" + IDS_LICENSE "Ce program est un logiciel libre; vous pouvez le distribuer et/ou le modifier sous les termes de la Licence GNU Lesser General Public License telle que publiÚe par laFree Software Foundation; soit la version 2.1 de la Licence, ou (Ó votre option) toute autre version plus rÚcente.\r\n\r\nCe program est distribuÚ dans l'espoir qu'il vous soit util, mais sans AUCUNE GARANTIE; sans mÛme la garantie implicite de MARCHANDISABILIT? ou d'FONCTIONNEMENT POUR UN USAGE PARTICULIER. Voir la GNU General Public License pour plus de dÚtails.\r\n\r\n Vous devriez avoir reþu une copie de la GNU General Public License avec ce program; sinon, Úcrivez Ó la Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TAB_APPS "Applications" + IDS_TAB_PROCESSES "Processus" + IDS_TAB_PERFORMANCE "Performance" + IDS_TAB_TASK "TÔche" + IDS_TAB_STATUS "Status" + IDS_TAB_IMAGENAME "Nome d'image" + IDS_TAB_PID "PID" + IDS_TAB_USERNAME "Nom d'utilisateur" + IDS_TAB_SESSIONID "Identificateur de session" + IDS_TAB_CPU "UC" + IDS_TAB_CPUTIME "Temps de l'UC" + IDS_TAB_MEMUSAGE "Utilisation du fichier" + IDS_TAB_PEAKMEMUSAGE "Utilisation maximale du fichier" + IDS_TAB_MEMDELTA "?cart d'utilisation du fichier" + IDS_TAB_PAGEFAULT "Erreurs de page" + IDS_TAB_PFDELTA "?cart de PF" + IDS_TAB_VMSIZE "Taille du VM" + IDS_TAB_PAGEDPOOL "RÚserve paginÚe" + IDS_TAB_NPPOOL "RÚserve non paginÚe" + IDS_TAB_BASEPRI "PrioritÚ de base" + IDS_TAB_HANDLES "Handles" + IDS_TAB_THREADS "Threads" + IDS_TAB_USERPBJECTS "Objets USER" + IDS_TAB_GDIOBJECTS "Objets GDI" + IDS_TAB_IOREADS "Lectures E/S" + IDS_TAB_IOWRITES "?critures E/S" + IDS_TAB_IOOTHER "Autres E/S" + IDS_TAB_IOREADBYTES "Octets de lecture E/S" + IDS_TAB_IOWRITESBYTES "Octets d'Úcriture E/S" + IDS_TAB_IOOTHERBYTES "Octets d'autres E/S" + IDS_MENU_SELECTCOLUMNS "&SÚlectionner les colonnes..." + IDS_MENU_16BITTASK "&Afficher les tÔches 16 bits" + IDS_MENU_WINDOWS "&FenÛtres" + IDS_MENU_LARGEICONS "&Grandes ic¶nes" + IDS_MENU_SMALLICONS "&Petites ic¶nes" + IDS_MENU_DETAILS "&DÚtails" + IDS_MENU_ONEGRAPHALLCPUS "&Un graphique pour tous les UC" + IDS_MENU_ONEGRAPHPERCPU "Un graphique &par UC" + IDS_MENU_CPUHISTORY "Historique de l'utilisation de l'UC" + IDS_MENU_SHOWKERNELTIMES "Aff&icher les temps du noyau" + IDS_CREATENEWTASK "CrÚer une nouvelle tÔche" + IDS_CREATENEWTASK_DESC "Tapez le nom d'un programme, dossier,document, ou ressource Internet resource et le Gestionnaire des tÔches l'ouvrira pour vous." + IDS_MSG_ACCESSPROCESSAFF "Impossible d'accÚder ou de mofier l'affinitÚ du processeur." + IDS_MSG_PROCESSONEPRO "Le processus doit avoir de l'affinitÚ avec au moins un processeur." + IDS_MSG_INVALIDOPTION "Option Invalide" + IDS_MSG_UNABLEDEBUGPROCESS "Impossible de dÚboguer le processus." + IDS_MSG_WARNINGDEBUG "ATTENTION: DÚboguer ce processus peut entr¯ner une perte de donnÚes.\n?tes-vous s¹rs de vouloir le dÚboguer?" + IDS_MSG_TASKMGRWARNING "Avertissement du Gestionnaire des tÔches" + IDS_MSG_WARNINGTERMINATING "ATTENTION: Terminer un processus peut causer des effets indÚsirables\nincluant une perte de donnÚe ou une instabilitÚ du systÞme.\nLe processus n'aura pas la chance de sauvegarder son Útat\nou les donnÚes avant de terminer.\n?tes-vous s¹r de vouloir terminer le processus?" + IDS_MSG_UNABLETERMINATEPRO "Impossible de terminer le processus" + IDS_MSG_UNABLECHANGEPRIORITY "Impossible de changer la prioritÚ" + IDS_MSG_WARNINGCHANGEPRIORITY "ATTENTION: Changer la prioritÚ du processus peut causer des\neffets indÚsirables comme l'instabilitÚ du systÞme.\n?tes-vous s¹r de vouloir changer la prioritÚ?" + IDS_MSG_TRAYICONCPUUSAGE "UC utilisÚe: %d%%" + IDS_STATUS_MEMUSAGE "Fichier d'Úchange utilisÚ: %dK / %dK" + IDS_STATUS_CPUUSAGE "UC utilisÚe: %3d%%" + IDS_STATUS_PROCESSES "Processus: %d" + IDS_Not_Responding "Ne rÚpond pas" + IDS_Running "En cours d'exÚcution" +END + + +#endif // French (Fr) resources by Benoit Plante (aka cmoibenlepro) +/////////////////////////////////////////////////////////////////////// ////// + + + +#ifndef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +/////////////////////////////////////////////////////////////////////// ////// +#endif // not APSTUDIO_INVOKED + Property changes on: trunk/reactos/subsys/system/taskmgr/Fr.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.rc --- trunk/reactos/subsys/system/taskmgr/taskmgr.rc 2005-12-12 08:58:57 UTC (rev 20101) +++ trunk/reactos/subsys/system/taskmgr/taskmgr.rc 2005-12-12 09:06:40 UTC (rev 20102) @@ -252,6 +252,7 @@ #include "De.rc" #include "Dk.rc" #include "Es.rc" +#include "Fr.rc" #include "Ja.rc" #include "Sv.rc" #include "Hu.rc"

18 years, 9 months

[gvg] 20101: samwise52 <samcharly@hotmail.com>

by gvg＠svn.reactos.com

samwise52 <samcharly(a)hotmail.com> Some spanish translation patches Added: trunk/reactos/lib/cpl/hdwwiz/Es.rc Modified: trunk/reactos/lib/cpl/hdwwiz/hdwwiz.rc Added: trunk/reactos/lib/cpl/liccpa/Es.rc Modified: trunk/reactos/lib/cpl/liccpa/liccpa.rc Added: trunk/reactos/lib/cpl/main/Es.rc Modified: trunk/reactos/lib/cpl/main/main.rc Added: trunk/reactos/lib/cpl/mmsys/Es.rc Modified: trunk/reactos/lib/cpl/mmsys/mmsys.rc Added: trunk/reactos/lib/devmgr/Es.rc Modified: trunk/reactos/lib/devmgr/devmgr.rc _____ Added: trunk/reactos/lib/cpl/hdwwiz/Es.rc --- trunk/reactos/lib/cpl/hdwwiz/Es.rc 2005-12-12 08:41:02 UTC (rev 20100) +++ trunk/reactos/lib/cpl/hdwwiz/Es.rc 2005-12-12 08:58:57 UTC (rev 20101) @@ -0,0 +1,7 @@ +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + +STRINGTABLE +BEGIN + IDS_CPLNAME "A±ade Nuevo Hardware" + IDS_CPLDESCRIPTION "A±ade Nuevo Hardware a tu computadora." +END Property changes on: trunk/reactos/lib/cpl/hdwwiz/Es.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cpl/hdwwiz/hdwwiz.rc --- trunk/reactos/lib/cpl/hdwwiz/hdwwiz.rc 2005-12-12 08:41:02 UTC (rev 20100) +++ trunk/reactos/lib/cpl/hdwwiz/hdwwiz.rc 2005-12-12 08:58:57 UTC (rev 20101) @@ -22,3 +22,4 @@ #include "Fr.rc" #include "Ja.rc" #include "Hu.rc" +#include "Es.rc" _____ Added: trunk/reactos/lib/cpl/liccpa/Es.rc --- trunk/reactos/lib/cpl/liccpa/Es.rc 2005-12-12 08:41:02 UTC (rev 20100) +++ trunk/reactos/lib/cpl/liccpa/Es.rc 2005-12-12 08:58:57 UTC (rev 20101) @@ -0,0 +1,27 @@ +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + +IDD_PROPPAGE1 DIALOG DISCARDABLE 20, 40, 315, 104 +STYLE DS_MODALFRAME | WS_OVERLAPPED | WS_CAPTION | WS_VISIBLE | WS_SYSMENU +CAPTION "Seleccione modo de licencia" +FONT 8, "Helv" +BEGIN + CONTROL "Modo de licencia cliente", 100, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 4, 4, 239, 94 + CONTROL "Por Dispositivo o Por Usuario", 102, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 79, 107, 12 + CONTROL "Por Servidor. N·mero de conecciones concurrentes",103, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 38, 163, 9 + CONTROL "Producto:", 105, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 13, 20, 31, 8 + CONTROL "", 106, "COMBOBOX", CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP, 49, 20, 171, 12 + CONTROL "Aceptar", 107, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 7, 46, 14 + CONTROL "Cancelar", 108, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 27, 46, 14 + CONTROL "Ayuda", 109, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 48, 46, 14 + CONTROL "Replicaci¾n...", 110, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 68, 46, 14 + CONTROL "A±adir Licensias", 111, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 30, 56, 65, 15 + CONTROL "Remover Licensias", 112, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 112, 56, 61, 16 + CONTROL "", 114, "EDIT", ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 187, 39, 32, 12 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "License Manager" + IDS_CPLDESCRIPTION_1 "License Manager" + IDS_REACTOS "ReactOS - FreeSoftware" +END Property changes on: trunk/reactos/lib/cpl/liccpa/Es.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cpl/liccpa/liccpa.rc --- trunk/reactos/lib/cpl/liccpa/liccpa.rc 2005-12-12 08:41:02 UTC (rev 20100) +++ trunk/reactos/lib/cpl/liccpa/liccpa.rc 2005-12-12 08:58:57 UTC (rev 20101) @@ -14,4 +14,4 @@ #include "En.rc" #include "Ja.rc" - +#include "Es.rc" _____ Added: trunk/reactos/lib/cpl/main/Es.rc --- trunk/reactos/lib/cpl/main/Es.rc 2005-12-12 08:41:02 UTC (rev 20100) +++ trunk/reactos/lib/cpl/main/Es.rc 2005-12-12 08:58:57 UTC (rev 20101) @@ -0,0 +1,24 @@ +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + +IDD_KEYBSPEED DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Velocidad" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Velocidad del teclado",-1,73,74,90,8 +END + +IDD_HARDWARE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Hardware" +FONT 8, "MS Shell Dlg" +BEGIN +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "Raton" + IDS_CPLDESCRIPTION_1 "Ajusta las propiedades del raton." + IDS_CPLNAME_2 "Teclado" + IDS_CPLDESCRIPTION_2 "Ajusta las propiedades del teclado." +END Property changes on: trunk/reactos/lib/cpl/main/Es.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cpl/main/main.rc --- trunk/reactos/lib/cpl/main/main.rc 2005-12-12 08:41:02 UTC (rev 20100) +++ trunk/reactos/lib/cpl/main/main.rc 2005-12-12 08:58:57 UTC (rev 20101) @@ -18,3 +18,4 @@ #include "Nl.rc" #include "Ja.rc" #include "Hu.rc" +#include "Es.rc" _____ Added: trunk/reactos/lib/cpl/mmsys/Es.rc --- trunk/reactos/lib/cpl/mmsys/Es.rc 2005-12-12 08:41:02 UTC (rev 20100) +++ trunk/reactos/lib/cpl/mmsys/Es.rc 2005-12-12 08:58:57 UTC (rev 20101) @@ -0,0 +1,15 @@ +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + +IDD_HARDWARE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Hardware" +FONT 8, "MS Shell Dlg" +BEGIN +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Dispositivos de Audio y Sonido" + IDS_CPLDESCRIPTION "Cambia el esquema de sonidos de su computadora, o configura las propiedades de sus bocinas y dispositivos de grabaci¾n." +END + Property changes on: trunk/reactos/lib/cpl/mmsys/Es.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cpl/mmsys/mmsys.rc --- trunk/reactos/lib/cpl/mmsys/mmsys.rc 2005-12-12 08:41:02 UTC (rev 20100) +++ trunk/reactos/lib/cpl/mmsys/mmsys.rc 2005-12-12 08:58:57 UTC (rev 20101) @@ -12,3 +12,4 @@ #include "En.rc" #include "De.rc" +#include "Es.rc" _____ Added: trunk/reactos/lib/devmgr/Es.rc --- trunk/reactos/lib/devmgr/Es.rc 2005-12-12 08:41:02 UTC (rev 20100) +++ trunk/reactos/lib/devmgr/Es.rc 2005-12-12 08:58:57 UTC (rev 20101) @@ -0,0 +1,129 @@ +// Spanish language resource file (Samuel Serapion Vega 2005-12-10) + +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + +STRINGTABLE +BEGIN + IDS_NAME "Nombre" + IDS_TYPE "Tipo" + IDS_MANUFACTURER "Fabricante: %1" + IDS_LOCATION "Localizaci¾n: %1" + IDS_STATUS "Estatus de Dispositivo: %1" + IDS_UNKNOWN "Desconocido" + IDS_LOCATIONSTR "Localizaci¾n %1!u! (%2)" + IDS_DEVCODE " (Codigo %1!u!)" + IDS_DEVCODE2 " (Codigo %2!u!)" + IDS_ENABLEDEVICE "Habilita este dispositivo (enable)" + IDS_DISABLEDEVICE "No utilize este dispositivo (disable)" + IDS_UNKNOWNDEVICE "Dispositivo desconocido" + IDS_NODRIVERLOADED "Ningun driver esta instalado para este dispositivo." + IDS_DEVONPARENT "en %1" + IDS_TROUBLESHOOTDEV "&Localice averÝas..." + IDS_ENABLEDEV "Habilit&e Dispositivo" + IDS_REINSTALLDRV "Re&instalar Driver" + IDS_PROPERTIES "P&ropiedades" + IDS_UPDATEDRV "Actualize Driver..." + IDS_REBOOT "Restart &Computer..." +END + +/* error messages, source: http://www.z123.org/techsupport/medm.htm */ +STRINGTABLE +BEGIN + IDS_DEV_NO_PROBLEM "Este dispositivo estß funcionando correctamente." + IDS_DEV_NOT_CONFIGURED "Este dispositivo no esta configurado correctamente." + IDS_DEV_DEVLOADER_FAILED "ReactOS no podrÝa cargar el driver para este dispositivo porque la computadora estß reportando dos $1 tipos de Bus." + IDS_DEV_DEVLOADER_FAILED2 "El cargador(es) de $1 no puede cargar el driver del dispositivo." + IDS_DEV_OUT_OF_MEMORY "El driver para este dispositivo puede estar malo, o su sistema puede estar bajo en memoria u otros recursos." + IDS_DEV_ENTRY_IS_WRONG_TYPE "Este dispositivo no estß funcionando correctamente porque uno de sus drivers estan malos, o su registro esta corrupto." + IDS_DEV_LACKED_ARBITRATOR "El driver para este dispositivo solicit¾ un recurso que ReactOS no sabe dirigir." + IDS_DEV_BOOT_CONFIG_CONFLICT "Otro dispositivo estß utilizando los recursos que necesita de este dispositivo." + IDS_DEV_FAILED_FILTER "Los drivers para este dispositivo necesitan ser reinstalados." + IDS_DEV_DEVLOADER_NOT_FOUND "Este dispositivo no estß funcionando correctamente porque ReactOS no puede cargar el archivo $1 que carga los drivers para el dispositivo." + IDS_DEV_DEVLOADER_NOT_FOUND2 "Este dispositivo no estß funcionando correctamente porque el archivo $1 que carga los conductores para este dispositivo esta malo." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Falla del dispositivo: Trate cabiar el driver para este dispositivo. Si eso no funciona, vea la documentaci¾n de su hardware." + IDS_DEV_INVALID_DATA "Este dispositivo no estß funcionando correctamente porque el BIOS en su computadora estß reportando los recursos para el dispositivo incorrectamente." + IDS_DEV_INVALID_DATA2 "Este dispositivo no estß funcionando correctamente porque el BIOS en el dispositivo estß reportando los recursos para el dispositivo incorrectamente." + IDS_DEV_FAILED_START "Este dispositivo o no esta presente, no trabajando correctamente, o no tiene todos los drivers instalados." + IDS_DEV_LIAR "ReactOS par¾ de responder mientras que procuraba encender este dispositivo, y por lo tanto nunca procurarß encender este dispositivo otra vez." + IDS_DEV_NORMAL_CONFLICT "Este dispositivo no puede encontrar ningun $1 recurso libre para utilizar." + IDS_DEV_NOT_VERIFIED "Este dispositivo no esta presente, no trabaja correctamente, o no tiene todos los drivers instalados." + IDS_DEV_NEED_RESTART "Este dispositivo no puede trabajar correctamente hasta que usted recomienze su computadora." + IDS_DEV_REENUMERATION "Este dispositivo estß causando un conflicto de recursos." + IDS_DEV_PARTIAL_LOG_CONF "ReactOS no puede identificar todos los recursos que este dispositivo usa." + IDS_DEV_UNKNOWN_RESOURCE "El archivo de informaci¾n del driver $1 estß diciendo que este dispositivo ni±o utiliza un recurso que el dispositivo padre no tiene o no reconoce." + IDS_DEV_REINSTALL "Los drivers para este dispositivo necesitan ser reinstalados." + IDS_DEV_REGISTRY "Su registro puede estar corrupto." + IDS_DEV_WILL_BE_REMOVED "ReactOS esta removiendo este dispositivo." + IDS_DEV_DISABLED "Este dispositivo no ha sido inicializado." + IDS_DEV_DISABLED2 "Este dispositivo ha sido desabilitado." + IDS_DEV_DEVLOADER_NOT_READY "Los cargadores para este dispositivo no pueden cargar los drivers requeridos." + IDS_DEV_DEVLOADER_NOT_READY2 "Este adaptador de video esta funcionando correctamente." + IDS_DEV_DEVLOADER_NOT_READY3 "Los cargadores para este dispositivo no pueden cargar los drivers requeridos." + IDS_DEV_DEVICE_NOT_THERE "Este dispositivo no esta presente, no trabaja correctamente, o no tiene todos los drivers instalados." + IDS_DEV_MOVED "ReactOS estß en el proceso de instalaci¾n de este dispositivo." + IDS_DEV_TOO_EARLY "ReactOS estß en el proceso de instalaci¾n de este dispositivo." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS no puede especificar los recursos para este dispositivo." + IDS_DEV_FAILED_INSTALL "Los drivers para este dispositivo no estßn instalados." + IDS_DEV_HARDWARE_DISABLED "Este dispositivo es desabilitado porque el BIOS para el dispositivo no le dio ningun recurso." + IDS_DEV_CANT_SHARE_IRQ "Este dispositivo estß utilizando un recurso de la petici¾n de interrupci¾n (IRQ) que usa otro dispositivo y no puede ser compartido." \ + "Usted debe cambiar la opci¾n que esta confligiendo o remover el real-mode driver que causa el conflicto." + IDS_DEV_FAILED_ADD "Este dispositivo no estß funcionando correctamente porque $1 no estß trabajando correctamente." + IDS_DEV_DISABLED_SERVICE "ReactOS no puede instalar los drivers para este dispositivo porque no se puede accesar el disco o la localizaci¾n en la red que tiene los archivos de instalaci¾n." + IDS_DEV_TRANSLATION_FAILED "Este dispositivo no responde a su driver." + IDS_DEV_NO_SOFTCONFIG "ReactOS no puede determinar las propiedades de este dispositivo. Consulte la documentaci¾n que vino con este dispositivo y utiliza la leng³eta del recurso para fijar la configuraci¾n correcta." + IDS_DEV_BIOS_TABLE "Los soportes l¾gicos inalterables del sistema(firmware) no incluyen suficiente informaci¾n para configurar correctamente y utilizar este dispositivo" \ + "Para utilizar este dispositivo, entre en contacto con su fabricante de computadora para obtener una actualizaci¾n del BIOS." + IDS_DEV_IRQ_TRANSLATION_FAILED "Este dispocitivo esta pidiendo un interruptor PC pero es configurado para interruptor ISA (o vice versa). "\ + "Por favor utilize el programa de configuraci¾n del BIOS para reconfigurar el interruptor para este dispositivo." + IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS no puede inicializar el driver de dispositivo para este hardware." + IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS no puede cargar el driver de dispositivo para este hardware porque un caso anterior del driver de dispositivo todavÝa estß en memoria." + IDS_DEV_DRIVER_FAILED_LOAD "ReactOS no puede cargar el driver de dispositivo para este hardware. El driver puede estar corrompido o ausente." + IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS no puede tener acceso a este hardware porque su informaci¾n de la llave del servicio en el registro es falta o esta registrada incorrectamente." + IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS carg¾ con Úxito el driver del dispositivo pero no puede encontrar el dispositivo." + IDS_DEV_DUPLICATE_DEVICE "ReactOS no puede cargar el driver de dispositivo para este hardware porque hay un dispositivo duplicado que ya funciona en el sistema." + IDS_DEV_FAILED_POST_START "ReactOS a desabilitado este dispositivo porque a reportado problemas." + IDS_DEV_HALTED "Una applicaci¾n o un servicio ha cerrado este dispositivo de hardware." + IDS_DEV_PHANTOM "Actualmente, este dispositivo de hardware no estß conectado a la computadora." + IDS_DEV_SYSTEM_SHUTDOWN "ReactOS no puede accesar este dispositivo de hardware porque el sistema operativo estß en el proceso de cerrar." + IDS_DEV_HELD_FOR_EJECT "ReactOS no puede usar este dispositivo de hardware por que ha sido preparado para \"remoci¾n segura\", pero aun no ha sido desconectado de la computadora." + IDS_DEV_DRIVER_BLOCKED "El software para este dispositivo se ha bloqueado de comenzar porque tiene problemas con ReactOS. Entre en contacto con su vendedor de hardware para un driver nuevo." + IDS_DEV_REGISTRY_TOO_LARGE "ReactOS no puede encender los nuevos dispositivos de hardware porque la colmena(hive) del sistema es demasiado grande (excede el lÝmite del tama±o del registro)." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS no fue capaz de cambiar las propiedades de este dispositivo." +END + +IDD_HARDWARE DIALOG DISCARDABLE 0, 0, 300, 400 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Dispositivos:",IDC_DEVICES,7,6,196,10 + CONTROL "",IDC_LV_DEVICES,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,16,196,50 + GROUPBOX "Propiedades de Dispositivos",IDC_PROPERTIESGROUP,7,76,196,105 + LTEXT "",IDC_MANUFACTURER,14,88,183,10,SS_ENDELLIPSIS + LTEXT "",IDC_LOCATION,14,100,183,10,SS_ENDELLIPSIS + LTEXT "",IDC_STATUS,14,112,183,30 + PUSHBUTTON "&Localize Averias...",IDC_TROUBLESHOOT,85,140,54,14, + BS_PUSHBUTTON | WS_CHILD | WS_DISABLED | WS_TABSTOP + PUSHBUTTON "P&ropiedades",IDC_PROPERTIES,146,140,50,14 +END + +IDD_DEVICEGENERAL DIALOG DISCARDABLE 0, 0, 252, 218 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Tipo de dispositivo:", -1, 37, 39, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVTYPE, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Manufacturero:", -1, 37, 53, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVMANUFACTURER, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Localizaci¾n:", -1, 37, 67, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVLOCATION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + GROUPBOX "Estatus del dispositivo", IDC_DEVSTATUSGROUP, 7, 83, 238, 100 + EDITTEXT IDC_DEVSTATUS, 14, 96, 224, 61, NOT WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL + PUSHBUTTON "&Localize Averias...", IDC_DEVPROBLEM, 148, 163, 90, 15 + LTEXT "Uso del &Dispositivo:", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED + COMBOBOX IDC_DEVUSAGE, 7, 198, 239, 40, CBS_DROPDOWNLIST | WS_VSCROLL | WS_DISABLED +END Property changes on: trunk/reactos/lib/devmgr/Es.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/devmgr/devmgr.rc --- trunk/reactos/lib/devmgr/devmgr.rc 2005-12-12 08:41:02 UTC (rev 20100) +++ trunk/reactos/lib/devmgr/devmgr.rc 2005-12-12 08:58:57 UTC (rev 20101) @@ -17,4 +17,5 @@ #include "Hu.rc" #include "Pl.rc" #include "De.rc" +#include "Es.rc"

18 years, 9 months

[cwittich] 20100: added "generic floppy disk controller" (currently using NO_DRV)

by cwittich＠svn.reactos.com

added "generic floppy disk controller" (currently using NO_DRV) Added: trunk/reactos/media/inf/fdc.inf _____ Added: trunk/reactos/media/inf/fdc.inf --- trunk/reactos/media/inf/fdc.inf 2005-12-12 04:50:06 UTC (rev 20099) +++ trunk/reactos/media/inf/fdc.inf 2005-12-12 08:41:02 UTC (rev 20100) @@ -0,0 +1,64 @@ +; FDC.INF + +; Installation file for floppy disk controllers + +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf +Class = FDC +ClassGUID = {4D36E96A-E325-11CE-BFC1-08002BE10318} +Provider = %ReactOS% +DriverVer = 15/08/2005,1.01.0.0 + +[DestinationDirs] +DefaultDestDir = 12 + +[ClassInstall32.NT] +AddReg = FDC.NT.AddReg + +[FDC.NT.AddReg] +HKR, , , 0, %FDCClassName% +HKR, , Icon, 0, "-9" +HKR,,NoInstallClass,,1 + +[Manufacturer] +%GenericMfg% = GenericMfg + +[GenericMfg] +;FIXME: We do not have a driver yet +;%*PNP0700.DeviceDesc% = fdc_Inst,*PNP0700 +%*PNP0700.DeviceDesc% = NO_DRV,*PNP0700 + +;----------------------------- FDC DRIVER ----------------------------- + +[fdc_Inst.NT] +CopyFiles = fdc_CopyFiles.NT + +[fdc_CopyFiles.NT] +fdc.sys + +[fdc_Inst.NT.Services] +AddService = fdc, 0x00000002, fdc_Service_Inst + +[fdc_Service_Inst] +ServiceType = 1 +StartType = 0 +ErrorControl = 1 +ServiceBinary = %12%\fdc.sys + +;---------------------------- NO DRIVER REQ ----------------------------- + +[NO_DRV] + +[NO_DRV.Services] +AddService = , 0x00000002 + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +ReactOS = "ReactOS Team" +FDCClassName = "Floppy disks controllers" + +GenericMfg = "(Generic floppy disk controllers)" +*PNP0700.DeviceDesc = "Generic floppy disk controller"

18 years, 9 months

[amunger] 20099: Merge 20041 from trunk

by amunger＠svn.reactos.com

Merge 20041 from trunk Modified: branches/ros-branch-0_2_9/reactos/drivers/usb/miniport/usbohci/ohci-pci. c Modified: branches/ros-branch-0_2_9/reactos/drivers/usb/usbport/hcd.h _____ Modified: branches/ros-branch-0_2_9/reactos/drivers/usb/miniport/usbohci/ohci-pci. c --- branches/ros-branch-0_2_9/reactos/drivers/usb/miniport/usbohci/ohci-pci. c 2005-12-12 02:05:54 UTC (rev 20098) +++ branches/ros-branch-0_2_9/reactos/drivers/usb/miniport/usbohci/ohci-pci. c 2005-12-12 04:50:06 UTC (rev 20099) @@ -312,7 +312,7 @@ /*---------------------------------------------------------------------- ---*/ -static const struct hc_driver ohci_pci_hc_driver = { +static struct hc_driver ohci_pci_hc_driver = { .description = hcd_name, /* _____ Modified: branches/ros-branch-0_2_9/reactos/drivers/usb/usbport/hcd.h --- branches/ros-branch-0_2_9/reactos/drivers/usb/usbport/hcd.h 2005-12-12 02:05:54 UTC (rev 20098) +++ branches/ros-branch-0_2_9/reactos/drivers/usb/usbport/hcd.h 2005-12-12 04:50:06 UTC (rev 20099) @@ -458,7 +458,10 @@ if (dev->parent) { PDEVICE_OBJECT Pdo = (PDEVICE_OBJECT)dev->parent->dev.dev_ext; - IoInvalidateDeviceRelations(Pdo, BusRelations); + if (Pdo) + IoInvalidateDeviceRelations(Pdo, BusRelations); + else + DPRINT1("Pdo == NULL, not sending IoInvalidateDeviceRelations()!"); } } static inline void usbfs_remove_device(struct usb_device *dev) {}

18 years, 9 months

[hyperion] 20098: - Replaced horribly broken implementation of CreateSymbolicLinkW with actual implementation.

by hyperion＠svn.reactos.com

- Replaced horribly broken implementation of CreateSymbolicLinkW with actual implementation. - Defined IO_REPARSE_TAG_SYMLINK and corrected REPARSE_DATA_BUFFER as per ntifs.h version 0145 Modified: trunk/reactos/lib/kernel32/file/create.c Modified: trunk/reactos/w32api/include/winnt.h _____ Modified: trunk/reactos/lib/kernel32/file/create.c --- trunk/reactos/lib/kernel32/file/create.c 2005-12-12 00:36:31 UTC (rev 20097) +++ trunk/reactos/lib/kernel32/file/create.c 2005-12-12 02:05:54 UTC (rev 20098) @@ -365,102 +365,191 @@ IN LPCWSTR lpTargetFileName, IN DWORD dwFlags) { - UNICODE_STRING NtSymLink, NtTargetName; + IO_STATUS_BLOCK IoStatusBlock; OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE hTarget, hSymbolicLink; + HANDLE hSymlink = NULL; + UNICODE_STRING SymlinkFileName = { 0, 0, NULL }; + UNICODE_STRING TargetFileName = { 0, 0, NULL }; + BOOLEAN bRelativePath = FALSE; + LPWSTR lpTargetFullFileName = NULL; + SIZE_T cbPrintName; + SIZE_T cbReparseData; + PREPARSE_DATA_BUFFER pReparseData = NULL; + PBYTE pBufTail; NTSTATUS Status; - BOOL Ret = FALSE; - - if(!lpSymlinkFileName || !lpTargetFileName) + ULONG dwCreateOptions; + DWORD dwErr; + + if(!lpSymlinkFileName || !lpTargetFileName || (dwFlags | SYMLINK_FLAG_DIRECTORY) != SYMLINK_FLAG_DIRECTORY) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - - if (!RtlDosPathNameToNtPathName_U((LPWSTR)lpSymlinkFileName, - &NtSymLink, - NULL, - NULL)) + + if(dwFlags & SYMLINK_FLAG_DIRECTORY) + dwCreateOptions = FILE_DIRECTORY_FILE; + else + dwCreateOptions = FILE_NON_DIRECTORY_FILE; + + switch(RtlDetermineDosPathNameType_U(lpTargetFileName)) { - /* FIXME - right error code? */ - SetLastError(ERROR_PATH_NOT_FOUND); - return FALSE; + case INVALID_PATH: + case ABSOLUTE_PATH: + case RELATIVE_PATH: + bRelativePath = TRUE; + RtlInitUnicodeString(&TargetFileName, lpTargetFileName); + break; + + case RELATIVE_DRIVE_PATH: + { + LPWSTR FilePart; + SIZE_T cchTargetFullFileName; + + cchTargetFullFileName = GetFullPathNameW(lpTargetFileName, 0, NULL, &FilePart); + + if(cchTargetFullFileName == 0) + { + dwErr = GetLastError(); + goto Cleanup; + } + + lpTargetFullFileName = RtlAllocateHeap(RtlGetProcessHeap(), 0, cchTargetFullFileName * sizeof(WCHAR)); + + if(lpTargetFullFileName == NULL) + { + dwErr = ERROR_NOT_ENOUGH_MEMORY; + goto Cleanup; + } + + if(GetFullPathNameW(lpTargetFileName, cchTargetFullFileName, lpTargetFullFileName, &FilePart) == 0) + { + dwErr = GetLastError(); + goto Cleanup; + } + } + + lpTargetFileName = lpTargetFullFileName; + + // fallthrough + + case UNC_PATH: + case ABSOLUTE_DRIVE_PATH: + case DEVICE_PATH: + case UNC_DOT_PATH: + default: + if(!RtlDosPathNameToNtPathName_U((LPWSTR)lpTargetFileName, &TargetFileName, NULL, NULL)) + { + dwErr = ERROR_INVALID_PARAMETER; + goto Cleanup; + } } - - if (!RtlDosPathNameToNtPathName_U((LPWSTR)lpTargetFileName, - &NtTargetName, - NULL, - NULL)) + + cbPrintName = wcslen(lpTargetFileName) * sizeof(WCHAR); + cbReparseData = FIELD_OFFSET(REPARSE_DATA_BUFFER, SymbolicLinkReparseBuffer.PathBuffer) + TargetFileName.Length + cbPrintName; + pReparseData = RtlAllocateHeap(RtlGetProcessHeap(), 0, cbReparseData); + + if(pReparseData == NULL) { - /* FIXME - right error code? */ - SetLastError(ERROR_PATH_NOT_FOUND); - goto Cleanup2; + dwErr = ERROR_NOT_ENOUGH_MEMORY; + goto Cleanup; } - - /* - * Try to open the target - */ - InitializeObjectAttributes(&ObjectAttributes, - &NtTargetName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - if (dwFlags == SYMLINK_FLAG_DIRECTORY) + + pBufTail = (PBYTE)(pReparseData->SymbolicLinkReparseBuffer.PathBuffer); + + pReparseData->ReparseTag = IO_REPARSE_TAG_SYMLINK; + pReparseData->ReparseDataLength = cbReparseData - REPARSE_DATA_BUFFER_HEADER_SIZE; + pReparseData->Reserved = 0; + + pReparseData->SymbolicLinkReparseBuffer.SubstituteNameOffset = 0; + pReparseData->SymbolicLinkReparseBuffer.SubstituteNameLength = TargetFileName.Length; + pBufTail += pReparseData->SymbolicLinkReparseBuffer.SubstituteNameOffset; + RtlCopyMemory(pBufTail, TargetFileName.Buffer, TargetFileName.Length); + + pReparseData->SymbolicLinkReparseBuffer.PrintNameOffset = pReparseData->SymbolicLinkReparseBuffer.SubstituteNameLength; + pReparseData->SymbolicLinkReparseBuffer.PrintNameLength = cbPrintName; + pBufTail += pReparseData->SymbolicLinkReparseBuffer.PrintNameOffset; + RtlCopyMemory(pBufTail, lpTargetFileName, cbPrintName); + + pReparseData->SymbolicLinkReparseBuffer.Flags = 0; + + if(bRelativePath) + pReparseData->SymbolicLinkReparseBuffer.Flags |= 1; // TODO! give this lone flag a name + + if(!RtlDosPathNameToNtPathName_U((LPWSTR)lpSymlinkFileName, &SymlinkFileName, NULL, NULL)) { - Status = NtOpenDirectoryObject(&hTarget, - SYNCHRONIZE, - &ObjectAttributes); + dwErr = ERROR_PATH_NOT_FOUND; + goto Cleanup; } - else + + InitializeObjectAttributes(&ObjectAttributes, &SymlinkFileName, OBJ_CASE_INSENSITIVE, NULL, NULL); + + Status = NtCreateFile + ( + &hSymlink, + FILE_WRITE_ATTRIBUTES | DELETE | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + 0, + FILE_CREATE, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_REPARSE_POINT | dwCreateOptions, + NULL, + 0 + ); + + if(!NT_SUCCESS(Status)) { - IO_STATUS_BLOCK IoStatusBlock; - - Status = NtOpenFile(&hTarget, - SYNCHRONIZE, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_REPARSE_POINT); + dwErr = RtlNtStatusToDosError(Status); + goto Cleanup; } - - if (!NT_SUCCESS(Status)) + + Status = NtFsControlFile + ( + hSymlink, + NULL, + NULL, + NULL, + &IoStatusBlock, + FSCTL_SET_REPARSE_POINT, + pReparseData, + cbReparseData, + NULL, + 0 + ); + + if(!NT_SUCCESS(Status)) { - SetLastErrorByStatus(Status); + FILE_DISPOSITION_INFORMATION DispInfo; + DispInfo.DeleteFile = TRUE; + NtSetInformationFile(hSymlink, &IoStatusBlock, &DispInfo, sizeof(DispInfo), FileDispositionInformation); + + dwErr = RtlNtStatusToDosError(Status); goto Cleanup; } - NtClose(hTarget); - - /* - * Create the symbolic link - */ - InitializeObjectAttributes(&ObjectAttributes, - &NtSymLink, - OBJ_PERMANENT, - NULL, - NULL); + dwErr = NO_ERROR; - Status = NtCreateSymbolicLinkObject(&hSymbolicLink, - SYMBOLIC_LINK_ALL_ACCESS, - &ObjectAttributes, - &NtTargetName); - if (NT_SUCCESS(Status)) +Cleanup: + if(hSymlink) + NtClose(hSymlink); + + RtlFreeUnicodeString(&SymlinkFileName); + RtlFreeUnicodeString(&TargetFileName); + + if(lpTargetFullFileName) + RtlFreeHeap(RtlGetProcessHeap(), 0, lpTargetFullFileName); + + if(pReparseData) + RtlFreeHeap(RtlGetProcessHeap(), 0, pReparseData); + + if(dwErr) { - NtClose(hSymbolicLink); - Ret = TRUE; + SetLastError(dwErr); + return FALSE; } - else - { - SetLastErrorByStatus(Status); - } -Cleanup: - RtlFreeUnicodeString(&NtTargetName); -Cleanup2: - RtlFreeUnicodeString(&NtSymLink); - - return Ret; + return TRUE; } @@ -474,23 +563,24 @@ { PWCHAR SymlinkW, TargetW; BOOL Ret; - + if(!lpSymlinkFileName || !lpTargetFileName) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - + if (!(SymlinkW = FilenameA2W(lpSymlinkFileName, FALSE))) return FALSE; if (!(TargetW = FilenameA2W(lpTargetFileName, TRUE))) return FALSE; - + Ret = CreateSymbolicLinkW(SymlinkW, TargetW, dwFlags); + RtlFreeHeap(RtlGetProcessHeap(), 0, SymlinkW); RtlFreeHeap(RtlGetProcessHeap(), 0, TargetW); return Ret; _____ Modified: trunk/reactos/w32api/include/winnt.h --- trunk/reactos/w32api/include/winnt.h 2005-12-12 00:36:31 UTC (rev 20097) +++ trunk/reactos/w32api/include/winnt.h 2005-12-12 02:05:54 UTC (rev 20098) @@ -1491,6 +1491,7 @@ #define IsReparseTagValid(x) (!((x)&~IO_REPARSE_TAG_VALID_VALUES)&&((x)>IO_REPARSE_TAG_RESERVED_RANGE )) #define IO_REPARSE_TAG_SYMBOLIC_LINK IO_REPARSE_TAG_RESERVED_ZERO #define IO_REPARSE_TAG_MOUNT_POINT 0xA0000003 +#define IO_REPARSE_TAG_SYMLINK 0xA000000CL #ifndef RC_INVOKED typedef DWORD ACCESS_MASK, *PACCESS_MASK; @@ -3113,6 +3114,7 @@ WORD SubstituteNameLength; WORD PrintNameOffset; WORD PrintNameLength; + ULONG Flags; WCHAR PathBuffer[1]; } SymbolicLinkReparseBuffer; struct {

18 years, 9 months

[cwittich] 20097: correct implementation of VerLanguageNameA/W

by cwittich＠svn.reactos.com

correct implementation of VerLanguageNameA/W Modified: trunk/reactos/lib/kernel32/misc/lang.c Modified: trunk/reactos/lib/kernel32/misc/stubs.c _____ Modified: trunk/reactos/lib/kernel32/misc/lang.c --- trunk/reactos/lib/kernel32/misc/lang.c 2005-12-12 00:23:07 UTC (rev 20096) +++ trunk/reactos/lib/kernel32/misc/lang.c 2005-12-12 00:36:31 UTC (rev 20097) @@ -1474,3 +1474,34 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } + + +/* + * @implemented + */ +DWORD +STDCALL +VerLanguageNameA ( + DWORD wLang, + LPSTR szLang, + DWORD nSize + ) +{ + return GetLocaleInfoA( MAKELCID(wLang, SORT_DEFAULT), LOCALE_SENGLANGUAGE, szLang, nSize ); +} + + +/* + * @implemented + */ +DWORD +STDCALL +VerLanguageNameW ( + DWORD wLang, + LPWSTR szLang, + DWORD nSize + ) +{ + return GetLocaleInfoW( MAKELCID(wLang, SORT_DEFAULT), LOCALE_SENGLANGUAGE, szLang, nSize ); +} + _____ Modified: trunk/reactos/lib/kernel32/misc/stubs.c --- trunk/reactos/lib/kernel32/misc/stubs.c 2005-12-12 00:23:07 UTC (rev 20096) +++ trunk/reactos/lib/kernel32/misc/stubs.c 2005-12-12 00:36:31 UTC (rev 20097) @@ -342,48 +342,11 @@ return 0; } - /* * @unimplemented */ DWORD STDCALL -VerLanguageNameA ( - DWORD wLang, - LPSTR szLang, - DWORD nSize - ) -{ - STUB; - szLang = "Language Neutral\0"; - nSize = sizeof(szLang) * sizeof(CHAR); - return sizeof(szLang) - 1; -} - - -/* - * @unimplemented - */ -DWORD -STDCALL -VerLanguageNameW ( - DWORD wLang, - LPWSTR szLang, - DWORD nSize - ) -{ - STUB; - szLang = L"Language Neutral\0"; - nSize = sizeof(szLang) * sizeof(WCHAR); - return sizeof(szLang) - 1; -} - - -/* - * @unimplemented - */ -DWORD -STDCALL VirtualBufferExceptionHandler ( DWORD Unknown0, DWORD Unknown1,

18 years, 9 months

← Newer
1
...
37
38
39
40
41
42
43
...
71
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 December 2005