Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 68351: [KMTESTS:MM] - Add a test for \Device\PhysicalMemory sections, which shows that we have trouble with PAGE_NOCACHE. CORE-9808
by tfaber＠svn.reactos.org 05 Jul '15

05 Jul '15

Author: tfaber Date: Sun Jul 5 19:17:50 2015 New Revision: 68351 URL: http://svn.reactos.org/svn/reactos?rev=68351&view=rev Log: [KMTESTS:MM] - Add a test for \Device\PhysicalMemory sections, which shows that we have trouble with PAGE_NOCACHE. CORE-9808 Modified: trunk/rostests/kmtests/ntos_mm/MmSection.c Modified: trunk/rostests/kmtests/ntos_mm/MmSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmSection… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmSection.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/MmSection.c [iso-8859-1] Sun Jul 5 19:17:50 2015 @@ -381,6 +381,209 @@ } } +static +VOID +TestPhysicalMemorySection(VOID) +{ + NTSTATUS Status; + UNICODE_STRING SectionName = RTL_CONSTANT_STRING(L"\\Device\\PhysicalMemory"); + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE SectionHandle; + PVOID SectionObject; + PUCHAR MyPage; + PHYSICAL_ADDRESS MyPagePhysical; + PUCHAR ZeroPageContents; + PHYSICAL_ADDRESS ZeroPagePhysical; + PVOID Mapping; + PUCHAR MappingBytes; + SIZE_T ViewSize; + SIZE_T EqualBytes; + + MyPage = ExAllocatePoolWithTag(NonPagedPool, PAGE_SIZE, 'MPmK'); + if (skip(MyPage != NULL, "Out of memory\n")) + return; + MyPagePhysical = MmGetPhysicalAddress(MyPage); + RtlFillMemory(MyPage + 0 * PAGE_SIZE / 4, PAGE_SIZE / 4, 0x23); + RtlFillMemory(MyPage + 1 * PAGE_SIZE / 4, PAGE_SIZE / 4, 0x67); + RtlFillMemory(MyPage + 2 * PAGE_SIZE / 4, PAGE_SIZE / 4, 0xab); + RtlFillMemory(MyPage + 3 * PAGE_SIZE / 4, PAGE_SIZE / 4, 0xef); + + ZeroPageContents = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, 'ZPmK'); + if (skip(ZeroPageContents != NULL, "Out of memory\n")) + { + ExFreePoolWithTag(MyPage, 'MPmK'); + return; + } + ZeroPagePhysical.QuadPart = 0; + + Mapping = MmMapIoSpace(ZeroPagePhysical, PAGE_SIZE, MmCached); + if (skip(Mapping != NULL, "Failed to map zero page\n")) + { + ExFreePoolWithTag(ZeroPageContents, 'ZPmK'); + ExFreePoolWithTag(MyPage, 'MPmK'); + return; + } + + RtlCopyMemory(ZeroPageContents, Mapping, PAGE_SIZE); + MmUnmapIoSpace(Mapping, PAGE_SIZE); + + InitializeObjectAttributes(&ObjectAttributes, + &SectionName, + OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwOpenSection(&SectionHandle, SECTION_ALL_ACCESS, &ObjectAttributes); + ok_eq_hex(Status, STATUS_SUCCESS); + if (!skip(NT_SUCCESS(Status), "No section\n")) + { + /* Map zero page and compare */ + Mapping = NULL; + ViewSize = PAGE_SIZE; + Status = ZwMapViewOfSection(SectionHandle, + ZwCurrentProcess(), + &Mapping, + 0, + 0, + &ZeroPagePhysical, + &ViewSize, + ViewUnmap, + 0, + PAGE_READWRITE); + ok_eq_hex(Status, STATUS_SUCCESS); + if (!skip(NT_SUCCESS(Status), "No view\n")) + { + EqualBytes = RtlCompareMemory(Mapping, + ZeroPageContents, + PAGE_SIZE); + ok_eq_size(EqualBytes, PAGE_SIZE); + Status = ZwUnmapViewOfSection(ZwCurrentProcess(), Mapping); + ok_eq_hex(Status, STATUS_SUCCESS); + } + + /* Map the zero page non-cached */ + Mapping = NULL; + ViewSize = PAGE_SIZE; + Status = ZwMapViewOfSection(SectionHandle, + ZwCurrentProcess(), + &Mapping, + 0, + 0, + &ZeroPagePhysical, + &ViewSize, + ViewUnmap, + 0, + PAGE_READWRITE | PAGE_NOCACHE); + ok_eq_hex(Status, STATUS_SUCCESS); + if (!skip(NT_SUCCESS(Status), "No view\n")) + { + EqualBytes = RtlCompareMemory(Mapping, + ZeroPageContents, + PAGE_SIZE); + ok_eq_size(EqualBytes, PAGE_SIZE); + Status = ZwUnmapViewOfSection(ZwCurrentProcess(), Mapping); + ok_eq_hex(Status, STATUS_SUCCESS); + } + + /* Map our NP page, compare, and check that modifications are reflected */ + Mapping = NULL; + ViewSize = PAGE_SIZE; + Status = ZwMapViewOfSection(SectionHandle, + ZwCurrentProcess(), + &Mapping, + 0, + 0, + &MyPagePhysical, + &ViewSize, + ViewUnmap, + 0, + PAGE_READWRITE); + ok_eq_hex(Status, STATUS_SUCCESS); + if (!skip(NT_SUCCESS(Status), "No view\n")) + { + EqualBytes = RtlCompareMemory(Mapping, + MyPage, + PAGE_SIZE); + ok_eq_size(EqualBytes, PAGE_SIZE); + + MappingBytes = Mapping; + ok(MappingBytes[5] == 0x23, "Mapping[5] = 0x%x\n", MappingBytes[5]); + ok(MyPage[5] == 0x23, "MyPage[5] = 0x%x\n", MyPage[5]); + + MyPage[5] = 0x44; + ok(MappingBytes[5] == 0x44, "Mapping[5] = 0x%x\n", MappingBytes[5]); + ok(MyPage[5] == 0x44, "MyPage[5] = 0x%x\n", MyPage[5]); + + MappingBytes[5] = 0x88; + ok(MappingBytes[5] == 0x88, "Mapping[5] = 0x%x\n", MappingBytes[5]); + ok(MyPage[5] == 0x88, "MyPage[5] = 0x%x\n", MyPage[5]); + + Status = ZwUnmapViewOfSection(ZwCurrentProcess(), Mapping); + ok_eq_hex(Status, STATUS_SUCCESS); + } + + Status = ZwClose(SectionHandle); + ok_eq_hex(Status, STATUS_SUCCESS); + } + + /* Try flag 0x80000000, which ROS calls SEC_PHYSICALMEMORY */ + InitializeObjectAttributes(&ObjectAttributes, + NULL, + OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwCreateSection(&SectionHandle, + SECTION_ALL_ACCESS, + &ObjectAttributes, + NULL, + PAGE_READWRITE, + 0x80000000, + NULL); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER_6); + if (NT_SUCCESS(Status)) + ZwClose(SectionHandle); + + /* Assertion failure: AllocationAttributes & SEC_IMAGE | SEC_RESERVE | SEC_COMMIT */ + if (!KmtIsCheckedBuild) + { + InitializeObjectAttributes(&ObjectAttributes, + NULL, + OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = MmCreateSection(&SectionObject, + SECTION_ALL_ACCESS, + &ObjectAttributes, + NULL, + PAGE_READWRITE, + 0x80000000, + NULL, + NULL); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER_6); + if (NT_SUCCESS(Status)) + ObDereferenceObject(SectionObject); + } + + InitializeObjectAttributes(&ObjectAttributes, + NULL, + OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = MmCreateSection(&SectionObject, + SECTION_ALL_ACCESS, + &ObjectAttributes, + NULL, + PAGE_READWRITE, + SEC_RESERVE | 0x80000000, + NULL, + NULL); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER_6); + if (NT_SUCCESS(Status)) + ObDereferenceObject(SectionObject); + + ExFreePoolWithTag(ZeroPageContents, 'ZPmK'); + ExFreePoolWithTag(MyPage, 'MPmK'); +} + START_TEST(MmSection) { NTSTATUS Status; @@ -453,4 +656,6 @@ ZwClose(FileHandle2); if (FileHandle1) ZwClose(FileHandle1); + + TestPhysicalMemorySection(); }

1 0

[pschweitzer] 68350: [ARF] Fix build(tm)
by pschweitzer＠svn.reactos.org 05 Jul '15

05 Jul '15

Author: pschweitzer Date: Sun Jul 5 19:09:20 2015 New Revision: 68350 URL: http://svn.reactos.org/svn/reactos?rev=68350&view=rev Log: [ARF] Fix build(tm) Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Sun Jul 5 19:09:20 2015 @@ -209,8 +209,8 @@ NetworkInfo->LastWriteTime.QuadPart = FileName->LastWriteTime; NetworkInfo->ChangeTime.QuadPart = FileName->ChangeTime; - NetworkInfo->EndOfFile.QuadPart = Fcb->RFCB.FileSize; - NetworkInfo->AllocationSize.QuadPart = Fcb->RFCB.AllocationSize; + NetworkInfo->EndOfFile = Fcb->RFCB.FileSize; + NetworkInfo->AllocationSize = Fcb->RFCB.AllocationSize; NtfsFileFlagsToAttributes(FileName->FileAttributes, &NetworkInfo->FileAttributes);

1 0

[pschweitzer] 68349: [NTFS] Return correct size in FileNetworkOpenInformation operation
by pschweitzer＠svn.reactos.org 05 Jul '15

05 Jul '15

Author: pschweitzer Date: Sun Jul 5 19:08:08 2015 New Revision: 68349 URL: http://svn.reactos.org/svn/reactos?rev=68349&view=rev Log: [NTFS] Return correct size in FileNetworkOpenInformation operation Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Sun Jul 5 19:08:08 2015 @@ -209,8 +209,8 @@ NetworkInfo->LastWriteTime.QuadPart = FileName->LastWriteTime; NetworkInfo->ChangeTime.QuadPart = FileName->ChangeTime; - NetworkInfo->EndOfFile.QuadPart = FileName->AllocatedSize; - NetworkInfo->AllocationSize.QuadPart = ROUND_UP(FileName->AllocatedSize, DeviceExt->NtfsInfo.BytesPerCluster); + NetworkInfo->EndOfFile.QuadPart = Fcb->RFCB.FileSize; + NetworkInfo->AllocationSize.QuadPart = Fcb->RFCB.AllocationSize; NtfsFileFlagsToAttributes(FileName->FileAttributes, &NetworkInfo->FileAttributes);

1 0

[pschweitzer] 68348: [NTFS] Continue streams integration: - NtfsGetFileSize() will now return the file size depending on the open data stream - NtfsGetFileSize() will also optionally return allocat...
by pschweitzer＠svn.reactos.org 05 Jul '15

05 Jul '15

Author: pschweitzer Date: Sun Jul 5 19:04:05 2015 New Revision: 68348 URL: http://svn.reactos.org/svn/reactos?rev=68348&view=rev Log: [NTFS] Continue streams integration: - NtfsGetFileSize() will now return the file size depending on the open data stream - NtfsGetFileSize() will also optionally return allocated size - In NtfsMakeFCBFromDirEntry(), when initializing FSRTL_COMMON_FCB_HEADER entry, use data stream sizes Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Sun Jul 5 19:04:05 2015 @@ -35,22 +35,27 @@ /* FUNCTIONS ****************************************************************/ -static ULONGLONG +ULONGLONG NtfsGetFileSize(PDEVICE_EXTENSION DeviceExt, PFILE_RECORD_HEADER FileRecord, - PFILENAME_ATTRIBUTE FileName) -{ - ULONGLONG Size; + PCWSTR Stream, + ULONG StreamLength, + PULONGLONG AllocatedSize) +{ + ULONGLONG Size = 0ULL; + ULONGLONG Allocated = 0ULL; NTSTATUS Status; PNTFS_ATTR_CONTEXT DataContext; - Size = FileName->AllocatedSize; - Status = FindAttribute(DeviceExt, FileRecord, AttributeData, L"", 0, &DataContext); + Status = FindAttribute(DeviceExt, FileRecord, AttributeData, Stream, StreamLength, &DataContext); if (NT_SUCCESS(Status)) { Size = AttributeDataLength(&DataContext->Record); + Allocated = AttributeAllocatedLength(&DataContext->Record); ReleaseAttributeContext(DataContext); } + + if (AllocatedSize != NULL) *AllocatedSize = Allocated; return Size; } @@ -130,7 +135,7 @@ /* Convert file flags */ NtfsFileFlagsToAttributes(FileName->FileAttributes | StdInfo->FileAttribute, &Info->FileAttributes); - Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, FileName); + Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, L"", 0, NULL); Info->AllocationSize.QuadPart = ROUND_UP(Info->EndOfFile.QuadPart, DeviceExt->NtfsInfo.BytesPerCluster); Info->FileIndex = MFTIndex; @@ -180,7 +185,7 @@ /* Convert file flags */ NtfsFileFlagsToAttributes(FileName->FileAttributes | StdInfo->FileAttribute, &Info->FileAttributes); - Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, FileName); + Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, L"", 0, NULL); Info->AllocationSize.QuadPart = ROUND_UP(Info->EndOfFile.QuadPart, DeviceExt->NtfsInfo.BytesPerCluster); Info->FileIndex = MFTIndex; @@ -245,7 +250,7 @@ /* Convert file flags */ NtfsFileFlagsToAttributes(FileName->FileAttributes | StdInfo->FileAttribute, &Info->FileAttributes); - Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, FileName); + Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, L"", 0, NULL); Info->AllocationSize.QuadPart = ROUND_UP(Info->EndOfFile.QuadPart, DeviceExt->NtfsInfo.BytesPerCluster); Info->FileIndex = MFTIndex; @@ -362,7 +367,7 @@ */ if (MFTRecord == OldMFTRecord) { - DPRINT("Ignoring duplicate MFT entry 0x%x\n", MFTRecord); + DPRINT1("Ignoring duplicate MFT entry 0x%x\n", MFTRecord); Ccb->Entry++; ExFreePoolWithTag(FileRecord, TAG_NTFS); continue; Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Sun Jul 5 19:04:05 2015 @@ -421,6 +421,7 @@ PFILENAME_ATTRIBUTE FileName; PSTANDARD_INFORMATION StdInfo; PNTFS_FCB rcFCB; + ULONGLONG Size, AllocatedSize; DPRINT1("NtfsMakeFCBFromDirEntry(%p, %p, %wZ, %p, %p, %p)\n", Vcb, DirectoryFCB, Name, Stream, Record, fileFCB); @@ -451,6 +452,8 @@ pathName[FileName->NameLength] = UNICODE_NULL; } + Size = NtfsGetFileSize(Vcb, Record, Stream, wcslen(Stream), &AllocatedSize); + rcFCB = NtfsCreateFCB(pathName, Stream, Vcb); if (!rcFCB) { @@ -459,9 +462,9 @@ memcpy(&rcFCB->Entry, FileName, FIELD_OFFSET(FILENAME_ATTRIBUTE, NameLength)); rcFCB->Entry.NameType = FileName->NameType; - rcFCB->RFCB.FileSize.QuadPart = FileName->DataSize; - rcFCB->RFCB.ValidDataLength.QuadPart = FileName->DataSize; - rcFCB->RFCB.AllocationSize.QuadPart = FileName->AllocatedSize; + rcFCB->RFCB.FileSize.QuadPart = Size; + rcFCB->RFCB.ValidDataLength.QuadPart = Size; + rcFCB->RFCB.AllocationSize.QuadPart = AllocatedSize; StdInfo = GetStandardInformationFromRecord(Record); if (StdInfo != NULL) Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sun Jul 5 19:04:05 2015 @@ -550,6 +550,13 @@ /* dirctl.c */ +ULONGLONG +NtfsGetFileSize(PDEVICE_EXTENSION DeviceExt, + PFILE_RECORD_HEADER FileRecord, + PCWSTR Stream, + ULONG StreamLength, + PULONGLONG AllocatedSize); + NTSTATUS NtfsDirectoryControl(PNTFS_IRP_CONTEXT IrpContext);

1 0

[hbelusca] 68347: [NTVDM] - Implement INT 10h, AH=13h "Write String" function. - Fix VidBiosPrintCharacter to use the colour attribute only in graphics mode, or when explicitely needed. - Fix some ...
by hbelusca＠svn.reactos.org 05 Jul '15

05 Jul '15

Author: hbelusca Date: Sun Jul 5 18:35:25 2015 New Revision: 68347 URL: http://svn.reactos.org/svn/reactos?rev=68347&view=rev Log: [NTVDM] - Implement INT 10h, AH=13h "Write String" function. - Fix VidBiosPrintCharacter to use the colour attribute only in graphics mode, or when explicitely needed. - Fix some special cases where specifying a BIOS mode page of 0xFF means "use current page". - Use a macro to check whether a given mode number specifies a text mode, and use it where needed. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] Sun Jul 5 18:35:25 2015 @@ -1949,6 +1949,8 @@ {&VideoMode_320x200_256color, 0x2000, 8}, /* Mode 13h - VGA */ }; +#define IS_TEXT_MODE(ModeNumber) \ + (((ModeNumber) >= 0x00 && (ModeNumber) <= 0x03) || ((ModeNumber) == 0x07)) static PVGA_STATIC_FUNC_TABLE VgaStaticFuncTable; @@ -2282,21 +2284,14 @@ VgaSetPalette(Palette, Size); } -static VOID VidBiosGetCursorPosition(PBYTE Row, PBYTE Column, BYTE Page) -{ - /* Make sure the selected video page is valid */ - if (Page >= BIOS_MAX_PAGES) return; - - /* Get the cursor location */ +static __inline VOID VidBiosGetCursorPosition(PBYTE Row, PBYTE Column, BYTE Page) +{ *Row = HIBYTE(Bda->CursorPosition[Page]); *Column = LOBYTE(Bda->CursorPosition[Page]); } static VOID VidBiosSetCursorPosition(BYTE Row, BYTE Column, BYTE Page) { - /* Make sure the selected video page is valid */ - if (Page >= BIOS_MAX_PAGES) return; - /* Update the position in the BDA */ Bda->CursorPosition[Page] = MAKEWORD(Column, Row); @@ -2316,7 +2311,7 @@ static VOID VidBiosSetCursorShape(WORD CursorStartEnd) { /* Only valid in text-mode */ - if ((Bda->VideoMode > 0x03) && (Bda->VideoMode != 0x07)) return; + if (!IS_TEXT_MODE(Bda->VideoMode)) return; /* Update the BDA */ Bda->CursorStartLine = HIBYTE(CursorStartEnd) & 0x1F; @@ -2367,7 +2362,7 @@ SHORT ScreenColumns = VgaGetDisplayResolution().X; WORD Offset; - /* Get the cursor location */ + /* Get the cursor position */ IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_LOW_REG); Low = IOReadB(VGA_CRTC_DATA); IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_HIGH_REG); @@ -2406,6 +2401,7 @@ VideoAddress = MemoryMaps[(Misc >> 2) & 3]; BufferSize = MemorySizes[(Misc >> 2) & 3]; + // !IS_TEXT_MODE(Bda->VideoMode) if (Misc & 1) { /* Graphics mode */ @@ -2484,7 +2480,7 @@ Bda->ScreenRows = Resolution.Y - 1; /* Adjust the number of columns for graphics modes */ - if (ModeNumber > 3) Bda->ScreenColumns >>= 3; + if (!IS_TEXT_MODE(ModeNumber)) Bda->ScreenColumns >>= 3; /* Update the current font */ Bda->CharacterHeight = VideoModes[ModeNumber].CharacterHeight; @@ -2496,7 +2492,7 @@ */ case 8: { - if (ModeNumber <= 3) + if (IS_TEXT_MODE(ModeNumber)) VgaWriteTextModeFont(0, Font8x8, ARRAYSIZE(Font8x8) / VGA_FONT_CHARACTERS); ((PULONG)BaseAddress)[0x43] = MAKELONG(FONT_8x8_OFFSET, VIDEO_BIOS_DATA_SEG); @@ -2504,7 +2500,7 @@ } case 14: { - if (ModeNumber <= 3) + if (IS_TEXT_MODE(ModeNumber)) VgaWriteTextModeFont(0, Font8x14, ARRAYSIZE(Font8x14) / VGA_FONT_CHARACTERS); ((PULONG)BaseAddress)[0x43] = MAKELONG(FONT_8x14_OFFSET, VIDEO_BIOS_DATA_SEG); @@ -2512,7 +2508,7 @@ } case 16: { - if (ModeNumber <= 3) + if (IS_TEXT_MODE(ModeNumber)) VgaWriteTextModeFont(0, Font8x16, ARRAYSIZE(Font8x16) / VGA_FONT_CHARACTERS); ((PULONG)BaseAddress)[0x43] = MAKELONG(FONT_8x16_OFFSET, VIDEO_BIOS_DATA_SEG); @@ -2538,7 +2534,7 @@ * Use the default CGA cursor scanline values, * see: http://vitaly_filatov.tripod.com/ng/asm/asm_023.2.html */ - if ((ModeNumber >= 0x00 && ModeNumber <= 0x03) || (ModeNumber == 0x07)) + if (IS_TEXT_MODE(ModeNumber)) // FIXME: we might read the CRT registers and do the adjustment? VidBiosSetCursorShape(MAKEWORD(0x07, 0x06)); @@ -2575,8 +2571,8 @@ IOWriteB(VGA_CRTC_DATA , HIBYTE(Bda->VideoPageOffset)); /* - * Get the cursor location (we don't update anything on the BIOS side - * but we update the cursor location on the VGA side). + * Get the cursor position (we don't update anything on the BIOS side + * but we update the cursor position on the VGA side). */ VidBiosGetCursorPosition(&Row, &Column, PageNumber); VidBiosSetCursorPosition(Row, Column, PageNumber); @@ -2593,6 +2589,7 @@ case 0x01: case 0x02: case 0x03: + case 0x07: { EmulatorWriteMemory(&EmulatorContext, TO_LINEAR(TEXT_VIDEO_SEG, @@ -2827,15 +2824,12 @@ } } -static VOID VidBiosPrintCharacter(CHAR Character, BYTE Attribute, BYTE Page) - { +static VOID VidBiosPrintCharacter(CHAR Character, BYTE Attribute, BOOLEAN UseAttr, BYTE Page) +{ WORD CharData = MAKEWORD(Character, Attribute); BYTE Row, Column; - /* Make sure the page exists */ - if (Page >= BIOS_MAX_PAGES) return; - - /* Get the cursor location */ + /* Get the cursor position */ VidBiosGetCursorPosition(&Row, &Column, Page); if (Character == '\a') @@ -2860,7 +2854,7 @@ /* Erase the existing character */ CharData = MAKEWORD(' ', Attribute); - VidBiosDrawGlyph(CharData, TRUE, Page, Row, Column); + VidBiosDrawGlyph(CharData, UseAttr, Page, Row, Column); } else if (Character == '\t') { @@ -2868,7 +2862,7 @@ do { // Taken from DOSBox - VidBiosPrintCharacter(' ', Attribute, Page); + VidBiosPrintCharacter(' ', Attribute, UseAttr, Page); VidBiosGetCursorPosition(&Row, &Column, Page); } while (Column % 8); } @@ -2887,7 +2881,7 @@ /* Default character */ /* Write the character and advance the cursor */ - VidBiosDrawGlyph(CharData, TRUE, Page, Row, Column); + VidBiosDrawGlyph(CharData, UseAttr, Page, Row, Column); Column++; } @@ -2935,19 +2929,29 @@ /* Set Cursor Position */ case 0x02: { - VidBiosSetCursorPosition(getDH(), getDL(), getBH()); + BYTE Page = getBH(); + + /* Validate the selected video page */ + if (Page >= BIOS_MAX_PAGES) break; + + VidBiosSetCursorPosition(getDH(), getDL(), Page); break; } /* Get Cursor Position and Shape */ case 0x03: { - /* Make sure the selected video page exists */ - if (getBH() >= BIOS_MAX_PAGES) break; + BYTE Page = getBH(); + + /* Validate the selected video page */ + if (Page == 0xFF) // Special case: use the current video page + Page = Bda->VideoPage; + else if (Page >= BIOS_MAX_PAGES) + break; /* Return the result */ setCX(MAKEWORD(Bda->CursorEndLine, Bda->CursorStartLine)); - setDX(Bda->CursorPosition[getBH()]); + setDX(Bda->CursorPosition[Page]); break; } @@ -2988,8 +2992,11 @@ BYTE Page = getBH(); DWORD Offset; - /* Check if the page exists */ - if (Page >= BIOS_MAX_PAGES) break; + /* Validate the selected video page */ + if (Page == 0xFF) // Special case: use the current video page + Page = Bda->VideoPage; + else if (Page >= BIOS_MAX_PAGES) + break; /* Find the offset of the character */ Offset = Page * Bda->VideoPageSize + @@ -3019,13 +3026,14 @@ BYTE Page = getBH(); BYTE Row, Column; - /* Check if the page exists */ - if (Page >= BIOS_MAX_PAGES) break; - - /* Get the cursor location */ - // VidBiosGetCursorPosition(&Row, &Column, Page); - Row = HIBYTE(Bda->CursorPosition[Page]); - Column = LOBYTE(Bda->CursorPosition[Page]); + /* Validate the selected video page */ + if (Page == 0xFF) // Special case: use the current video page + Page = Bda->VideoPage; + else if (Page >= BIOS_MAX_PAGES) + break; + + /* Get the cursor position */ + VidBiosGetCursorPosition(&Row, &Column, Page); /* Write to video memory a certain number of times */ while (Counter-- > 0) @@ -3137,7 +3145,15 @@ /* Teletype Output */ case 0x0E: { - VidBiosPrintCharacter(getAL(), getBL(), getBH()); + BYTE Page = getBH(); + + /* Validate the selected video page */ + if (Page == 0xFF) // Special case: use the current video page + Page = Bda->VideoPage; + else if (Page >= BIOS_MAX_PAGES) + break; + + VidBiosPrintCharacter(getAL(), getBL(), !IS_TEXT_MODE(Bda->VideoMode), Page); break; } @@ -3686,7 +3702,44 @@ /* Write String */ case 0x13: { - DPRINT1("BIOS Function INT 13h (Write String) is UNIMPLEMENTED\n"); + PCHAR String = (PCHAR)SEG_OFF_TO_PTR(getES(), getBP()); + WORD Counter = getCX(); + BYTE Row, Column; + BYTE OldRow, OldColumn; + CHAR Character; + BYTE Attribute = getBL(); // Default attribute in case the string contains only characters. + BYTE Page = getBH(); + BYTE Flags = getAL(); + + /* Validate the selected video page */ + if (Page == 0xFF) // Special case: use the current video page + Page = Bda->VideoPage; + else if (Page >= BIOS_MAX_PAGES) + break; + + /* Get the original cursor position */ + VidBiosGetCursorPosition(&OldRow, &OldColumn, Page); + + /* Set the new cursor position */ + Row = getDH(); + Column = getDL(); + if (Row == 0xFF) // Special case: use the current cursor position + { + Row = OldRow; + Column = OldColumn; + } + VidBiosSetCursorPosition(Row, Column, Page); + + while (Counter-- > 0) + { + Character = *String++; + if (Flags & 0x02) Attribute = *String++; + VidBiosPrintCharacter(Character, Attribute, TRUE, Page); + } + + /* Reset the cursor position to its original value if we don't want to update it */ + if (!(Flags & 0x01)) VidBiosSetCursorPosition(OldRow, OldColumn, Page); + break; }

1 0

[ekohl] 68346: [NTOSKRNL] NtQuerySystemInformation: Return ResultLength only in case of success.
by ekohl＠svn.reactos.org 05 Jul '15

05 Jul '15

Author: ekohl Date: Sun Jul 5 09:58:03 2015 New Revision: 68346 URL: http://svn.reactos.org/svn/reactos?rev=68346&view=rev Log: [NTOSKRNL] NtQuerySystemInformation: Return ResultLength only in case of success. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sun Jul 5 09:58:03 2015 @@ -2440,7 +2440,7 @@ &ResultLength); /* Save the result length to the caller */ - if (UnsafeResultLength) + if (NT_SUCCESS(FStatus) && UnsafeResultLength) *UnsafeResultLength = ResultLength; } }

1 0

[pschweitzer] 68345: [NTFS] Ignore DOS name only entries when browsing index. CORE-9086
by pschweitzer＠svn.reactos.org 05 Jul '15

05 Jul '15

Author: pschweitzer Date: Sun Jul 5 09:04:24 2015 New Revision: 68345 URL: http://svn.reactos.org/svn/reactos?rev=68345&view=rev Log: [NTFS] Ignore DOS name only entries when browsing index. CORE-9086 Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Sun Jul 5 09:04:24 2015 @@ -501,6 +501,31 @@ } } +#if 0 +static +VOID +DumpIndexEntry(PINDEX_ENTRY_ATTRIBUTE IndexEntry) +{ + DPRINT1("Entry: %p\n", IndexEntry); + DPRINT1("\tData.Directory.IndexedFile: %I64x\n", IndexEntry->Data.Directory.IndexedFile); + DPRINT1("\tLength: %u\n", IndexEntry->Length); + DPRINT1("\tKeyLength: %u\n", IndexEntry->KeyLength); + DPRINT1("\tFlags: %x\n", IndexEntry->Flags); + DPRINT1("\tReserved: %x\n", IndexEntry->Reserved); + DPRINT1("\t\tDirectoryFileReferenceNumber: %I64x\n", IndexEntry->FileName.DirectoryFileReferenceNumber); + DPRINT1("\t\tCreationTime: %I64u\n", IndexEntry->FileName.CreationTime); + DPRINT1("\t\tChangeTime: %I64u\n", IndexEntry->FileName.ChangeTime); + DPRINT1("\t\tLastWriteTime: %I64u\n", IndexEntry->FileName.LastWriteTime); + DPRINT1("\t\tLastAccessTime: %I64u\n", IndexEntry->FileName.LastAccessTime); + DPRINT1("\t\tAllocatedSize: %I64u\n", IndexEntry->FileName.AllocatedSize); + DPRINT1("\t\tDataSize: %I64u\n", IndexEntry->FileName.DataSize); + DPRINT1("\t\tFileAttributes: %x\n", IndexEntry->FileName.FileAttributes); + DPRINT1("\t\tNameLength: %u\n", IndexEntry->FileName.NameLength); + DPRINT1("\t\tNameType: %x\n", IndexEntry->FileName.NameType); + DPRINT1("\t\tName: %.*S\n", IndexEntry->FileName.NameLength, IndexEntry->FileName.Name); +} +#endif + NTSTATUS BrowseIndexEntries(PDEVICE_EXTENSION Vcb, PFILE_RECORD_HEADER MftRecord, @@ -529,6 +554,7 @@ { if ((IndexEntry->Data.Directory.IndexedFile & NTFS_MFT_MASK) > 0x10 && *CurrentEntry >= *StartEntry && + IndexEntry->FileName.NameType != NTFS_FILE_NAME_DOS && CompareFileName(FileName, IndexEntry, DirSearch)) { *StartEntry = *CurrentEntry;

1 0

[gedmurphy] 68344: [DEVMGR] - Implement very basic uninstall functionality - Move device action code into the DeviceView class
by gedmurphy＠svn.reactos.org 05 Jul '15

05 Jul '15

Author: gedmurphy Date: Sun Jul 5 08:49:54 2015 New Revision: 68344 URL: http://svn.reactos.org/svn/reactos?rev=68344&view=rev Log: [DEVMGR] - Implement very basic uninstall functionality - Move device action code into the DeviceView class Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.h trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp [iso-8859-1] Sun Jul 5 08:49:54 2015 @@ -344,6 +344,40 @@ return true; } +bool +CDeviceNode::UninstallDevice() +{ + + if (CanUninstall() == false) + return false; + + SP_REMOVEDEVICE_PARAMS RemoveDevParams; + RemoveDevParams.ClassInstallHeader.cbSize = sizeof(SP_CLASSINSTALL_HEADER); + RemoveDevParams.ClassInstallHeader.InstallFunction = DIF_REMOVE; + RemoveDevParams.Scope = DI_REMOVEDEVICE_GLOBAL; + RemoveDevParams.HwProfile = 0; + + // + // We probably need to walk all the siblings of this + // device and ask if they're happy with the uninstall + // + + + // Remove it + SetupDiSetClassInstallParamsW(m_hDevInfo, + &m_DevinfoData, + &RemoveDevParams.ClassInstallHeader, + sizeof(SP_REMOVEDEVICE_PARAMS)); + SetupDiCallClassInstaller(DIF_REMOVE, m_hDevInfo, &m_DevinfoData); + + // Clear the install params + SetupDiSetClassInstallParamsW(m_hDevInfo, + &m_DevinfoData, + NULL, + 0); + +} + /* PRIVATE METHODS ******************************************************/ void Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.h [iso-8859-1] Sun Jul 5 08:49:54 2015 @@ -38,6 +38,9 @@ _Out_ bool &NeedsReboot ); + bool UninstallDevice( + ); + private: void Cleanup( ); Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] Sun Jul 5 08:49:54 2015 @@ -229,6 +229,68 @@ if (hThread) CloseHandle(hThread); } +LRESULT +CDeviceView::OnAction( + _In_ UINT Action +) +{ + switch (Action) + { + case IDC_PROPERTIES: + { + DisplayPropertySheet(); + break; + } + + case IDC_SCAN_HARDWARE: + { + Refresh(GetCurrentView(), + true, + true, + NULL); + break; + } + + case IDC_ENABLE_DRV: + { + bool NeedsReboot; + if (EnableSelectedDevice(true, NeedsReboot) && + NeedsReboot) + { + MessageBox(m_hMainWnd, L"Rebooting", L"Enable", MB_OK); + } + break; + } + + case IDC_DISABLE_DRV: + { + bool NeedsReboot; + EnableSelectedDevice(false, NeedsReboot); + break; + } + + case IDC_UPDATE_DRV: + { + MessageBox(m_hMainWnd, L"Not yet implemented", L"Update Driver", MB_OK); + break; + } + + case IDC_UNINSTALL_DRV: + { + UninstallSelectedDevice(); + break; + } + + case IDC_ADD_HARDWARE: + { + MessageBox(m_hMainWnd, L"Not yet implemented", L"Add Hardware", MB_OK); + break; + } + } + + return 0; +} + void CDeviceView::DisplayPropertySheet() { @@ -286,77 +348,14 @@ return false; } -bool -CDeviceView::HasProperties( - _In_ LPTV_ITEMW TvItem - ) -{ - CNode *Node = GetNode(TvItem); - if (Node) - { - return Node->HasProperties(); - } - return false; -} - -bool -CDeviceView::IsDisabled( - _In_ LPTV_ITEMW TvItem - ) -{ - CDeviceNode *Node = dynamic_cast<CDeviceNode *>(GetNode(TvItem)); - if (Node) - { - return Node->IsDisabled(); - } - return false; -} - -bool -CDeviceView::CanDisable( - _In_ LPTV_ITEMW TvItem - ) -{ - CDeviceNode *Node = dynamic_cast<CDeviceNode *>(GetNode(TvItem)); - if (Node) - { - return Node->CanDisable(); - } - return false; -} - -bool -CDeviceView::EnableSelectedDevice( - _In_ bool Enable, - _Out_ bool &NeedsReboot - ) -{ - CDeviceNode *Node = dynamic_cast<CDeviceNode *>(GetSelectedNode()); - if (Node == nullptr) return false; - - if (Enable == false) - { - CAtlStringW str; - if (str.LoadStringW(g_hInstance, IDS_CONFIRM_DISABLE)) - { - if (MessageBoxW(m_hMainWnd, - str, - Node->GetDisplayName(), - MB_YESNO | MB_ICONWARNING | MB_DEFBUTTON2) != IDYES) - { - return false; - } - } - } - - if (Node->EnableDevice(Enable, NeedsReboot)) - { - Refresh(m_ViewType, true, true, Node->GetDeviceId()); - return true; - } - - return false; -} +CNode* +CDeviceView::GetSelectedNode() +{ + TV_ITEM TvItem; + TvItem.hItem = TreeView_GetSelection(m_hTreeView); + return GetNode(&TvItem); +} + // PRIVATE METHODS *******************************************/ @@ -710,6 +709,49 @@ } bool +CDeviceView::EnableSelectedDevice( + _In_ bool Enable, + _Out_ bool &NeedsReboot + ) +{ + CDeviceNode *Node = dynamic_cast<CDeviceNode *>(GetSelectedNode()); + if (Node == nullptr) return false; + + if (Enable == false) + { + CAtlStringW str; + if (str.LoadStringW(g_hInstance, IDS_CONFIRM_DISABLE)) + { + if (MessageBoxW(m_hMainWnd, + str, + Node->GetDisplayName(), + MB_YESNO | MB_ICONWARNING | MB_DEFBUTTON2) != IDYES) + { + return false; + } + } + } + + if (Node->EnableDevice(Enable, NeedsReboot)) + { + Refresh(m_ViewType, true, true, Node->GetDeviceId()); + return true; + } + + return false; +} + +bool +CDeviceView::UninstallSelectedDevice( + ) +{ + CDeviceNode *Node = dynamic_cast<CDeviceNode *>(GetSelectedNode()); + if (Node == nullptr) return false; + + return Node->UninstallDevice(); +} + +bool CDeviceView::GetChildDevice( _In_ DEVINST ParentDevInst, _Out_ PDEVINST DevInst @@ -1034,13 +1076,6 @@ return NULL; } -CNode* CDeviceView::GetSelectedNode() -{ - TV_ITEM TvItem; - TvItem.hItem = TreeView_GetSelection(m_hTreeView); - return GetNode(&TvItem); -} - void CDeviceView::EmptyLists() { Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h [iso-8859-1] Sun Jul 5 08:49:54 2015 @@ -51,6 +51,10 @@ _In_ LPARAM lParam ); + LRESULT OnAction( + UINT Action + ); + VOID Refresh( _In_ ViewType Type, _In_ bool ScanForChanges, @@ -73,20 +77,7 @@ _In_ bool MainMenu ); - bool HasProperties( - _In_ LPTV_ITEMW TvItem - ); - //bool SelDeviceIsHidden(); - bool CanDisable( - _In_ LPTV_ITEMW TvItem - ); - bool IsDisabled( - _In_ LPTV_ITEMW TvItem - ); - - bool EnableSelectedDevice( - _In_ bool Enable, - _Out_ bool &NeedsReboot + CNode* GetSelectedNode( ); bool SelDeviceIsStarted(); @@ -115,6 +106,14 @@ bool RecurseChildDevices( _In_ DEVINST ParentDevice, _In_ HTREEITEM hParentTreeItem + ); + + bool EnableSelectedDevice( + _In_ bool Enable, + _Out_ bool &NeedsReboot + ); + + bool UninstallSelectedDevice( ); bool GetChildDevice( @@ -153,7 +152,6 @@ CNode* GetNode( _In_ LPTV_ITEMW TvItem ); - CNode* GetSelectedNode(); CClassNode* GetClassNode( _In_ LPGUID ClassGuid Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] Sun Jul 5 08:49:54 2015 @@ -235,17 +235,6 @@ } bool -CMainWindow::ScanForHardwareChanges() -{ - // Refresh the cache and and display - m_DeviceView->Refresh(m_DeviceView->GetCurrentView(), - true, - true, - NULL); - return true; -} - -bool CMainWindow::CreateToolBar() { TBADDBITMAP TbAddBitmap; @@ -323,12 +312,14 @@ return bRet; } -void CMainWindow::UpdateUiContext(_In_ LPTV_ITEMW TvItem) +void CMainWindow::UpdateToolbar(_In_ LPTV_ITEMW TvItem) { WORD State; + CNode *Node = m_DeviceView->GetSelectedNode(); + // properties button - if (m_DeviceView->HasProperties(TvItem)) + if (Node->HasProperties()) { State = TBSTATE_ENABLED; } @@ -340,8 +331,11 @@ SendMessageW(m_hToolBar, TB_SETSTATE, IDC_UPDATE_DRV, MAKELPARAM(State, 0)); //hack SendMessageW(m_hToolBar, TB_SETSTATE, IDC_UNINSTALL_DRV, MAKELPARAM(State, 0)); // hack + + // enable driver button - if (m_DeviceView->IsDisabled(TvItem)) + if (Node->GetNodeType() == DeviceNode && + dynamic_cast<CDeviceNode *>(Node)->IsDisabled()) { State = TBSTATE_ENABLED; } @@ -352,7 +346,9 @@ SendMessageW(m_hToolBar, TB_SETSTATE, IDC_ENABLE_DRV, MAKELPARAM(State, 0)); // disable driver button - if (m_DeviceView->CanDisable(TvItem) && !m_DeviceView->IsDisabled(TvItem)) + if (Node->GetNodeType() == DeviceNode && + dynamic_cast<CDeviceNode *>(Node)->CanDisable() && + !dynamic_cast<CDeviceNode *>(Node)->IsDisabled()) { State = TBSTATE_ENABLED; } @@ -411,7 +407,10 @@ if (m_DeviceView->Initialize()) { // Do the initial scan - ScanForHardwareChanges(); + m_DeviceView->Refresh(m_DeviceView->GetCurrentView(), + true, + true, + NULL); // Display the window according to the user request ShowWindow(hwnd, m_CmdShow); @@ -468,7 +467,7 @@ case TVN_SELCHANGED: { LPNMTREEVIEW NmTreeView = (LPNMTREEVIEW)lParam; - UpdateUiContext(&NmTreeView->itemNew); + UpdateToolbar(&NmTreeView->itemNew); break; } @@ -543,50 +542,14 @@ switch (Msg) { case IDC_PROPERTIES: - { - m_DeviceView->DisplayPropertySheet(); - break; - } - case IDC_SCAN_HARDWARE: - { - ScanForHardwareChanges(); - break; - } - case IDC_ENABLE_DRV: - { - bool NeedsReboot; - if (m_DeviceView->EnableSelectedDevice(true, NeedsReboot) && - NeedsReboot) - { - MessageBox(m_hMainWnd, L"Rebooting", L"Enable", MB_OK); - } - break; - } - case IDC_DISABLE_DRV: - { - bool NeedsReboot; - m_DeviceView->EnableSelectedDevice(false, NeedsReboot); - break; - } - case IDC_UPDATE_DRV: - { - MessageBox(m_hMainWnd, L"Not yet implemented", L"Update Driver", MB_OK); - break; - } - case IDC_UNINSTALL_DRV: - { - MessageBox(m_hMainWnd, L"Not yet implemented", L"Uninstall Driver", MB_OK); - break; - } - case IDC_ADD_HARDWARE: { - MessageBox(m_hMainWnd, L"Not yet implemented", L"Add Hardware", MB_OK); + m_DeviceView->OnAction(Msg); break; } Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] Sun Jul 5 08:49:54 2015 @@ -45,7 +45,9 @@ bool CreateToolBar(); bool CreateStatusBar(); - void UpdateUiContext(_In_ LPTV_ITEMW TvItem); + void UpdateToolbar( + _In_ LPTV_ITEMW TvItem + ); bool StatusBarLoadString( HWND hStatusBar, @@ -68,8 +70,5 @@ bool RefreshView( ViewType Type ); - - bool ScanForHardwareChanges( - ); };

1 0

[gedmurphy] 68343: [DEVMGR] Add the 'add hardware' option for the maun menu or if the root node is selected
by gedmurphy＠svn.reactos.org 04 Jul '15

04 Jul '15

Author: gedmurphy Date: Sat Jul 4 21:31:19 2015 New Revision: 68343 URL: http://svn.reactos.org/svn/reactos?rev=68343&view=rev Log: [DEVMGR] Add the 'add hardware' option for the maun menu or if the root node is selected Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] Sat Jul 4 21:31:19 2015 @@ -168,7 +168,7 @@ HMENU hContextMenu = CreatePopupMenu(); // Add the actions for this node - BuildActionMenuForNode(hContextMenu, Node); + BuildActionMenuForNode(hContextMenu, Node, false); INT xPos = GET_X_LPARAM(lParam); INT yPos = GET_Y_LPARAM(lParam); @@ -279,7 +279,7 @@ CNode *Node = GetSelectedNode(); if (Node) { - BuildActionMenuForNode(OwnerMenu, Node); + BuildActionMenuForNode(OwnerMenu, Node, MainMenu); return true; } @@ -774,7 +774,8 @@ void CDeviceView::BuildActionMenuForNode( _In_ HMENU OwnerMenu, - _In_ CNode *Node + _In_ CNode *Node, + _In_ bool MainMenu ) { // Create a seperator structure @@ -842,6 +843,15 @@ MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; + + if ((Node->GetNodeType() == RootNode) || (MainMenu == true)) + { + String.LoadStringW(g_hInstance, IDS_MENU_ADD); + MenuItemInfo.wID = IDC_ADD_HARDWARE; + MenuItemInfo.dwTypeData = String.GetBuffer(); + InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); + i++; + } if (Node->HasProperties()) { Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h [iso-8859-1] Sat Jul 4 21:31:19 2015 @@ -134,7 +134,8 @@ void BuildActionMenuForNode( _In_ HMENU OwnerMenu, - _In_ CNode *Node + _In_ CNode *Node, + _In_ bool MainMenu ); HTREEITEM RecurseFindDevice( Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] Sat Jul 4 21:31:19 2015 @@ -596,9 +596,9 @@ HMENU hMenu = CreatePopupMenu(); m_DeviceView->CreateActionMenu(hMenu, true); + // Calculate where to put the menu RECT rc; GetMenuItemRect(m_hMainWnd, m_hMenu, 1, &rc); - LONG Height = rc.bottom - rc.top; // Display the menu

1 0

[gedmurphy] 68342: [DEVMGR] - Add a separate class for the root node - Move creating the action menu items to a generic function so we can use it for both the context menu and the main menu - Creat...
by gedmurphy＠svn.reactos.org 04 Jul '15

04 Jul '15

Author: gedmurphy Date: Sat Jul 4 21:12:06 2015 New Revision: 68342 URL: http://svn.reactos.org/svn/reactos?rev=68342&view=rev Log: [DEVMGR] - Add a separate class for the root node - Move creating the action menu items to a generic function so we can use it for both the context menu and the main menu - Create the main action menu as a dynamic popup menu. It doesn't work quite the same as the menus via the resources, so if any menu expects know how to fix this, be my guest Added: trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp (with props) trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.h (with props) Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h trunk/reactos/dll/win32/devmgr/devmgmt/Node.cpp trunk/reactos/dll/win32/devmgr/devmgmt/Resource.h trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] Sat Jul 4 21:12:06 2015 @@ -51,8 +51,7 @@ m_hMenu(NULL), m_ViewType(DevicesByType), m_ShowHidden(FALSE), - m_RootClassImage(-1), - m_RootDevInst(0) + m_RootNode(NULL) { ZeroMemory(&m_ImageListData, sizeof(SP_CLASSIMAGELIST_DATA)); } @@ -162,14 +161,27 @@ ScreenToClient(m_hTreeView, &pt) && PtInRect(&rc, pt)) { - - INT xPos = GET_X_LPARAM(lParam); - INT yPos = GET_Y_LPARAM(lParam); - CNode *Node = GetSelectedNode(); if (Node) { - BuildContextMenuForNode(Node, xPos, yPos); + // Create the context menu + HMENU hContextMenu = CreatePopupMenu(); + + // Add the actions for this node + BuildActionMenuForNode(hContextMenu, Node); + + INT xPos = GET_X_LPARAM(lParam); + INT yPos = GET_Y_LPARAM(lParam); + + // Display the menu + TrackPopupMenuEx(hContextMenu, + TPM_RIGHTBUTTON, + xPos, + yPos, + m_hMainWnd, + NULL); + + DestroyMenu(hContextMenu); } } } @@ -259,6 +271,22 @@ } bool +CDeviceView::CreateActionMenu( + _In_ HMENU OwnerMenu, + _In_ bool MainMenu + ) +{ + CNode *Node = GetSelectedNode(); + if (Node) + { + BuildActionMenuForNode(OwnerMenu, Node); + return true; + } + + return false; +} + +bool CDeviceView::HasProperties( _In_ LPTV_ITEMW TvItem ) @@ -336,54 +364,8 @@ bool CDeviceView::AddRootDevice() { - // Check whether we've loaded the root bitmap into the imagelist (done on first run) - if (m_RootClassImage == -1) - { - // Load the bitmap we'll be using as the root image - HBITMAP hRootImage; - hRootImage = LoadBitmapW(g_hInstance, - MAKEINTRESOURCEW(IDB_ROOT_IMAGE)); - if (hRootImage == NULL) return FALSE; - - // Add this bitmap to the device image list. This is a bit hacky, but it's safe - m_RootClassImage = ImageList_Add(m_ImageListData.ImageList, - hRootImage, - NULL); - DeleteObject(hRootImage); - } - - // Get the root instance - CONFIGRET cr; - cr = CM_Locate_DevNodeW(&m_RootDevInst, - NULL, - CM_LOCATE_DEVNODE_NORMAL); - if (cr != CR_SUCCESS) - { - return false; - } - - // The root name is the computer name - WCHAR RootDeviceName[ROOT_NAME_SIZE]; - DWORD Size = ROOT_NAME_SIZE; - if (GetComputerNameW(RootDeviceName, &Size)) - _wcslwr_s(RootDeviceName); - - TV_ITEMW tvi; - TV_INSERTSTRUCT tvins; - ZeroMemory(&tvi, sizeof(tvi)); - ZeroMemory(&tvins, sizeof(tvins)); - - // Insert the root / parent item into our treeview - tvi.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE; - tvi.pszText = RootDeviceName; - tvi.cchTextMax = wcslen(RootDeviceName); - tvi.iImage = m_RootClassImage; - tvi.iSelectedImage = m_RootClassImage; - tvins.item = tvi; - m_hTreeRoot = TreeView_InsertItem(m_hTreeView, &tvins); - + m_hTreeRoot = InsertIntoTreeView(NULL, m_RootNode); return (m_hTreeRoot != NULL); - } bool @@ -622,7 +604,7 @@ if (bSuccess == false) return false; // Walk the device tree and add all the devices - (void)RecurseChildDevices(m_RootDevInst, m_hTreeRoot); + (void)RecurseChildDevices(m_RootNode->GetDeviceInst(), m_hTreeRoot); // Expand the root item (void)TreeView_Expand(m_hTreeView, @@ -755,11 +737,10 @@ HTREEITEM CDeviceView::InsertIntoTreeView( - _In_ HTREEITEM hParent, + _In_opt_ HTREEITEM hParent, _In_ CNode *Node ) { - LPWSTR lpLabel; lpLabel = Node->GetDisplayName(); @@ -791,15 +772,11 @@ } void -CDeviceView::BuildContextMenuForNode( - _In_ CNode *Node, - _In_ INT xPos, - _In_ INT yPos - ) -{ - // Create the context menu - HMENU hContextMenu = CreatePopupMenu(); - +CDeviceView::BuildActionMenuForNode( + _In_ HMENU OwnerMenu, + _In_ CNode *Node + ) +{ // Create a seperator structure MENUITEMINFOW MenuSeperator = { 0 }; MenuSeperator.cbSize = sizeof(MENUITEMINFOW); @@ -824,7 +801,7 @@ String.LoadStringW(g_hInstance, IDS_MENU_UPDATE); MenuItemInfo.wID = IDC_UPDATE_DRV; MenuItemInfo.dwTypeData = String.GetBuffer(); - InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo); + InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; } @@ -833,7 +810,7 @@ String.LoadStringW(g_hInstance, IDS_MENU_ENABLE); MenuItemInfo.wID = IDC_ENABLE_DRV; MenuItemInfo.dwTypeData = String.GetBuffer(); - InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo); + InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; } @@ -842,7 +819,7 @@ String.LoadStringW(g_hInstance, IDS_MENU_DISABLE); MenuItemInfo.wID = IDC_DISABLE_DRV; MenuItemInfo.dwTypeData = String.GetBuffer(); - InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo); + InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; } @@ -851,11 +828,11 @@ String.LoadStringW(g_hInstance, IDS_MENU_UNINSTALL); MenuItemInfo.wID = IDC_UNINSTALL_DRV; MenuItemInfo.dwTypeData = String.GetBuffer(); - InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo); + InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; } - InsertMenuItemW(hContextMenu, i, TRUE, &MenuSeperator); + InsertMenuItemW(OwnerMenu, i, TRUE, &MenuSeperator); i++; } @@ -863,32 +840,22 @@ String.LoadStringW(g_hInstance, IDS_MENU_SCAN); MenuItemInfo.wID = IDC_SCAN_HARDWARE; MenuItemInfo.dwTypeData = String.GetBuffer(); - InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo); + InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; if (Node->HasProperties()) { - InsertMenuItemW(hContextMenu, i, TRUE, &MenuSeperator); + InsertMenuItemW(OwnerMenu, i, TRUE, &MenuSeperator); i++; String.LoadStringW(g_hInstance, IDS_MENU_PROPERTIES); MenuItemInfo.wID = IDC_PROPERTIES; MenuItemInfo.dwTypeData = String.GetBuffer(); - InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo); + InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; - SetMenuDefaultItem(hContextMenu, IDC_PROPERTIES, FALSE); - } - - // Display the menu - TrackPopupMenuEx(hContextMenu, - TPM_RIGHTBUTTON, - xPos, - yPos, - m_hMainWnd, - NULL); - - DestroyMenu(hContextMenu); + SetMenuDefaultItem(OwnerMenu, IDC_PROPERTIES, FALSE); + } } HTREEITEM @@ -1097,6 +1064,9 @@ EmptyLists(); + if (m_RootNode) delete m_RootNode; + m_RootNode = new CRootNode(&m_ImageListData); + m_RootNode->SetupNode(); // Loop through all the classes do { Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h [iso-8859-1] Sat Jul 4 21:12:06 2015 @@ -1,6 +1,7 @@ #pragma once #include "DeviceNode.h" #include "ClassNode.h" +#include "RootNode.h" enum ViewType { @@ -13,6 +14,7 @@ class CDeviceView { + CRootNode *m_RootNode; CAtlList<CClassNode *> m_ClassNodeList; CAtlList<CDeviceNode *> m_DeviceNodeList; SP_CLASSIMAGELIST_DATA m_ImageListData; @@ -22,9 +24,7 @@ HMENU m_hMenu; ViewType m_ViewType; HTREEITEM m_hTreeRoot; - DEVINST m_RootDevInst; bool m_ShowHidden; - int m_RootClassImage; public: CDeviceView( @@ -67,6 +67,11 @@ } ViewType GetCurrentView() { return m_ViewType; } + + bool CreateActionMenu( + _In_ HMENU OwnerMenu, + _In_ bool MainMenu + ); bool HasProperties( _In_ LPTV_ITEMW TvItem @@ -123,14 +128,13 @@ ); HTREEITEM InsertIntoTreeView( - _In_ HTREEITEM hParent, + _In_opt_ HTREEITEM hParent, _In_ CNode *Node ); - void BuildContextMenuForNode( - _In_ CNode *Node, - _In_ INT xPos, - _In_ INT yPos + void BuildActionMenuForNode( + _In_ HMENU OwnerMenu, + _In_ CNode *Node ); HTREEITEM RecurseFindDevice( Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] Sat Jul 4 21:12:06 2015 @@ -590,6 +590,29 @@ break; } + case IDC_ACTIONMENU: + { + // Create a popup menu with all the actions for the selected node + HMENU hMenu = CreatePopupMenu(); + m_DeviceView->CreateActionMenu(hMenu, true); + + RECT rc; + GetMenuItemRect(m_hMainWnd, m_hMenu, 1, &rc); + + LONG Height = rc.bottom - rc.top; + + // Display the menu + TrackPopupMenuEx(hMenu, + TPM_RIGHTBUTTON, + rc.left, + rc.top + Height, + m_hMainWnd, + NULL); + + DestroyMenu(hMenu); + break; + } + case IDC_DEVBYTYPE: { RefreshView(DevicesByType); Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] Sat Jul 4 21:12:06 2015 @@ -16,6 +16,7 @@ HWND m_hToolBar; HIMAGELIST m_ToolbarhImageList; HMENU m_hMenu; + HMENU m_hActionMenu; int m_CmdShow; public: Modified: trunk/reactos/dll/win32/devmgr/devmgmt/Node.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/N… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/Node.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/Node.cpp [iso-8859-1] Sat Jul 4 21:12:06 2015 @@ -22,6 +22,7 @@ m_ClassImage(0) { m_DisplayName[0] = UNICODE_NULL; + m_ClassGuid = GUID_NULL; } CNode::~CNode() Modified: trunk/reactos/dll/win32/devmgr/devmgmt/Resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/Resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/Resource.h [iso-8859-1] Sat Jul 4 21:12:06 2015 @@ -21,8 +21,12 @@ #define IDC_UPDATE_DRV 104 #define IDC_UNINSTALL_DRV 105 #define IDC_ADD_HARDWARE 106 -#define IDC_ABOUT 107 -#define IDC_EXIT 108 + +/* Menu items */ +#define IDC_ACTIONMENU 150 +#define IDC_ABOUT 151 +#define IDC_EXIT 152 + /* view menu */ #define IDC_DEVBYTYPE 200 Added: trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp (added) +++ trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp [iso-8859-1] Sat Jul 4 21:12:06 2015 @@ -0,0 +1,61 @@ +/* +* PROJECT: ReactOS Device Manager +* LICENSE: GPL - See COPYING in the top level directory +* FILE: dll/win32/devmgr/devmgr/RootNode.cpp +* PURPOSE: Root object for +* COPYRIGHT: Copyright 2015 Ged Murphy <gedmurphy(a)reactos.org> +* +*/ + +#include "stdafx.h" +#include "devmgmt.h" +#include "RootNode.h" + + +CRootNode::CRootNode(_In_ PSP_CLASSIMAGELIST_DATA ImageListData) : + CNode(RootNode, ImageListData) +{ +} + + +CRootNode::~CRootNode() +{ +} + + +bool +CRootNode::SetupNode() +{ + + // Load the bitmap we'll be using as the root image + HBITMAP hRootImage; + hRootImage = LoadBitmapW(g_hInstance, + MAKEINTRESOURCEW(IDB_ROOT_IMAGE)); + if (hRootImage == NULL) return FALSE; + + // Add this bitmap to the device image list. This is a bit hacky, but it's safe + m_ClassImage = ImageList_Add(m_ImageListData->ImageList, + hRootImage, + NULL); + DeleteObject(hRootImage); + + + // Get the root instance + CONFIGRET cr; + cr = CM_Locate_DevNodeW(&m_DevInst, + NULL, + CM_LOCATE_DEVNODE_NORMAL); + if (cr != CR_SUCCESS) + { + return false; + } + + // The root name is the computer name + DWORD Size = DISPLAY_NAME_LEN; + if (GetComputerNameW(m_DisplayName, &Size)) + _wcslwr_s(m_DisplayName); + + return true; + + +} Propchange: trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.h (added) +++ trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.h [iso-8859-1] Sat Jul 4 21:12:06 2015 @@ -0,0 +1,17 @@ +#pragma once +#include "Node.h" + +class CRootNode : public CNode +{ +private: + DEVINST m_DevInst; + +public: + CRootNode(_In_ PSP_CLASSIMAGELIST_DATA ImageListData); + ~CRootNode(); + + virtual bool SetupNode(); + + DEVINST GetDeviceInst() { return m_DevInst; } +}; + Propchange: trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/l… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc [iso-8859-1] Sat Jul 4 21:12:06 2015 @@ -6,18 +6,7 @@ BEGIN MENUITEM "E&xit", IDC_EXIT END - POPUP "Action" - BEGIN - MENUITEM "Update driver software..." IDC_UPDATE_DRV - MENUITEM "Enable" IDC_ENABLE_DRV - MENUITEM "Disable" IDC_DISABLE_DRV - MENUITEM "Uninstall" IDC_UNINSTALL_DRV - MENUITEM SEPARATOR - MENUITEM "Scan for hardware changes" IDC_SCAN_HARDWARE - MENUITEM "Add hardware" IDC_ADD_HARDWARE, GRAYED - MENUITEM SEPARATOR - MENUITEM "Properties", IDC_PROPERTIES - END + MENUITEM "Action" IDC_ACTIONMENU POPUP "View" BEGIN MENUITEM "Devices by type", IDC_DEVBYTYPE

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs