Ros-diffs March 2012

ros-diffs@reactos.org

22 participants
351 discussions

[cgutman] 56204: - Fix device manager view by connection in ACPI mode [NTOSKRNL] - Bugcheck if a driver reports a PDO with a non-unique instance ID [ACPI] - Check that we're not reporting the same ...

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Mar 21 14:35:52 2012 New Revision: 56204 URL: http://svn.reactos.org/svn/reactos?rev=56204&view=rev Log: - Fix device manager view by connection in ACPI mode [NTOSKRNL] - Bugcheck if a driver reports a PDO with a non-unique instance ID [ACPI] - Check that we're not reporting the same device multiple times Modified: trunk/reactos/drivers/bus/acpi/acpienum.c trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/drivers/bus/acpi/acpienum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpienum.… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpienum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpienum.c [iso-8859-1] Wed Mar 21 14:35:52 2012 @@ -45,10 +45,38 @@ for (entry = FdoData->ListOfPDOs.Flink; entry != &FdoData->ListOfPDOs; entry = entry->Flink) { - pdoData = CONTAINING_RECORD (entry, PDO_DEVICE_DATA, Link); - //dont duplicate devices - if(pdoData->AcpiHandle == Device->handle) + struct acpi_device *CurrentDevice; + + pdoData = CONTAINING_RECORD (entry, PDO_DEVICE_DATA, Link); + + //dont duplicate devices + if (pdoData->AcpiHandle == Device->handle) + return STATUS_SUCCESS; + + //check everything but fixed feature devices + if (pdoData->AcpiHandle) + acpi_bus_get_device(pdoData->AcpiHandle, &CurrentDevice); + else + continue; + + //check if the HID matches + if (strstr(Device->pnp.hardware_id, CurrentDevice->pnp.hardware_id)) + { + //check if UID exists for both and matches + if (Device->flags.unique_id && CurrentDevice->flags.unique_id && + strstr(Device->pnp.unique_id, CurrentDevice->pnp.unique_id)) + { + /* We have a UID on both but they're the same so we have to ignore it */ + DPRINT1("Detected duplicate device: %hs %hs\n", Device->pnp.hardware_id, Device->pnp.unique_id); return STATUS_SUCCESS; + } + else if (!Device->flags.unique_id && !CurrentDevice->flags.unique_id) + { + /* No UID so we can only legally have 1 of these devices */ + DPRINT1("Detected duplicate device: %hs\n", Device->pnp.hardware_id); + return STATUS_SUCCESS; + } + } } DPRINT("Exposing PDO\n" Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Wed Mar 21 14:35:52 2012 @@ -141,7 +141,7 @@ } -static PDEVICE_OBJECT +PDEVICE_OBJECT IopGetDeviceObjectFromDeviceInstance(PUNICODE_STRING DeviceInstance) { if (IopRootDeviceNode == NULL) Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Wed Mar 21 14:35:52 2012 @@ -49,6 +49,9 @@ NTSTATUS IopPrepareDeviceForRemoval(PDEVICE_OBJECT DeviceObject, BOOLEAN Force); + +PDEVICE_OBJECT +IopGetDeviceObjectFromDeviceInstance(PUNICODE_STRING DeviceInstance); PDEVICE_NODE FASTCALL @@ -1850,7 +1853,9 @@ HANDLE InstanceKey = NULL; UNICODE_STRING ValueName; UNICODE_STRING ParentIdPrefix = { 0, 0, NULL }; + UNICODE_STRING InstancePathU; DEVICE_CAPABILITIES DeviceCapabilities; + PDEVICE_OBJECT OldDeviceObject; DPRINT("IopActionInterrogateDeviceStack(%p, %p)\n", DeviceNode, Context); DPRINT("PDO 0x%p\n", DeviceNode->PhysicalDeviceObject); @@ -1991,11 +1996,25 @@ } RtlFreeUnicodeString(&ParentIdPrefix); - if (!RtlCreateUnicodeString(&DeviceNode->InstancePath, InstancePath)) + if (!RtlCreateUnicodeString(&InstancePathU, InstancePath)) { DPRINT("No resources\n"); /* FIXME: Cleanup and disable device */ } + + /* Verify that this is not a duplicate */ + OldDeviceObject = IopGetDeviceObjectFromDeviceInstance(&InstancePathU); + if (OldDeviceObject != NULL) + { + DPRINT1("Duplicate device instance '%wZ'\n", &InstancePathU); + KeBugCheckEx(PNP_DETECTED_FATAL_ERROR, + 0x01, + (ULONG_PTR)DeviceNode->PhysicalDeviceObject, + (ULONG_PTR)OldDeviceObject, + 0); + } + + DeviceNode->InstancePath = InstancePathU; DPRINT("InstancePath is %S\n", DeviceNode->InstancePath.Buffer);

12 years, 6 months

[tkreuzer] 56203: [FTFD] Fix a typo, add a trace, add a comment

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 21 10:59:16 2012 New Revision: 56203 URL: http://svn.reactos.org/svn/reactos?rev=56203&view=rev Log: [FTFD] Fix a typo, add a trace, add a comment Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] Wed Mar 21 10:59:16 2012 @@ -188,6 +188,7 @@ /* Check if there is rotation / skewing (cannot use iComplexity!?) */ if (!FLOATOBJ_bIsNull(&fxform.eM12) || !FLOATOBJ_bIsNull(&fxform.eM21)) { + TRACE("Setting extended xform\n"); //__debugbreak(); /* Create a transformation matrix that is applied after the character @@ -386,14 +387,17 @@ } /* Copy some values from the font structure */ - pfddm->fxMaxAscender = (pfont->metrics.fxMaxAscender + 15) & ~0x0f; - pfddm->fxMaxDescender = (pfont->metrics.fxMaxDescender + 15) & ~0x0f; pfddm->ptlUnderline1 = pfont->metrics.ptlUnderline1; pfddm->ptlStrikeout = pfont->metrics.ptlStrikeout; pfddm->ptlULThickness = pfont->metrics.ptlULThickness; pfddm->ptlSOThickness = pfont->metrics.ptlSOThickness; pfddm->cxMax = pfont->sizlMax.cx; pfddm->cyMax = pfont->sizlMax.cy; + + /* These values are rounded to pixels to fix inconsistent height + of marked text and the rest of the marked row in XP list boxes */ + pfddm->fxMaxAscender = (pfont->metrics.fxMaxAscender + 15) & ~0x0f; + pfddm->fxMaxDescender = (pfont->metrics.fxMaxDescender + 15) & ~0x0f; /* Convert the base vectors from FLOATOBJ to FLOATL */ pfddm->pteBase.x = FLOATOBJ_GetFloat(&pfont->ptefBase.x); @@ -460,7 +464,7 @@ /* D is the glyph advance width. Convert it from 26.6 to 28.4 fixpoint format */ pgd->fxD = ftglyph->advance.x >> 2; // FIXME: should be projected on the x-axis - /* Get the bitnmap size */ + /* Get the bitmap size */ sizlBitmap.cx = ftglyph->bitmap.width; sizlBitmap.cy = ftglyph->bitmap.rows; Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] Wed Mar 21 10:59:16 2012 @@ -29,7 +29,7 @@ * \brief Searches for a specific table in TrueType and OpenType font files * \param pvView - The address where the font file is mapped * \param cjView - Size of the mapped font file - * \param iFace - 1-based index of the font in the font file. + * \param ulFont - 1-based index of the font in the font file. * \param ulTag - Identifier tag of the table to search * \param pulLength - Pointer to an ULONG that recieves the table length, * Can be NULL.

12 years, 6 months

[arty] 56202: [NTOSKRNL] Fix another place where a non-rounded address is used.

by arty＠svn.reactos.org

Author: arty Date: Wed Mar 21 10:18:39 2012 New Revision: 56202 URL: http://svn.reactos.org/svn/reactos?rev=56202&view=rev Log: [NTOSKRNL] Fix another place where a non-rounded address is used. Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Mar 21 10:18:39 2012 @@ -1431,7 +1431,7 @@ } MmLockAddressSpace(AddressSpace); Status = MmCreateVirtualMapping(Process, - Address, + PAddress, Region->Protect, &Page, 1);

12 years, 6 months

[arty] 56201: [NTOSKRNL] Use the rounded page address when handling a not present fault. Likely leftover from merging newcc.

by arty＠svn.reactos.org

Author: arty Date: Wed Mar 21 10:15:14 2012 New Revision: 56201 URL: http://svn.reactos.org/svn/reactos?rev=56201&view=rev Log: [NTOSKRNL] Use the rounded page address when handling a not present fault. Likely leftover from merging newcc. Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Mar 21 10:15:14 2012 @@ -1685,7 +1685,7 @@ */ MmSetSavedSwapEntryPage(Page, SwapEntry); Status = MmCreateVirtualMapping(Process, - Address, + PAddress, Region->Protect, &Page, 1);

12 years, 6 months

[cgutman] 56200: [NTOSKRNL] - Create PnpRootRegisterDevice which is used to register a given PDO with the root device so it won't report it twice - Listing devices by connection works with PCI HAL ...

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Mar 21 07:15:55 2012 New Revision: 56200 URL: http://svn.reactos.org/svn/reactos?rev=56200&view=rev Log: [NTOSKRNL] - Create PnpRootRegisterDevice which is used to register a given PDO with the root device so it won't report it twice - Listing devices by connection works with PCI HAL now but it seems that ACPI is detecting multiple ACPI\PNP0C0F\0 instances here in vbox which is causing the same infinite loop Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Wed Mar 21 07:15:55 2012 @@ -1027,6 +1027,10 @@ OUT OPTIONAL PUNICODE_STRING FullInstancePath ); +NTSTATUS +PnpRootRegisterDevice( + IN PDEVICE_OBJECT DeviceObject); + // // Driver Routines // Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnprepo… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] Wed Mar 21 07:15:55 2012 @@ -338,6 +338,10 @@ /* Close the instance key handle */ ZwClose(InstanceKey); + /* Register the given DO with PnP root if required */ + if (DeviceObject && *DeviceObject) + PnpRootRegisterDevice(*DeviceObject); + /* Report the device's enumeration to umpnpmgr */ IopQueueTargetDeviceEvent(&GUID_DEVICE_ENUMERATED, &DeviceNode->InstancePath); Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] Wed Mar 21 07:15:55 2012 @@ -126,6 +126,61 @@ return STATUS_NO_SUCH_DEVICE; } +NTSTATUS +PnpRootRegisterDevice( + IN PDEVICE_OBJECT DeviceObject) +{ + PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension = PnpRootDeviceObject->DeviceExtension; + PPNPROOT_DEVICE Device; + PDEVICE_NODE DeviceNode; + PWSTR InstancePath; + UNICODE_STRING InstancePathCopy; + + Device = ExAllocatePoolWithTag(PagedPool, sizeof(PNPROOT_DEVICE), TAG_PNP_ROOT); + if (!Device) return STATUS_NO_MEMORY; + + DeviceNode = IopGetDeviceNode(DeviceObject); + if (!RtlCreateUnicodeString(&InstancePathCopy, DeviceNode->InstancePath.Buffer)) + { + ExFreePoolWithTag(Device, TAG_PNP_ROOT); + return STATUS_NO_MEMORY; + } + + InstancePath = wcsrchr(InstancePathCopy.Buffer, L'\\'); + ASSERT(InstancePath); + + if (!RtlCreateUnicodeString(&Device->InstanceID, InstancePath + 1)) + { + RtlFreeUnicodeString(&InstancePathCopy); + ExFreePoolWithTag(Device, TAG_PNP_ROOT); + return STATUS_NO_MEMORY; + } + + InstancePath[0] = UNICODE_NULL; + + if (!RtlCreateUnicodeString(&Device->DeviceID, InstancePathCopy.Buffer)) + { + RtlFreeUnicodeString(&InstancePathCopy); + RtlFreeUnicodeString(&Device->InstanceID); + ExFreePoolWithTag(Device, TAG_PNP_ROOT); + return STATUS_NO_MEMORY; + } + + InstancePath[0] = L'\\'; + + Device->Pdo = DeviceObject; + + KeAcquireGuardedMutex(&DeviceExtension->DeviceListLock); + InsertTailList(&DeviceExtension->DeviceListHead, + &Device->ListEntry); + DeviceExtension->DeviceListCount++; + KeReleaseGuardedMutex(&DeviceExtension->DeviceListLock); + + RtlFreeUnicodeString(&InstancePathCopy); + + return STATUS_SUCCESS; +} + /* Creates a new PnP device for a legacy driver */ NTSTATUS PnpRootCreateDevice(

12 years, 6 months

[cgutman] 56199: - Major improvements to the device manager experience (finally making it useful for users to gather information from) - Device manager now reports problem codes, shows unknown devi...

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Mar 21 03:01:31 2012 New Revision: 56199 URL: http://svn.reactos.org/svn/reactos?rev=56199&view=rev Log: - Major improvements to the device manager experience (finally making it useful for users to gather information from) - Device manager now reports problem codes, shows unknown devices, and displays non-PnP drivers like Windows - Inspired by Eric's recent work [DEVMGMT] - Finally (!!!) add support for showing devices with no drivers installed yet - Expand the class tree if one of the devices has a problem [INF] - Add legcydrv.inf for installing the LegacyDriver class [NTOSKRNL] - Fix null termination issues and enable the legacy driver registry code - Add a service description in legacy device entries - Return valid flags for a device status query - Store problem codes for several common device node failure states Added: trunk/reactos/media/inf/legcydrv.inf (with props) Modified: trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c trunk/reactos/base/applications/mscutils/devmgmt/precomp.h trunk/reactos/media/inf/CMakeLists.txt trunk/reactos/media/inf/syssetup.inf trunk/reactos/media/inf/syssetup.inf.tpl trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c [iso-8859-1] Wed Mar 21 03:01:31 2012 @@ -12,6 +12,7 @@ static SP_CLASSIMAGELIST_DATA ImageListData; static HDEVINFO hDevInfo; +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); VOID FreeDeviceStrings(HWND hTreeView) @@ -138,7 +139,8 @@ LPTSTR DevClassName, LPTSTR DevClassDesc, BOOL *DevPresent, - INT *ClassImage) + INT *ClassImage, + BOOL *IsUnknown) { GUID ClassGuid; HKEY KeyClass; @@ -157,7 +159,6 @@ /* all classes enumerated */ if(Ret == CR_NO_SUCH_VALUE) { - hDevInfo = NULL; return -1; } @@ -168,6 +169,9 @@ /* handle other errors... */ } + + /* This case is special because these devices don't show up with normal class enumeration */ + *IsUnknown = IsEqualGUID(&ClassGuid, &GUID_DEVCLASS_UNKNOWN); if (SetupDiClassNameFromGuid(&ClassGuid, ClassName, @@ -188,13 +192,12 @@ } /* Get device info for all devices of a particular class */ - hDevInfo = SetupDiGetClassDevs(&ClassGuid, + hDevInfo = SetupDiGetClassDevs(*IsUnknown ? NULL : &ClassGuid, NULL, NULL, - DIGCF_PRESENT); + DIGCF_PRESENT | (*IsUnknown ? DIGCF_ALLCLASSES : 0)); if (hDevInfo == INVALID_HANDLE_VALUE) { - hDevInfo = NULL; return 0; } @@ -218,7 +221,7 @@ } else { - return -3; + return 0; } *DevPresent = TRUE; @@ -252,6 +255,12 @@ { /* no such device */ return -1; + } + + if (DeviceClassName == NULL && !IsEqualGUID(&DeviceInfoData.ClassGuid, &GUID_NULL)) + { + /* we're looking for unknown devices and this isn't one */ + return -2; } /* get the device ID */ @@ -328,6 +337,7 @@ INT ClassRet; INT index = 0; INT DevImage; + BOOL IsUnknown = FALSE; do { @@ -335,7 +345,8 @@ DevName, DevDesc, &DevExist, - &DevImage); + &DevImage, + &IsUnknown); if ((ClassRet != -1) && (DevExist)) { @@ -365,7 +376,7 @@ do { Ret = EnumDevices(DevIndex, - DevName, + IsUnknown ? NULL : DevName, DeviceName, &DeviceID); if (Ret >= 0) @@ -376,6 +387,13 @@ DeviceID, DevImage, Ret); + if (Ret != 0) + { + /* Expand the class if the device has a problem */ + (void)TreeView_Expand(hTreeView, + hDevItem, + TVE_EXPAND); + } } DevIndex++; @@ -472,16 +490,21 @@ if (cr == CR_SUCCESS) { pSetupGuidFromString(ClassGuidString, &ClassGuid); - - if (!SetupDiGetClassImageIndex(&ImageListData, - &ClassGuid, - &ClassImage)) - { - /* FIXME: can we do this? - * Set the blank icon: IDI_SETUPAPI_BLANK = 41 - * it'll be image 24 in the imagelist */ - ClassImage = 24; - } + } + else + { + /* It's a device with no driver */ + ClassGuid = GUID_DEVCLASS_UNKNOWN; + } + + if (!SetupDiGetClassImageIndex(&ImageListData, + &ClassGuid, + &ClassImage)) + { + /* FIXME: can we do this? + * Set the blank icon: IDI_SETUPAPI_BLANK = 41 + * it'll be image 24 in the imagelist */ + ClassImage = 24; } if (DevName != NULL) Modified: trunk/reactos/base/applications/mscutils/devmgmt/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/precomp.h [iso-8859-1] Wed Mar 21 03:01:31 2012 @@ -10,6 +10,9 @@ #include <cfgmgr32.h> #include <commctrl.h> #include <dll/devmgr/devmgr.h> +#include <initguid.h> +#include <cguid.h> +#include <devguid.h> #include "resource.h" #ifdef _MSC_VER Modified: trunk/reactos/media/inf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] Wed Mar 21 03:01:31 2012 @@ -17,6 +17,7 @@ ks.inf kscaptur.inf layout.inf + legcydrv.inf machine.inf monitor.inf msmouse.inf Added: trunk/reactos/media/inf/legcydrv.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/legcydrv.inf?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/inf/legcydrv.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/syssetup.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf?rev… ============================================================================== --- trunk/reactos/media/inf/syssetup.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/syssetup.inf [iso-8859-1] Wed Mar 21 03:01:31 2012 @@ -13,7 +13,8 @@ hdc.inf input.inf keyboard.inf -machine.inf +legcydrv.inf +machine.inf monitor.inf msmouse.inf NET_NIC.inf Modified: trunk/reactos/media/inf/syssetup.inf.tpl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf.tpl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Wed Mar 21 03:01:31 2012 @@ -406,6 +406,47 @@ return Status; } +static ULONG +IopGetDeviceNodeStatus(PDEVICE_NODE DeviceNode) +{ + ULONG Output = 0; + + if (DeviceNode->Parent == IopRootDeviceNode) + Output |= DN_ROOT_ENUMERATED; + + if (DeviceNode->Flags & DNF_ADDED) + Output |= DN_DRIVER_LOADED; + + /* FIXME: DN_ENUM_LOADED */ + + if (DeviceNode->Flags & DNF_STARTED) + Output |= DN_STARTED; + + /* FIXME: Manual */ + + if (!(DeviceNode->Flags & DNF_PROCESSED)) + Output |= DN_NEED_TO_ENUM; + + /* DN_NOT_FIRST_TIME is 9x only */ + + /* FIXME: DN_HARDWARE_ENUM */ + + /* DN_LIAR and DN_HAS_MARK are 9x only */ + + if (DeviceNode->Problem != 0) + Output |= DN_HAS_PROBLEM; + + /* FIXME: DN_FILTERED */ + + if (DeviceNode->Flags & DNF_LEGACY_DRIVER) + Output |= DN_LEGACY_DRIVER; + + /* FIXME: Implement the rest */ + + Output |= DN_NT_ENUMERATOR | DN_NT_DRIVER; + + return Output; +} static NTSTATUS IopDeviceStatus(PPLUGPLAY_CONTROL_STATUS_DATA StatusData) @@ -453,14 +494,12 @@ { case PNP_GET_DEVICE_STATUS: DPRINT("Get status data\n"); - DeviceStatus = DeviceNode->Flags; + DeviceStatus = IopGetDeviceNodeStatus(DeviceNode); DeviceProblem = DeviceNode->Problem; break; case PNP_SET_DEVICE_STATUS: - DPRINT("Set status data\n"); - DeviceNode->Flags = DeviceStatus; - DeviceNode->Problem = DeviceProblem; + DPRINT1("Set status data is NOT SUPPORTED\n"); break; case PNP_CLEAR_DEVICE_STATUS: @@ -576,6 +615,7 @@ { /* FIXME: What if the device really is disabled? */ DeviceNode->Flags &= ~DNF_DISABLED; + DeviceNode->Problem = 0; /* Load service data from the registry */ Status = IopActionConfigureChildServices(DeviceNode, DeviceNode->Parent); Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Wed Mar 21 03:01:31 2012 @@ -460,6 +460,7 @@ &DeviceNode->InstancePath, Status); IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); + DeviceNode->Problem = CM_PROB_FAILED_ADD; return Status; } @@ -663,6 +664,7 @@ /* Set the appropriate flag */ DeviceNode->Flags |= DNF_START_FAILED; + DeviceNode->Problem = CM_PROB_FAILED_START; DPRINT1("Warning: PnP Start failed (%wZ) [Status: 0x%x]\n", &DeviceNode->InstancePath, Status); return; @@ -1008,9 +1010,7 @@ UNICODE_STRING KeyName, ClassName; PUNICODE_STRING ServiceName1; ULONG LegacyValue; -#if 0 UNICODE_STRING ClassGUID; -#endif HANDLE InstanceHandle; DPRINT("ParentNode 0x%p PhysicalDeviceObject 0x%p ServiceName %wZ\n", @@ -1091,17 +1091,21 @@ { RtlInitUnicodeString(&KeyName, L"Class"); - RtlInitUnicodeString(&ClassName, L"LegacyDriver"); - Status = ZwSetValueKey(InstanceHandle, &KeyName, 0, REG_SZ, ClassName.Buffer, ClassName.Length); -#if 0 + RtlInitUnicodeString(&ClassName, L"LegacyDriver\0"); + Status = ZwSetValueKey(InstanceHandle, &KeyName, 0, REG_SZ, ClassName.Buffer, ClassName.Length + sizeof(UNICODE_NULL)); if (NT_SUCCESS(Status)) { RtlInitUnicodeString(&KeyName, L"ClassGUID"); - RtlInitUnicodeString(&ClassGUID, L"{8ECC055D-047F-11D1-A537-0000F8753ED1}"); - Status = ZwSetValueKey(InstanceHandle, &KeyName, 0, REG_SZ, ClassGUID.Buffer, ClassGUID.Length); + RtlInitUnicodeString(&ClassGUID, L"{8ECC055D-047F-11D1-A537-0000F8753ED1}\0"); + Status = ZwSetValueKey(InstanceHandle, &KeyName, 0, REG_SZ, ClassGUID.Buffer, ClassGUID.Length + sizeof(UNICODE_NULL)); + if (NT_SUCCESS(Status)) + { + RtlInitUnicodeString(&KeyName, L"DeviceDesc"); + + Status = ZwSetValueKey(InstanceHandle, &KeyName, 0, REG_SZ, ServiceName1->Buffer, ServiceName1->Length + sizeof(UNICODE_NULL)); + } } -#endif } } @@ -2490,6 +2494,7 @@ } else { + DeviceNode->Problem = CM_PROB_FAILED_INSTALL; IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); } return STATUS_SUCCESS; @@ -2621,6 +2626,8 @@ { IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); IopDeviceNodeSetFlag(DeviceNode, DNF_START_FAILED); + DeviceNode->Problem = CM_PROB_FAILED_START; + /* FIXME: Log the error (possibly in IopInitializeDeviceNodeService) */ DPRINT1("Initialization of service %S failed (Status %x)\n", DeviceNode->ServiceName.Buffer, Status);

12 years, 6 months

[spetreolle] 56198: Enable /KDSERIAL in bootcd. This will allow debugging first stage on the KVM test bot.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Tue Mar 20 22:37:00 2012 New Revision: 56198 URL: http://svn.reactos.org/svn/reactos?rev=56198&view=rev Log: Enable /KDSERIAL in bootcd. This will allow debugging first stage on the KVM test bot. Modified: trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Tue Mar 20 22:37:00 2012 @@ -117,7 +117,7 @@ [SetupData] DefaultPath = \ReactOS OsLoadOptions = "/NOGUIBOOT /NODEBUG" -DbgOsLoadOptions = "/NOGUIBOOT /DEBUGPORT=COM1 /FIRSTCHANCE" +DbgOsLoadOptions = "/NOGUIBOOT /KDSERIAL /DEBUGPORT=COM1 /FIRSTCHANCE" ;DbgOsLoadOptions = "/SOS /DEBUGPORT=SCREEN" ;DbgOsLoadOptions = "/NOGUIBOOT /DEBUGPORT=BOCHS"

12 years, 6 months

[ekohl] 56197: [DEVMGMT] Implement the 'View/Devices by Connection' feature. It runs very well on windows XP but fails on ReactOS. Needs to be investigated.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Mar 20 22:11:51 2012 New Revision: 56197 URL: http://svn.reactos.org/svn/reactos?rev=56197&view=rev Log: [DEVMGMT] Implement the 'View/Devices by Connection' feature. It runs very well on windows XP but fails on ReactOS. Needs to be investigated. Modified: trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c trunk/reactos/base/applications/mscutils/devmgmt/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/cs-CZ.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/el-GR.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/en-US.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/es-ES.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/id-ID.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/it-IT.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/no-NO.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/th-TH.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/zh-CN.rc trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c trunk/reactos/base/applications/mscutils/devmgmt/precomp.h trunk/reactos/base/applications/mscutils/devmgmt/resource.h Modified: trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c [iso-8859-1] Tue Mar 20 22:11:51 2012 @@ -421,6 +421,165 @@ } +static HTREEITEM +AddDeviceToTree(HWND hTreeView, + HTREEITEM hRoot, + DEVINST dnDevInst) +{ + TCHAR DevName[MAX_DEV_LEN]; + TCHAR FriendlyName[MAX_DEV_LEN]; + TCHAR ClassGuidString[MAX_GUID_STRING_LEN]; + GUID ClassGuid; + ULONG ulLength; + LPTSTR DeviceID; + INT ClassImage = 24; + CONFIGRET cr; + + cr = CM_Get_Device_ID(dnDevInst, + DevName, + MAX_DEV_LEN, + 0); + if (cr != CR_SUCCESS) + return NULL; + + ulLength = MAX_DEV_LEN * sizeof(TCHAR); + cr = CM_Get_DevNode_Registry_Property(dnDevInst, + CM_DRP_FRIENDLYNAME, + NULL, + FriendlyName, + &ulLength, + 0); + if (cr != CR_SUCCESS) + { + ulLength = MAX_DEV_LEN * sizeof(TCHAR); + cr = CM_Get_DevNode_Registry_Property(dnDevInst, + CM_DRP_DEVICEDESC, + NULL, + FriendlyName, + &ulLength, + 0); + if (cr != CR_SUCCESS) + return NULL; + } + + ulLength = MAX_GUID_STRING_LEN * sizeof(TCHAR); + cr = CM_Get_DevNode_Registry_Property(dnDevInst, + CM_DRP_CLASSGUID, + NULL, + ClassGuidString, + &ulLength, + 0); + if (cr == CR_SUCCESS) + { + pSetupGuidFromString(ClassGuidString, &ClassGuid); + + if (!SetupDiGetClassImageIndex(&ImageListData, + &ClassGuid, + &ClassImage)) + { + /* FIXME: can we do this? + * Set the blank icon: IDI_SETUPAPI_BLANK = 41 + * it'll be image 24 in the imagelist */ + ClassImage = 24; + } + } + + if (DevName != NULL) + { + DeviceID = HeapAlloc(GetProcessHeap(), + 0, + (lstrlen(DevName) + 1) * sizeof(TCHAR)); + if (DeviceID == NULL) + { + return NULL; + } + + lstrcpy(DeviceID, DevName); + } + + return InsertIntoTreeView(hTreeView, + hRoot, + FriendlyName, + DeviceID, + ClassImage, + 0); +} + + +static VOID +EnumChildDevices(HWND hTreeView, + HTREEITEM hRoot, + DEVINST dnParentDevInst) +{ + HTREEITEM hDevItem; + DEVINST dnDevInst; + CONFIGRET cr; + + cr = CM_Get_Child(&dnDevInst, + dnParentDevInst, + 0); + if (cr != CR_SUCCESS) + return; + + hDevItem = AddDeviceToTree(hTreeView, + hRoot, + dnDevInst); + if (hDevItem == NULL) + return; + + EnumChildDevices(hTreeView, + hDevItem, + dnDevInst); + + while (cr == CR_SUCCESS) + { + cr = CM_Get_Sibling(&dnDevInst, + dnDevInst, + 0); + if (cr != CR_SUCCESS) + break; + + hDevItem = AddDeviceToTree(hTreeView, + hRoot, + dnDevInst); + if (hDevItem == NULL) + break; + + EnumChildDevices(hTreeView, + hDevItem, + dnDevInst); + } + + (void)TreeView_SortChildren(hTreeView, + hRoot, + 0); +} + + +VOID +ListDevicesByConnection(HWND hTreeView, + HTREEITEM hRoot) +{ + DEVINST devInst; + CONFIGRET cr; + + cr = CM_Locate_DevNode(&devInst, + NULL, + CM_LOCATE_DEVNODE_NORMAL); + if (cr == CR_SUCCESS) + EnumChildDevices(hTreeView, + hRoot, + devInst); + + (void)TreeView_Expand(hTreeView, + hRoot, + TVE_EXPAND); + + (void)TreeView_SelectItem(hTreeView, + hRoot); +} + + HTREEITEM InitTreeView(HWND hTreeView) { Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/bg-BG.rc [iso-8859-1] Tue Mar 20 22:11:51 2012 @@ -1,4 +1,4 @@ -LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT +ï»¿LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT IDR_MAINMENU MENU BEGIN @@ -16,10 +16,10 @@ END POPUP "ÐÐ·Ð³Ð»ÐµÐ´" BEGIN - MENUITEM "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð°ÑÐ° ÑÐ¿Ð¾ÑÐµÐ´ Ð²Ð¸Ð´", IDC_DEVBYTYPE, CHECKED - MENUITEM "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð°ÑÐ° ÑÐ¿Ð¾ÑÐµÐ´ ÑÐ²ÑÑÐ·Ð²Ð°Ð½ÐµÑÐ¾", IDC_STATIC, GRAYED - MENUITEM "Ð¡ÑÐµÐ´ÑÑÐ²Ð°ÑÐ° ÑÐ¿Ð¾ÑÐµÐ´ Ð²Ð¸Ð´Ð°", IDC_STATIC, GRAYED - MENUITEM "Ð¡ÑÐµÐ´ÑÑÐ²Ð°ÑÐ° ÑÐ¿Ð¾ÑÐµÐ´ ÑÐ²ÑÑÐ·Ð²Ð°Ð½ÐµÑÐ¾", IDC_STATIC, GRAYED + MENUITEM "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð°ÑÐ° ÑÐ¿Ð¾ÑÐµÐ´ Ð²Ð¸Ð´", IDC_DEVBYTYPE + MENUITEM "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð°ÑÐ° ÑÐ¿Ð¾ÑÐµÐ´ ÑÐ²ÑÑÐ·Ð²Ð°Ð½ÐµÑÐ¾", IDC_DEVBYCONN + MENUITEM "Ð¡ÑÐµÐ´ÑÑÐ²Ð°ÑÐ° ÑÐ¿Ð¾ÑÐµÐ´ Ð²Ð¸Ð´Ð°", IDC_RESBYTYPE, GRAYED + MENUITEM "Ð¡ÑÐµÐ´ÑÑÐ²Ð°ÑÐ° ÑÐ¿Ð¾ÑÐµÐ´ ÑÐ²ÑÑÐ·Ð²Ð°Ð½ÐµÑÐ¾", IDC_RESBYCONN, GRAYED END POPUP "ÐÐ¾Ð¼Ð¾Ñ" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/cs-CZ.rc [iso-8859-1] Tue Mar 20 22:11:51 2012 @@ -16,10 +16,10 @@ END POPUP "&ZobrazenÃ" BEGIN - MENUITEM "ZaÅÃzenÃ podle typu", IDC_DEVBYTYPE, CHECKED - MENUITEM "ZaÅÃzenÃ podle pÅipojenÃ", IDC_STATIC, GRAYED - MENUITEM "ProstÅedky podle typu", IDC_STATIC, GRAYED - MENUITEM "ProstÅedky podle pÅipojenÃ", IDC_STATIC, GRAYED + MENUITEM "ZaÅÃzenÃ podle typu", IDC_DEVBYTYPE + MENUITEM "ZaÅÃzenÃ podle pÅipojenÃ", IDC_DEVBYCONN + MENUITEM "ProstÅedky podle typu", IDC_RESBYTYPE, GRAYED + MENUITEM "ProstÅedky podle pÅipojenÃ", IDC_RESBYCONN, GRAYED END POPUP "NÃ¡povÄda" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc [iso-8859-1] Tue Mar 20 22:11:51 2012 @@ -4,27 +4,27 @@ BEGIN POPUP "&Datei" BEGIN - MENUITEM "&Beenden", IDC_EXIT + MENUITEM "&Beenden", IDC_EXIT END POPUP "Aktion" BEGIN MENUITEM "Drucken", IDC_PRINT, GRAYED MENUITEM SEPARATOR - MENUITEM "Eigenschaften", IDC_PROP, GRAYED + MENUITEM "Eigenschaften", IDC_PROP, GRAYED MENUITEM SEPARATOR - MENUITEM "Hilfe", IDC_PROGHELP, GRAYED + MENUITEM "Hilfe", IDC_PROGHELP, GRAYED END POPUP "Ansicht" BEGIN - MENUITEM "GerÃ¤te nach Typ", IDC_DEVBYTYPE, CHECKED - MENUITEM "GerÃ¤te nach Verbindung", IDC_STATIC, GRAYED - MENUITEM "Resourcen nach Typ", IDC_STATIC, GRAYED - MENUITEM "Resourcen nach Verbindung", IDC_STATIC, GRAYED + MENUITEM "GerÃ¤te nach Typ", IDC_DEVBYTYPE + MENUITEM "GerÃ¤te nach Verbindung", IDC_DEVBYCONN + MENUITEM "Resourcen nach Typ", IDC_RESBYTYPE, GRAYED + MENUITEM "Resourcen nach Verbindung", IDC_RESBYCONN, GRAYED END POPUP "&?" BEGIN - MENUITEM "Hilfe", IDC_PROGHELP - MENUITEM "Info", IDC_ABOUT + MENUITEM "Hilfe", IDC_PROGHELP + MENUITEM "Info", IDC_ABOUT END END @@ -32,9 +32,9 @@ BEGIN POPUP "popup" BEGIN - MENUITEM "Eigenschaften", IDC_PROP, GRAYED + MENUITEM "Eigenschaften", IDC_PROP, GRAYED MENUITEM SEPARATOR - MENUITEM "Hilfe", IDC_PROGHELP + MENUITEM "Hilfe", IDC_PROGHELP END END Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/el-GR.rc [iso-8859-1] Tue Mar 20 22:11:51 2012 @@ -1,4 +1,4 @@ -LANGUAGE LANG_GREEK, SUBLANG_DEFAULT +ï»¿LANGUAGE LANG_GREEK, SUBLANG_DEFAULT IDR_MAINMENU MENU BEGIN @@ -16,10 +16,10 @@ END POPUP "ÎÎ¼ÏÎ¬Î½Î¹ÏÎ·" BEGIN - MENUITEM "Î£ÏÏÎºÎµÏÎÏ Î±Î½Î¬ ÏÏÏÎ¿", IDC_DEVBYTYPE, CHECKED - MENUITEM "Î£ÏÏÎºÎµÏÎÏ Î±Î½Î¬ ÏÏÎ½Î´ÎµÏÎ·", IDC_STATIC, GRAYED - MENUITEM "Î Î·Î³ÎÏ Î±Î½Î¬ ÏÏÏÎ¿", IDC_STATIC, GRAYED - MENUITEM "Î Î·Î³ÎÏ Î±Î½Î¬ ÏÏÎ½Î´ÎµÏÎ·", IDC_STATIC, GRAYED + MENUITEM "Î£ÏÏÎºÎµÏÎÏ Î±Î½Î¬ ÏÏÏÎ¿", IDC_DEVBYTYPE + MENUITEM "Î£ÏÏÎºÎµÏÎÏ Î±Î½Î¬ ÏÏÎ½Î´ÎµÏÎ·", IDC_DEVBYCONN + MENUITEM "Î Î·Î³ÎÏ Î±Î½Î¬ ÏÏÏÎ¿", IDC_RESBYTYPE, GRAYED + MENUITEM "Î Î·Î³ÎÏ Î±Î½Î¬ ÏÏÎ½Î´ÎµÏÎ·", IDC_RESBYCONN, GRAYED END POPUP "ÎÎ¿Î®Î¸ÎµÎ¹Î±" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/en-US.rc [iso-8859-1] Tue Mar 20 22:11:51 2012 @@ -16,10 +16,10 @@ END POPUP "View" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE, CHECKED - MENUITEM "Devices by connection", IDC_STATIC, GRAYED - MENUITEM "Resources by type", IDC_STATIC, GRAYED - MENUITEM "Resources by connection", IDC_STATIC, GRAYED + MENUITEM "Devices by type", IDC_DEVBYTYPE + MENUITEM "Devices by connection", IDC_DEVBYCONN + MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED END POPUP "Help" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/es-ES.rc [iso-8859-1] Tue Mar 20 22:11:51 2012 @@ -1,4 +1,4 @@ -/* +ï»¿/* * Spanish Language resource file * Traducido por: Javier Remacha 2007-12-21 */ @@ -21,10 +21,10 @@ END POPUP "Ver" BEGIN - MENUITEM "Dispositivos por tipo", IDC_DEVBYTYPE, CHECKED - MENUITEM "Dispositivos por conexiÃ³n", IDC_STATIC, GRAYED - MENUITEM "Recursos por tipo", IDC_STATIC, GRAYED - MENUITEM "Recursos por conexiÃ³n", IDC_STATIC, GRAYED + MENUITEM "Dispositivos por tipo", IDC_DEVBYTYPE + MENUITEM "Dispositivos por conexiÃ³n", IDC_DEVBYCONN + MENUITEM "Recursos por tipo", IDC_RESBYTYPE, GRAYED + MENUITEM "Recursos por conexiÃ³n", IDC_RESBYCONN, GRAYED END POPUP "Ayuda" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/fr-FR.rc [iso-8859-1] Tue Mar 20 22:11:51 2012 @@ -1,4 +1,4 @@ -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL +ï»¿LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDR_MAINMENU MENU BEGIN @@ -16,10 +16,10 @@ END POPUP "Affichage" BEGIN - MENUITEM "PÃ©riphÃ©riques par type", IDC_DEVBYTYPE, CHECKED - MENUITEM "PÃ©riphÃ©riques par connexion", IDC_STATIC, GRAYED - MENUITEM "Ressources par type", IDC_STATIC, GRAYED - MENUITEM "Ressources par connexion", IDC_STATIC, GRAYED + MENUITEM "PÃ©riphÃ©riques par type", IDC_DEVBYTYPE + MENUITEM "PÃ©riphÃ©riques par connexion", IDC_DEVBYCONN + MENUITEM "Ressources par type", IDC_RESBYTYPE, GRAYED + MENUITEM "Ressources par connexion", IDC_RESBYCONN, GRAYED END POPUP "Aide" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/id-ID.rc [iso-8859-1] Tue Mar 20 22:11:51 2012 @@ -16,10 +16,10 @@ END POPUP "Lihat" BEGIN - MENUITEM "Device dengan tipe", IDC_DEVBYTYPE, CHECKED - MENUITEM "Device dengan koneksi", IDC_STATIC, GRAYED - MENUITEM "Resource dengan tipe", IDC_STATIC, GRAYED - MENUITEM "Resource dengan koneksi", IDC_STATIC, GRAYED + MENUITEM "Device dengan tipe", IDC_DEVBYTYPE + MENUITEM "Device dengan koneksi", IDC_DEVBYCONN + MENUITEM "Resource dengan tipe", IDC_RESBYTYPE, GRAYED + MENUITEM "Resource dengan koneksi", IDC_RESBYCONN, GRAYED END POPUP "Bantuan" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/it-IT.rc [iso-8859-1] Tue Mar 20 22:11:51 2012 @@ -1,4 +1,4 @@ -LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL +ï»¿LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL IDR_MAINMENU MENU BEGIN @@ -16,10 +16,10 @@ END POPUP "Visualizza" BEGIN - MENUITEM "Dispositivi per tipo", IDC_DEVBYTYPE, CHECKED - MENUITEM "Dispositivi per connessione", IDC_STATIC, GRAYED - MENUITEM "Risorse per tipo", IDC_STATIC, GRAYED - MENUITEM "Risorse per connessione", IDC_STATIC, GRAYED + MENUITEM "Dispositivi per tipo", IDC_DEVBYTYPE + MENUITEM "Dispositivi per connessione", IDC_DEVBYCONN + MENUITEM "Risorse per tipo", IDC_RESBYTYPE, GRAYED + MENUITEM "Risorse per connessione", IDC_RESBYCONN, GRAYED END POPUP "Aiuto" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc [iso-8859-1] Tue Mar 20 22:11:51 2012 @@ -1,4 +1,4 @@ -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +ï»¿LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDR_MAINMENU MENU BEGIN @@ -16,10 +16,10 @@ END POPUP "è¡¨ ç¤º" BEGIN - MENUITEM "ããã¤ã¹ (ç¨®é¡å¥)", IDC_DEVBYTYPE, CHECKED - MENUITEM "ããã¤ã¹ (æ¥ç¶å¥)", IDC_STATIC, GRAYED - MENUITEM "ãªã½ ã¼ã¹ (ç¨®é¡å¥)", IDC_STATIC, GRAYED - MENUITEM "ãªã½ ã¼ã¹ (æ¥ç¶å¥)", IDC_STATIC, GRAYED + MENUITEM "ããã¤ã¹ (ç¨®é¡å¥)", IDC_DEVBYTYPE + MENUITEM "ããã¤ã¹ (æ¥ç¶å¥)", IDC_DEVBYCONN + MENUITEM "ãªã½ ã¼ã¹ (ç¨®é¡å¥)", IDC_RESBYTYPE, GRAYED + MENUITEM "ãªã½ ã¼ã¹ (æ¥ç¶å¥)", IDC_RESBYCONN, GRAYED END POPUP "ãã«ã" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/ko-KR.rc [iso-8859-1] Tue Mar 20 22:11:51 2012 @@ -1,4 +1,4 @@ -/* +ï»¿/* * Korean translation by manatails007(www.manatails007.org) */ @@ -20,10 +20,10 @@ END POPUP "ë³´ê¸°" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE, CHECKED - MENUITEM "Devices by connection", IDC_STATIC, GRAYED - MENUITEM "Resources by type", IDC_STATIC, GRAYED - MENUITEM "Resources by connection", IDC_STATIC, GRAYED + MENUITEM "Devices by type", IDC_DEVBYTYPE + MENUITEM "Devices by connection", IDC_DEVBYCONN + MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED END POPUP "ëìë§" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/no-NO.rc [iso-8859-1] Tue Mar 20 22:11:51 2012 @@ -1,4 +1,4 @@ -LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +ï»¿LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL IDR_MAINMENU MENU BEGIN @@ -16,10 +16,10 @@ END POPUP "Vis" BEGIN - MENUITEM "Enheter etter type", IDC_DEVBYTYPE, CHECKED - MENUITEM "Enheter etter tilkobling", IDC_STATIC, GRAYED - MENUITEM "Ressurser etter type", IDC_STATIC, GRAYED - MENUITEM "Ressurser etter tilkobling", IDC_STATIC, GRAYED + MENUITEM "Enheter etter type", IDC_DEVBYTYPE + MENUITEM "Enheter etter tilkobling", IDC_DEVBYCONN + MENUITEM "Ressurser etter type", IDC_RESBYTYPE, GRAYED + MENUITEM "Ressurser etter tilkobling", IDC_RESBYCONN, GRAYED END POPUP "Hjelp" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc [iso-8859-1] Tue Mar 20 22:11:51 2012 @@ -1,4 +1,4 @@ -/* +ï»¿/* * translated by xrogers * xxrogers(a)users.sourceforge.net * https://sourceforge.net/projects/reactospl @@ -23,10 +23,10 @@ END POPUP "&Widok" BEGIN - MENUITEM "UrzÄdzenia w&edÅug typu", IDC_DEVBYTYPE, CHECKED - MENUITEM "Ur&zÄdzenia wedÅug poÅÄczenia", IDC_STATIC, GRAYED - MENUITEM "Zaso&by wedÅug typu", IDC_STATIC, GRAYED - MENUITEM "Za&soby wedÅug poÅÄczenia", IDC_STATIC, GRAYED + MENUITEM "UrzÄdzenia w&edÅug typu", IDC_DEVBYTYPE + MENUITEM "Ur&zÄdzenia wedÅug poÅÄczenia", IDC_DEVBYCONN + MENUITEM "Zaso&by wedÅug typu", IDC_RESBYTYPE, GRAYED + MENUITEM "Za&soby wedÅug poÅÄczenia", IDC_RESBYCONN, GRAYED END POPUP "Pomo&c" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc [iso-8859-1] Tue Mar 20 22:11:51 2012 @@ -1,4 +1,4 @@ -//2011.10.19 - Fulea Ètefan: minor changes +ï»¿//2011.10.19 - Fulea Ètefan: minor changes LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL IDR_MAINMENU MENU @@ -17,10 +17,10 @@ END POPUP "&AfiÈare" BEGIN - MENUITEM "Dispozitive dupÄ &tip", IDC_DEVBYTYPE, CHECKED - MENUITEM "Dispozitive dupÄ &conexiune", IDC_STATIC, GRAYED - MENUITEM "Resurse dupÄ t&ip", IDC_STATIC, GRAYED - MENUITEM "Resurse dupÄ c&onexiune", IDC_STATIC, GRAYED + MENUITEM "Dispozitive dupÄ &tip", IDC_DEVBYTYPE + MENUITEM "Dispozitive dupÄ &conexiune", IDC_DEVBYCONN + MENUITEM "Resurse dupÄ t&ip", IDC_RESBYTYPE, GRAYED + MENUITEM "Resurse dupÄ c&onexiune", IDC_RESBYCONN, GRAYED END POPUP "&?" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc [iso-8859-1] Tue Mar 20 22:11:51 2012 @@ -1,4 +1,4 @@ -// Russian language resource file (Dmitry Chapyshev, 2007-06-10) +ï»¿// Russian language resource file (Dmitry Chapyshev, 2007-06-10) LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT @@ -18,10 +18,10 @@ END POPUP "ÐÐ¸Ð´" BEGIN - MENUITEM "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð¿Ð¾ ÑÐ¸Ð¿Ñ", IDC_DEVBYTYPE, CHECKED - MENUITEM "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð¿Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ", IDC_STATIC, GRAYED - MENUITEM "Ð ÐµÑÑÑÑÑ Ð¿Ð¾ ÑÐ¸Ð¿Ñ", IDC_STATIC, GRAYED - MENUITEM "Ð ÐµÑÑÑÑÑ Ð¿Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ", IDC_STATIC, GRAYED + MENUITEM "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð¿Ð¾ ÑÐ¸Ð¿Ñ", IDC_DEVBYTYPE + MENUITEM "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð¿Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ", IDC_DEVBYCONN + MENUITEM "Ð ÐµÑÑÑÑÑ Ð¿Ð¾ ÑÐ¸Ð¿Ñ", IDC_RESBYTYPE, GRAYED + MENUITEM "Ð ÐµÑÑÑÑÑ Ð¿Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ", IDC_RESBYCONN, GRAYED END POPUP "Ð¡Ð¿ÑÐ°Ð²ÐºÐ°" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/sk-SK.rc [iso-8859-1] Tue Mar 20 22:11:51 2012 @@ -1,4 +1,4 @@ -/* TRANSLATOR: MÃ¡rio KaÄmÃ¡r /Mario Kacmar/ aka Kario (kario(a)szm.sk) +ï»¿/* TRANSLATOR: MÃ¡rio KaÄmÃ¡r /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 14-02-2008 * LAST CHANGE: 29-08-2008 */ @@ -21,10 +21,10 @@ END POPUP "ZobraziÅ¥" BEGIN - MENUITEM "Zariadenia podÄ¾a typu", IDC_DEVBYTYPE, CHECKED - MENUITEM "Zariadenia podÄ¾a pripojenia", IDC_STATIC, GRAYED - MENUITEM "Prostriedky podÄ¾a typu", IDC_STATIC, GRAYED - MENUITEM "Prostriedky podÄ¾a pripojenia", IDC_STATIC, GRAYED + MENUITEM "Zariadenia podÄ¾a typu", IDC_DEVBYTYPE + MENUITEM "Zariadenia podÄ¾a pripojenia", IDC_DEVBYCONN + MENUITEM "Prostriedky podÄ¾a typu", IDC_RESBYTYPE, GRAYED + MENUITEM "Prostriedky podÄ¾a pripojenia", IDC_RESBYCONN, GRAYED END POPUP "PomocnÃk" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/sv-SE.rc [iso-8859-1] Tue Mar 20 22:11:51 2012 @@ -1,4 +1,4 @@ -/* +ï»¿/* * PROJECT: ReactOS MSCUTILS * FILE: base\applications\mscutils\devmgmt\lang\sv-SE.rc * PURPOSE: Swedish resource file @@ -23,10 +23,10 @@ END POPUP "Visa" BEGIN - MENUITEM "Enheter efter typ", IDC_DEVBYTYPE, CHECKED - MENUITEM "Enheter efter koppling", IDC_STATIC, GRAYED - MENUITEM "Resurcer efter typ", IDC_STATIC, GRAYED - MENUITEM "Resurcer efter koppling", IDC_STATIC, GRAYED + MENUITEM "Enheter efter typ", IDC_DEVBYTYPE + MENUITEM "Enheter efter koppling", IDC_DEVBYCONN + MENUITEM "Resurcer efter typ", IDC_RESBYTYPE, GRAYED + MENUITEM "Resurcer efter koppling", IDC_RESBYCONN, GRAYED END POPUP "HjÃ¤lp" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/th-TH.rc [iso-8859-1] Tue Mar 20 22:11:51 2012 @@ -1,4 +1,4 @@ -/* +ï»¿/* * PROJECT: ReactOS Device Management * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/devmgmt/lang/th-TH.rc @@ -24,10 +24,10 @@ END POPUP "à¸¡à¸¸à¸¡à¸¡à¸à¸" BEGIN - MENUITEM "à¸à¸¸à¸à¸à¸£à¸à¹à¹à¸à¹à¸à¸à¸²à¸¡à¸à¸£à¸°à¹à¸ à¸", IDC_DEVBYTYPE, CHECKED - MENUITEM "à¸à¸¸à¸à¸à¸£à¸à¹à¹à¸à¹à¸à¸à¸²à¸¡à¸à¸²à¸£à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸", IDC_STATIC, GRAYED - MENUITEM "à¹à¸«à¸¥à¹à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸¡à¸à¸£à¸°à¹à¸ à¸", IDC_STATIC, GRAYED - MENUITEM "à¹à¸«à¸¥à¹à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸¡à¸à¸²à¸£à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸", IDC_STATIC, GRAYED + MENUITEM "à¸à¸¸à¸à¸à¸£à¸à¹à¹à¸à¹à¸à¸à¸²à¸¡à¸à¸£à¸°à¹à¸ à¸", IDC_DEVBYTYPE + MENUITEM "à¸à¸¸à¸à¸à¸£à¸à¹à¹à¸à¹à¸à¸à¸²à¸¡à¸à¸²à¸£à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸", IDC_DEVBYCONN + MENUITEM "à¹à¸«à¸¥à¹à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸¡à¸à¸£à¸°à¹à¸ à¸", IDC_RESBYTYPE, GRAYED + MENUITEM "à¹à¸«à¸¥à¹à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸¡à¸à¸²à¸£à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸", IDC_RESBYCONN, GRAYED END POPUP "à¸à¹à¸§à¸¢à¹à¸«à¸¥à¸·à¸" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/uk-UA.rc [iso-8859-1] Tue Mar 20 22:11:51 2012 @@ -1,4 +1,4 @@ -/* +ï»¿/* * PROJECT: ReactOS Device Management * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/devmgmt/lang/uk-UA.rc @@ -24,10 +24,10 @@ END POPUP "ÐÐ¸Ð³Ð»ÑÐ´" BEGIN - MENUITEM "ÐÑÐ¸ÑÑÑÐ¾Ñ Ð·Ð° ÑÐ¸Ð¿Ð¾Ð¼", IDC_DEVBYTYPE, CHECKED - MENUITEM "ÐÑÐ¸ÑÑÑÐ¾Ñ Ð·Ð° Ð¿ÑÐ´ÐºÐ»ÑÑÐµÐ½Ð½ÑÐ¼", IDC_STATIC, GRAYED - MENUITEM "Ð ÐµÑÑÑÑÐ¸ Ð·Ð° ÑÐ¸Ð¿Ð¾Ð¼", IDC_STATIC, GRAYED - MENUITEM "Ð ÐµÑÑÑÑÐ¸ Ð·Ð° Ð¿ÑÐ´ÐºÐ»ÑÑÐµÐ½Ð½ÑÐ¼", IDC_STATIC, GRAYED + MENUITEM "ÐÑÐ¸ÑÑÑÐ¾Ñ Ð·Ð° ÑÐ¸Ð¿Ð¾Ð¼", IDC_DEVBYTYPE + MENUITEM "ÐÑÐ¸ÑÑÑÐ¾Ñ Ð·Ð° Ð¿ÑÐ´ÐºÐ»ÑÑÐµÐ½Ð½ÑÐ¼", IDC_DEVBYCONN + MENUITEM "Ð ÐµÑÑÑÑÐ¸ Ð·Ð° ÑÐ¸Ð¿Ð¾Ð¼", IDC_RESBYTYPE, GRAYED + MENUITEM "Ð ÐµÑÑÑÑÐ¸ Ð·Ð° Ð¿ÑÐ´ÐºÐ»ÑÑÐµÐ½Ð½ÑÐ¼", IDC_RESBYCONN, GRAYED END POPUP "ÐÐ¾Ð²ÑÐ´ÐºÐ°" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/zh-CN.rc [iso-8859-1] Tue Mar 20 22:11:51 2012 @@ -1,4 +1,4 @@ -/* +ï»¿/* * Translated by Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> */ @@ -20,10 +20,10 @@ END POPUP "æ¥ç" BEGIN - MENUITEM "è®¾å¤ï¼æç±»å", IDC_DEVBYTYPE, CHECKED - MENUITEM "è®¾å¤ï¼æè¿æ¥", IDC_STATIC, GRAYED - MENUITEM "èµæºï¼æç±»å", IDC_STATIC, GRAYED - MENUITEM "èµæºï¼æè¿æ¥", IDC_STATIC, GRAYED + MENUITEM "è®¾å¤ï¼æç±»å", IDC_DEVBYTYPE + MENUITEM "è®¾å¤ï¼æè¿æ¥", IDC_DEVBYCONN + MENUITEM "èµæºï¼æç±»å", IDC_RESBYTYPE, GRAYED + MENUITEM "èµæºï¼æè¿æ¥", IDC_RESBYCONN, GRAYED END POPUP "å¸®å©" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c [iso-8859-1] Tue Mar 20 22:11:51 2012 @@ -203,22 +203,63 @@ static DWORD WINAPI DeviceEnumThread(LPVOID lpParameter) { + PMAIN_WND_INFO Info; HTREEITEM hRoot; - HWND *hTreeView; - - hTreeView = (HWND *)lpParameter; - - if (*hTreeView) - FreeDeviceStrings(*hTreeView); - - hRoot = InitTreeView(*hTreeView); + + Info = (PMAIN_WND_INFO)lpParameter; + + if (Info->hTreeView) + FreeDeviceStrings(Info->hTreeView); + + hRoot = InitTreeView(Info->hTreeView); if (hRoot) { - ListDevicesByType(*hTreeView, hRoot); + switch (Info->Display) + { + case DevicesByType: + ListDevicesByType(Info->hTreeView, hRoot); + break; + + case DevicesByConnection: + ListDevicesByConnection(Info->hTreeView, hRoot); + break; + + default: + break; + } return 0; } return -1; +} + + +static VOID +UpdateViewMenu(PMAIN_WND_INFO Info) +{ + UINT id = IDC_DEVBYTYPE; + + switch (Info->Display) + { + case DevicesByType: + id = IDC_DEVBYTYPE; + break; + case DevicesByConnection: + id = IDC_DEVBYCONN; + break; + case RessourcesByType: + id = IDC_RESBYTYPE; + break; + case RessourcesByConnection: + id = IDC_RESBYCONN; + break; + } + + CheckMenuRadioItem(GetMenu(Info->hMainWnd), + IDC_DEVBYTYPE, + IDC_RESBYCONN, + id, + MF_BYCOMMAND); } @@ -239,6 +280,8 @@ if (!CreateStatusBar(Info)) DisplayString(_T("error creating status bar")); + + UpdateViewMenu(Info); /* make 'properties' bold */ hMenu = GetMenu(Info->hMainWnd); @@ -256,7 +299,7 @@ DevEnumThread = CreateThread(NULL, 0, DeviceEnumThread, - &Info->hTreeView, + Info, 0, NULL); if (!DevEnumThread) @@ -303,11 +346,12 @@ } -static VOID +static LRESULT OnNotify(PMAIN_WND_INFO Info, LPARAM lParam) { LPNMHDR pnmhdr = (LPNMHDR)lParam; + LRESULT ret = 0; switch (pnmhdr->code) { @@ -315,26 +359,52 @@ { LPNM_TREEVIEW pnmtv = (LPNM_TREEVIEW)lParam; - if (!TreeView_GetChild(Info->hTreeView, - pnmtv->itemNew.hItem)) + if (Info->Display == DevicesByType) { - SendMessage(Info->hTool, - TB_SETSTATE, - IDC_PROP, - (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); - - EnableMenuItem(GetMenu(Info->hMainWnd), IDC_PROP, MF_ENABLED); - EnableMenuItem(Info->hShortcutMenu, IDC_PROP, MF_ENABLED); + if (!TreeView_GetChild(Info->hTreeView, + pnmtv->itemNew.hItem)) + { + SendMessage(Info->hTool, + TB_SETSTATE, + IDC_PROP, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + + EnableMenuItem(GetMenu(Info->hMainWnd), IDC_PROP, MF_ENABLED); + EnableMenuItem(Info->hShortcutMenu, IDC_PROP, MF_ENABLED); + } + else + { + SendMessage(Info->hTool, + TB_SETSTATE, + IDC_PROP, + (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0)); + + EnableMenuItem(GetMenu(Info->hMainWnd), IDC_PROP, MF_GRAYED); + EnableMenuItem(Info->hShortcutMenu, IDC_PROP, MF_GRAYED); + } } - else + else if (Info->Display == DevicesByConnection) { - SendMessage(Info->hTool, - TB_SETSTATE, - IDC_PROP, - (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0)); - - EnableMenuItem(GetMenu(Info->hMainWnd), IDC_PROP, MF_GRAYED); - EnableMenuItem(Info->hShortcutMenu, IDC_PROP, MF_GRAYED); + if (pnmtv->itemNew.hItem == TreeView_GetRoot(Info->hTreeView)) + { + SendMessage(Info->hTool, + TB_SETSTATE, + IDC_PROP, + (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0)); + + EnableMenuItem(GetMenu(Info->hMainWnd), IDC_PROP, MF_GRAYED); + EnableMenuItem(Info->hShortcutMenu, IDC_PROP, MF_GRAYED); + } + else + { + SendMessage(Info->hTool, + TB_SETSTATE, + IDC_PROP, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + + EnableMenuItem(GetMenu(Info->hMainWnd), IDC_PROP, MF_ENABLED); + EnableMenuItem(Info->hShortcutMenu, IDC_PROP, MF_ENABLED); + } } } break; @@ -344,17 +414,42 @@ HTREEITEM hSelected = TreeView_GetSelection(Info->hTreeView); TV_HITTESTINFO HitTest; - if (!TreeView_GetChild(Info->hTreeView, - hSelected)) + if (Info->Display == DevicesByType) { - if (GetCursorPos(&HitTest.pt) && - ScreenToClient(Info->hTreeView, &HitTest.pt)) + if (!TreeView_GetChild(Info->hTreeView, + hSelected)) { - if (TreeView_HitTest(Info->hTreeView, &HitTest)) + if (GetCursorPos(&HitTest.pt) && + ScreenToClient(Info->hTreeView, &HitTest.pt)) { - if (HitTest.hItem == hSelected) - OpenPropSheet(Info->hTreeView, - hSelected); + if (TreeView_HitTest(Info->hTreeView, &HitTest)) + { + if (HitTest.hItem == hSelected) + { + OpenPropSheet(Info->hTreeView, + hSelected); + ret = TRUE; + } + } + } + } + } + else if (Info->Display == DevicesByConnection) + { + if (hSelected != TreeView_GetRoot(Info->hTreeView)) + { + if (GetCursorPos(&HitTest.pt) && + ScreenToClient(Info->hTreeView, &HitTest.pt)) + { + if (TreeView_HitTest(Info->hTreeView, &HitTest)) + { + if (HitTest.hItem == hSelected) + { + OpenPropSheet(Info->hTreeView, + hSelected); + ret = TRUE; + } + } } } } @@ -403,6 +498,38 @@ } break; } + + return ret; +} + + +static VOID +OnRefresh(PMAIN_WND_INFO Info) +{ + HANDLE DevEnumThread; + + SendMessage(Info->hTool, + TB_SETSTATE, + IDC_PROP, + (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0)); + + EnableMenuItem(GetMenu(Info->hMainWnd), IDC_PROP, MF_GRAYED); + EnableMenuItem(Info->hShortcutMenu, IDC_PROP, MF_GRAYED); + + /* create seperate thread to emum devices */ + DevEnumThread = CreateThread(NULL, + 0, + DeviceEnumThread, + Info, + 0, + NULL); + if (!DevEnumThread) + { + DisplayString(_T("Failed to enumerate devices")); + return; + } + + CloseHandle(DevEnumThread); } @@ -425,30 +552,7 @@ case IDC_REFRESH: { - HANDLE DevEnumThread; - - SendMessage(Info->hTool, - TB_SETSTATE, - IDC_PROP, - (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0)); - - EnableMenuItem(GetMenu(Info->hMainWnd), IDC_PROP, MF_GRAYED); - EnableMenuItem(Info->hShortcutMenu, IDC_PROP, MF_GRAYED); - - /* create seperate thread to emum devices */ - DevEnumThread = CreateThread(NULL, - 0, - DeviceEnumThread, - &Info->hTreeView, - 0, - NULL); - if (!DevEnumThread) - { - DisplayString(_T("Failed to enumerate devices")); - break; - } - - CloseHandle(DevEnumThread); + OnRefresh(Info); } break; @@ -479,6 +583,21 @@ } break; + case IDC_DEVBYTYPE: + { + Info->Display = DevicesByType; + UpdateViewMenu(Info); + OnRefresh(Info); + } + break; + + case IDC_DEVBYCONN: + { + Info->Display = DevicesByConnection; + UpdateViewMenu(Info); + OnRefresh(Info); + } + break; } } @@ -570,7 +689,7 @@ case WM_NOTIFY: { - OnNotify(Info, lParam); + Ret = OnNotify(Info, lParam); } break; @@ -674,6 +793,7 @@ if (Info != NULL) { Info->nCmdShow = nCmdShow; + Info->Display = DevicesByType; hMainWnd = CreateWindowEx(WS_EX_WINDOWEDGE, szMainWndClass, Modified: trunk/reactos/base/applications/mscutils/devmgmt/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/precomp.h [iso-8859-1] Tue Mar 20 22:11:51 2012 @@ -18,6 +18,14 @@ #define MAX_DEV_LEN 256 +typedef enum +{ + DevicesByType, + DevicesByConnection, + RessourcesByType, + RessourcesByConnection +} DISPLAY_TYPE; + typedef struct _MAIN_WND_INFO { HWND hMainWnd; @@ -27,6 +35,8 @@ HWND hProgDlg; HMENU hShortcutMenu; int nCmdShow; + + DISPLAY_TYPE Display; /* status flags */ UINT InMenuLoop : 1; @@ -59,6 +69,7 @@ VOID OpenPropSheet(HWND hTreeView, HTREEITEM hItem); HTREEITEM InitTreeView(HWND hTreeView); VOID ListDevicesByType(HWND hTreeView, HTREEITEM hRoot); +VOID ListDevicesByConnection(HWND hTreeView, HTREEITEM hRoot); /* misc.c */ Modified: trunk/reactos/base/applications/mscutils/devmgmt/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/resource.h [iso-8859-1] Tue Mar 20 22:11:51 2012 @@ -20,6 +20,9 @@ #define IDR_MAINMENU 102 #define IDR_POPUP 103 #define IDC_DEVBYTYPE 104 +#define IDC_DEVBYCONN 105 +#define IDC_RESBYTYPE 106 +#define IDC_RESBYCONN 107 /* tooltips */ #define IDS_TOOLTIP_PROP 6000

12 years, 6 months

[cgutman] 56196: [NTOSKRNL] - Fix opening of handles to enumerated devices (revert 53351 which ironically fixed this same bug) - Fixes bug 6939

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Mar 20 17:04:36 2012 New Revision: 56196 URL: http://svn.reactos.org/svn/reactos?rev=56196&view=rev Log: [NTOSKRNL] - Fix opening of handles to enumerated devices (revert 53351 which ironically fixed this same bug) - Fixes bug 6939 Modified: trunk/reactos/ntoskrnl/po/events.c Modified: trunk/reactos/ntoskrnl/po/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/events.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/po/events.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/events.c [iso-8859-1] Tue Mar 20 17:04:36 2012 @@ -162,6 +162,8 @@ BOOLEAN Arrival; ULONG Caps; NTSTATUS Status; + UNICODE_STRING DeviceName; + UNICODE_STRING DeviceNamePrefix = RTL_CONSTANT_STRING(L"\\??\\"); DPRINT("PopAddRemoveSysCapsCallback(%p %p)\n", NotificationStructure, Context); @@ -182,10 +184,20 @@ { DPRINT("Arrival of %wZ\n", Notification->SymbolicLinkName); + DeviceName.Length = 0; + DeviceName.MaximumLength = Notification->SymbolicLinkName->MaximumLength + DeviceNamePrefix.MaximumLength; + DeviceName.Buffer = ExAllocatePool(PagedPool, DeviceName.MaximumLength); + if (!DeviceName.Buffer) return STATUS_INSUFFICIENT_RESOURCES; + + RtlCopyUnicodeString(&DeviceName, &DeviceNamePrefix); + RtlAppendUnicodeStringToString(&DeviceName, Notification->SymbolicLinkName); + + DPRINT("Opening handle to %wZ\n", &DeviceName); + /* Open the device */ InitializeObjectAttributes( &ObjectAttributes, - Notification->SymbolicLinkName, + &DeviceName, OBJ_KERNEL_HANDLE, NULL, NULL); @@ -196,6 +208,7 @@ &IoStatusBlock, FILE_SHARE_READ | FILE_SHARE_WRITE, 0); + RtlFreeUnicodeString(&DeviceName); if (!NT_SUCCESS(Status)) { DPRINT1("ZwOpenFile() failed with status 0x%08lx\n", Status);

12 years, 6 months

[sginsberg] 56195: - This doesn't work anymore, disable until investigated.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Mar 20 13:53:01 2012 New Revision: 56195 URL: http://svn.reactos.org/svn/reactos?rev=56195&view=rev Log: - This doesn't work anymore, disable until investigated. Modified: trunk/reactos/ntoskrnl/ke/time.c Modified: trunk/reactos/ntoskrnl/ke/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/time.c?rev=561… ============================================================================== --- trunk/reactos/ntoskrnl/ke/time.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/time.c [iso-8859-1] Tue Mar 20 13:53:01 2012 @@ -181,7 +181,7 @@ /* Handle being in a DPC */ Prcb->DpcTime++; -#if DBG +#if 0 //DBG /* Update the DPC time */ Prcb->DebugDpcTime++;

12 years, 6 months

← Newer
1
...
7
8
9
10
11
12
13
...
36
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 March 2012