Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 68271: [KMTESTS:MM] - Add a test for MmAllocatePagesForMdl
by tfaber＠svn.reactos.org 26 Jun '15

26 Jun '15

Author: tfaber Date: Fri Jun 26 07:31:01 2015 New Revision: 68271 URL: http://svn.reactos.org/svn/reactos?rev=68271&view=rev Log: [KMTESTS:MM] - Add a test for MmAllocatePagesForMdl Added: trunk/rostests/kmtests/ntos_mm/MmMdl.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Fri Jun 26 07:31:01 2015 @@ -64,6 +64,7 @@ ntos_ke/KeProcessor.c ntos_ke/KeSpinLock.c ntos_ke/KeTimer.c + ntos_mm/MmMdl.c ntos_mm/MmSection.c ntos_mm/ZwAllocateVirtualMemory.c ntos_mm/ZwCreateSection.c Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Fri Jun 26 07:31:01 2015 @@ -39,6 +39,7 @@ KMT_TESTFUNC Test_KeSpinLock; KMT_TESTFUNC Test_KeTimer; KMT_TESTFUNC Test_KernelType; +KMT_TESTFUNC Test_MmMdl; KMT_TESTFUNC Test_MmSection; KMT_TESTFUNC Test_NpfsConnect; KMT_TESTFUNC Test_NpfsCreate; @@ -98,6 +99,7 @@ { "KeSpinLock", Test_KeSpinLock }, { "KeTimer", Test_KeTimer }, { "-KernelType", Test_KernelType }, + { "MmMdl", Test_MmMdl }, { "MmSection", Test_MmSection }, { "NpfsConnect", Test_NpfsConnect }, { "NpfsCreate", Test_NpfsCreate }, Added: trunk/rostests/kmtests/ntos_mm/MmMdl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmMdl.c?r… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmMdl.c (added) +++ trunk/rostests/kmtests/ntos_mm/MmMdl.c [iso-8859-1] Fri Jun 26 07:31:01 2015 @@ -0,0 +1,168 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel-Mode Test Suite MDL test + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <kmt_test.h> + +static +VOID +TestMmAllocatePagesForMdl(VOID) +{ + PMDL Mdl; + PHYSICAL_ADDRESS LowAddress; + PHYSICAL_ADDRESS HighAddress; + PHYSICAL_ADDRESS SkipBytes; + PVOID SystemVa; + PMDL Mdls[32]; + PVOID SystemVas[32]; + ULONG i; + + LowAddress.QuadPart = 0; + HighAddress.QuadPart = -1; + SkipBytes.QuadPart = 0; + /* simple allocate/free */ + Mdl = MmAllocatePagesForMdl(LowAddress, + HighAddress, + SkipBytes, + 2 * 1024 * 1024); + ok(Mdl != NULL, "MmAllocatePagesForMdl failed\n"); + if (skip(Mdl != NULL, "No Mdl\n")) + return; + ok(MmGetMdlByteCount(Mdl) == 2 * 1024 * 1024, "Byte count: %lu\n", MmGetMdlByteCount(Mdl)); + ok(MmGetMdlVirtualAddress(Mdl) == NULL, "Virtual address: %p\n", MmGetMdlVirtualAddress(Mdl)); + ok(!(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdl->MdlFlags); + MmFreePagesFromMdl(Mdl); + + /* Now map/unmap it */ + Mdl = MmAllocatePagesForMdl(LowAddress, + HighAddress, + SkipBytes, + 2 * 1024 * 1024); + ok(Mdl != NULL, "MmAllocatePagesForMdl failed\n"); + if (skip(Mdl != NULL, "No Mdl\n")) + return; + ok(MmGetMdlByteCount(Mdl) == 2 * 1024 * 1024, "Byte count: %lu\n", MmGetMdlByteCount(Mdl)); + ok(MmGetMdlVirtualAddress(Mdl) == NULL, "Virtual address: %p\n", MmGetMdlVirtualAddress(Mdl)); + ok(!(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdl->MdlFlags); + SystemVa = MmMapLockedPagesSpecifyCache(Mdl, + KernelMode, + MmCached, + NULL, + FALSE, + NormalPagePriority); + ok(SystemVa != NULL, "MmMapLockedPagesSpecifyCache failed\n"); + if (!skip(SystemVa != NULL, "No system VA\n")) + { + ok(MmGetMdlByteCount(Mdl) == 2 * 1024 * 1024, "Byte count: %lu\n", MmGetMdlByteCount(Mdl)); + ok(MmGetMdlVirtualAddress(Mdl) == NULL, "Virtual address: %p, System VA: %p\n", MmGetMdlVirtualAddress(Mdl), SystemVa); + ok(Mdl->MappedSystemVa == SystemVa, "MappedSystemVa: %p, System VA: %p\n", Mdl->MappedSystemVa, SystemVa); + ok((Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdl->MdlFlags); + MmUnmapLockedPages(SystemVa, Mdl); + } + ok(MmGetMdlByteCount(Mdl) == 2 * 1024 * 1024, "Byte count: %lu\n", MmGetMdlByteCount(Mdl)); + ok(MmGetMdlVirtualAddress(Mdl) == NULL, "Virtual address: %p\n", MmGetMdlVirtualAddress(Mdl)); + ok(!(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdl->MdlFlags); + MmFreePagesFromMdl(Mdl); + + /* Now map it, and free without unmapping */ + Mdl = MmAllocatePagesForMdl(LowAddress, + HighAddress, + SkipBytes, + 2 * 1024 * 1024); + ok(Mdl != NULL, "MmAllocatePagesForMdl failed\n"); + if (skip(Mdl != NULL, "No Mdl\n")) + return; + ok(MmGetMdlByteCount(Mdl) == 2 * 1024 * 1024, "Byte count: %lu\n", MmGetMdlByteCount(Mdl)); + ok(MmGetMdlVirtualAddress(Mdl) == NULL, "Virtual address: %p\n", MmGetMdlVirtualAddress(Mdl)); + ok(!(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdl->MdlFlags); + SystemVa = MmMapLockedPagesSpecifyCache(Mdl, + KernelMode, + MmCached, + NULL, + FALSE, + NormalPagePriority); + ok(SystemVa != NULL, "MmMapLockedPagesSpecifyCache failed\n"); + ok(MmGetMdlByteCount(Mdl) == 2 * 1024 * 1024, "Byte count: %lu\n", MmGetMdlByteCount(Mdl)); + ok(MmGetMdlVirtualAddress(Mdl) == NULL, "Virtual address: %p, System VA: %p\n", MmGetMdlVirtualAddress(Mdl), SystemVa); + ok(Mdl->MappedSystemVa == SystemVa, "MappedSystemVa: %p, System VA: %p\n", Mdl->MappedSystemVa, SystemVa); + ok((Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdl->MdlFlags); + MmFreePagesFromMdl(Mdl); + + /* try to allocate 2 GB -- should succeed but not map */ + Mdl = MmAllocatePagesForMdl(LowAddress, + HighAddress, + SkipBytes, + 2UL * 1024 * 1024 * 1024); + ok(Mdl != NULL, "MmAllocatePagesForMdl failed for 2 GB\n"); + if (Mdl != NULL) + { + ok(MmGetMdlByteCount(Mdl) != 2UL * 1024 * 1024 * 1024, "Byte count: %lu\n", MmGetMdlByteCount(Mdl)); + ok(MmGetMdlVirtualAddress(Mdl) == NULL, "Virtual address: %p\n", MmGetMdlVirtualAddress(Mdl)); + ok(!(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdl->MdlFlags); + SystemVa = MmMapLockedPagesSpecifyCache(Mdl, + KernelMode, + MmCached, + NULL, + FALSE, + NormalPagePriority); + ok(SystemVa == NULL, "MmMapLockedPagesSpecifyCache succeeded for 2 GB\n"); + if (SystemVa != NULL) + MmUnmapLockedPages(SystemVa, Mdl); + ok(MmGetMdlByteCount(Mdl) != 2UL * 1024 * 1024 * 1024, "Byte count: %lu\n", MmGetMdlByteCount(Mdl)); + ok(MmGetMdlVirtualAddress(Mdl) == NULL, "Virtual address: %p\n", MmGetMdlVirtualAddress(Mdl)); + ok(!(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdl->MdlFlags); + MmFreePagesFromMdl(Mdl); + } + + /* now allocate and map 32 MB Mdls until we fail */ + for (i = 0; i < sizeof(Mdls) / sizeof(Mdls[0]); i++) + { + Mdls[i] = MmAllocatePagesForMdl(LowAddress, + HighAddress, + SkipBytes, + 32 * 1024 * 1024); + if (Mdls[i] == NULL) + { + trace("MmAllocatePagesForMdl failed with i = %lu\n", i); + break; + } + ok(MmGetMdlVirtualAddress(Mdls[i]) == NULL, "Virtual address: %p\n", MmGetMdlVirtualAddress(Mdls[i])); + ok(!(Mdls[i]->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdls[i]->MdlFlags); + SystemVas[i] = MmMapLockedPagesSpecifyCache(Mdls[i], + KernelMode, + MmCached, + NULL, + FALSE, + NormalPagePriority); + if (SystemVas[i] == NULL) + { + ok(MmGetMdlByteCount(Mdls[i]) <= 32 * 1024 * 1024, "Byte count: %lu\n", MmGetMdlByteCount(Mdls[i])); + ok(MmGetMdlVirtualAddress(Mdls[i]) == NULL, "Virtual address: %p\n", MmGetMdlVirtualAddress(Mdls[i])); + ok(!(Mdls[i]->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdls[i]->MdlFlags); + trace("MmMapLockedPagesSpecifyCache failed with i = %lu\n", i); + break; + } + ok(MmGetMdlByteCount(Mdls[i]) == 32 * 1024 * 1024, "Byte count: %lu\n", MmGetMdlByteCount(Mdls[i])); + ok(MmGetMdlVirtualAddress(Mdls[i]) == NULL, "Virtual address: %p, System VA: %p\n", MmGetMdlVirtualAddress(Mdls[i]), SystemVas[i]); + ok(Mdls[i]->MappedSystemVa == SystemVas[i], "MappedSystemVa: %p\n", Mdls[i]->MappedSystemVa, SystemVas[i]); + ok((Mdls[i]->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdls[i]->MdlFlags); + } + for (i = 0; i < sizeof(Mdls) / sizeof(Mdls[0]); i++) + { + if (Mdls[i] == NULL) + break; + if (SystemVas[i] != NULL) + MmUnmapLockedPages(SystemVas[i], Mdls[i]); + MmFreePagesFromMdl(Mdls[i]); + if (SystemVas[i] == NULL) + break; + } +} + +START_TEST(MmMdl) +{ + TestMmAllocatePagesForMdl(); +} Propchange: trunk/rostests/kmtests/ntos_mm/MmMdl.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cwittich] 68270: [VIDEOPRT] export functions needed by gfx drivers patch by Mike Nordell CORE-9808
by cwittich＠svn.reactos.org 26 Jun '15

26 Jun '15

Author: cwittich Date: Fri Jun 26 06:14:15 2015 New Revision: 68270 URL: http://svn.reactos.org/svn/reactos?rev=68270&view=rev Log: [VIDEOPRT] export functions needed by gfx drivers patch by Mike Nordell CORE-9808 Modified: trunk/reactos/include/ddk/video.h trunk/reactos/win32ss/drivers/videoprt/funclist.c Modified: trunk/reactos/include/ddk/video.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/video.h?rev=68… ============================================================================== --- trunk/reactos/include/ddk/video.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/video.h [iso-8859-1] Fri Jun 26 06:14:15 2015 @@ -1536,7 +1536,7 @@ VPAPI VOID NTAPI -VideoPortUnLockBuffer( +VideoPortUnlockBuffer( IN PVOID HwDeviceExtension, IN PVOID Mdl); Modified: trunk/reactos/win32ss/drivers/videoprt/funclist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/f… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/funclist.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/funclist.c [iso-8859-1] Fri Jun 26 06:14:15 2015 @@ -26,49 +26,59 @@ typedef struct _VIDEO_PORT_FUNCTION_TABLE { PVOID Address; - PUCHAR Name; + PCSZ Name; } *PVIDEO_PORT_FUNCTION_TABLE, VIDEO_PORT_FUNCTION_TABLE; /* GLOBAL VARIABLES ***********************************************************/ -#define VP_EXPORTED_FUNCS 6 +#define VP_EXPORTED_FUNCS (sizeof(VideoPortExports) / sizeof(*VideoPortExports)) -UCHAR FN_VideoPortClearEvent[] = "VideoPortClearEvent"; -UCHAR FN_VideoPortCreateEvent[] = "VideoPortCreateEvent"; -UCHAR FN_VideoPortCreateSecondaryDisplay[] = "VideoPortCreateSecondaryDisplay"; -UCHAR FN_VideoPortDeleteEvent[] = "VideoPortDeleteEvent"; -UCHAR FN_VideoPortQueueDpc[] = "VideoPortQueueDpc"; -UCHAR FN_VideoPortSetEvent[] = "VideoPortSetEvent"; - -VIDEO_PORT_FUNCTION_TABLE VideoPortExports[] = { - {VideoPortClearEvent, FN_VideoPortClearEvent}, - {VideoPortCreateEvent, FN_VideoPortCreateEvent}, - {VideoPortCreateSecondaryDisplay, FN_VideoPortCreateSecondaryDisplay}, - {VideoPortDeleteEvent, FN_VideoPortDeleteEvent}, - {VideoPortQueueDpc, FN_VideoPortQueueDpc}, - {VideoPortSetEvent, FN_VideoPortSetEvent} +/* Create an array of entries with pfn, psz, for IntVideoPortGetProcAddress */ +#define MAKE_ENTRY(FUNCTIONNAME) { FUNCTIONNAME, #FUNCTIONNAME } +const VIDEO_PORT_FUNCTION_TABLE VideoPortExports[] = { + MAKE_ENTRY(VideoPortQueueDpc), + MAKE_ENTRY(VideoPortAllocatePool), + MAKE_ENTRY(VideoPortFreePool), + MAKE_ENTRY(VideoPortReleaseCommonBuffer), + MAKE_ENTRY(VideoPortAllocateCommonBuffer), + MAKE_ENTRY(VideoPortCreateSecondaryDisplay), + MAKE_ENTRY(VideoPortGetDmaAdapter), + MAKE_ENTRY(VideoPortGetVersion), + MAKE_ENTRY(VideoPortLockBuffer), + MAKE_ENTRY(VideoPortUnlockBuffer), + MAKE_ENTRY(VideoPortSetEvent), + MAKE_ENTRY(VideoPortClearEvent), + MAKE_ENTRY(VideoPortReadStateEvent), + MAKE_ENTRY(VideoPortRegisterBugcheckCallback), + MAKE_ENTRY(VideoPortCreateEvent), + MAKE_ENTRY(VideoPortDeleteEvent), + MAKE_ENTRY(VideoPortWaitForSingleObject), + MAKE_ENTRY(VideoPortCheckForDeviceExistence), + MAKE_ENTRY(VideoPortFlushRegistry), + MAKE_ENTRY(VideoPortQueryPerformanceCounter), }; +#undef MAKE_ENTRY PVOID NTAPI IntVideoPortGetProcAddress( IN PVOID HwDeviceExtension, IN PUCHAR FunctionName) { - ULONG i = 0; + ULONG i = 0; - TRACE_(VIDEOPRT, "VideoPortGetProcAddress(%s)\n", FunctionName); + TRACE_(VIDEOPRT, "VideoPortGetProcAddress(%s)\n", FunctionName); /* Search by name */ - for (i = 0; i < VP_EXPORTED_FUNCS; i++) - { - if (!_strnicmp((PCHAR)FunctionName, (PCHAR)VideoPortExports[i].Name, - strlen((PCHAR)FunctionName))) - { - return (PVOID)VideoPortExports[i].Address; - } - } - WARN_(VIDEOPRT, "VideoPortGetProcAddress: Can't resolve symbol %s\n", FunctionName); + for (i = 0; i < VP_EXPORTED_FUNCS; i++) + { + if (!strcmp((PCHAR)FunctionName, VideoPortExports[i].Name)) + { + return (PVOID)VideoPortExports[i].Address; + } + } + + ERR_(VIDEOPRT, "VideoPortGetProcAddress: Can't resolve symbol %s\n", FunctionName); return NULL; }

1 0

[pschweitzer] 68269: [NTFS] In NtfsFindFileAt() directly print first entry value instead of its address
by pschweitzer＠svn.reactos.org 25 Jun '15

25 Jun '15

Author: pschweitzer Date: Thu Jun 25 20:51:30 2015 New Revision: 68269 URL: http://svn.reactos.org/svn/reactos?rev=68269&view=rev Log: [NTFS] In NtfsFindFileAt() directly print first entry value instead of its address 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] Thu Jun 25 20:51:30 2015 @@ -801,7 +801,7 @@ { NTSTATUS Status; - DPRINT("NtfsFindFileAt(%p, %wZ, %p, %p, %p, %I64x)\n", Vcb, SearchPattern, FirstEntry, FileRecord, MFTIndex, CurrentMFTIndex); + DPRINT("NtfsFindFileAt(%p, %wZ, %u, %p, %p, %I64x)\n", Vcb, SearchPattern, *FirstEntry, FileRecord, MFTIndex, CurrentMFTIndex); Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, SearchPattern, FirstEntry, TRUE, &CurrentMFTIndex); if (!NT_SUCCESS(Status))

1 0

[pschweitzer] 68268: [NTFS] Don't attempt to read the unnamed stream of the $DATA attribute of each file matching: - We don't need such attribute later on - In case there's no such unammed stream, ...
by pschweitzer＠svn.reactos.org 25 Jun '15

25 Jun '15

Author: pschweitzer Date: Thu Jun 25 20:49:40 2015 New Revision: 68268 URL: http://svn.reactos.org/svn/reactos?rev=68268&view=rev Log: [NTFS] Don't attempt to read the unnamed stream of the $DATA attribute of each file matching: - We don't need such attribute later on - In case there's no such unammed stream, finding the file fails, whereas the file really exist This fixes (at least here) browsing Win7 NTFS system drives, where our driver was always failing on pagefile.sys Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c trunk/reactos/drivers/filesystems/ntfs/mft.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] Thu Jun 25 20:49:40 2015 @@ -38,7 +38,6 @@ static NTSTATUS NtfsGetNameInformation(PDEVICE_EXTENSION DeviceExt, PFILE_RECORD_HEADER FileRecord, - PNTFS_ATTR_CONTEXT DataContext, PFILE_NAMES_INFORMATION Info, ULONG BufferLength) { @@ -66,7 +65,6 @@ static NTSTATUS NtfsGetDirectoryInformation(PDEVICE_EXTENSION DeviceExt, PFILE_RECORD_HEADER FileRecord, - PNTFS_ATTR_CONTEXT DataContext, ULONGLONG MFTIndex, PFILE_DIRECTORY_INFORMATION Info, ULONG BufferLength) @@ -112,7 +110,6 @@ static NTSTATUS NtfsGetFullDirectoryInformation(PDEVICE_EXTENSION DeviceExt, PFILE_RECORD_HEADER FileRecord, - PNTFS_ATTR_CONTEXT DataContext, ULONGLONG MFTIndex, PFILE_FULL_DIRECTORY_INFORMATION Info, ULONG BufferLength) @@ -159,7 +156,6 @@ static NTSTATUS NtfsGetBothDirectoryInformation(PDEVICE_EXTENSION DeviceExt, PFILE_RECORD_HEADER FileRecord, - PNTFS_ATTR_CONTEXT DataContext, ULONGLONG MFTIndex, PFILE_BOTH_DIR_INFORMATION Info, ULONG BufferLength) @@ -236,7 +232,6 @@ PFILE_OBJECT FileObject; NTSTATUS Status = STATUS_SUCCESS; PFILE_RECORD_HEADER FileRecord; - PNTFS_ATTR_CONTEXT DataContext; ULONGLONG MFTRecord, OldMFTRecord = 0; UNICODE_STRING Pattern; @@ -315,7 +310,6 @@ &Pattern, &Ccb->Entry, &FileRecord, - &DataContext, &MFTRecord, Fcb->MFTIndex); @@ -338,7 +332,6 @@ case FileNameInformation: Status = NtfsGetNameInformation(DeviceExtension, FileRecord, - DataContext, (PFILE_NAMES_INFORMATION)Buffer, BufferLength); break; @@ -346,7 +339,6 @@ case FileDirectoryInformation: Status = NtfsGetDirectoryInformation(DeviceExtension, FileRecord, - DataContext, MFTRecord, (PFILE_DIRECTORY_INFORMATION)Buffer, BufferLength); @@ -355,7 +347,6 @@ case FileFullDirectoryInformation: Status = NtfsGetFullDirectoryInformation(DeviceExtension, FileRecord, - DataContext, MFTRecord, (PFILE_FULL_DIRECTORY_INFORMATION)Buffer, BufferLength); @@ -364,7 +355,6 @@ case FileBothDirectoryInformation: Status = NtfsGetBothDirectoryInformation(DeviceExtension, FileRecord, - DataContext, MFTRecord, (PFILE_BOTH_DIR_INFORMATION)Buffer, BufferLength); 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] Thu Jun 25 20:49:40 2015 @@ -796,13 +796,12 @@ PUNICODE_STRING SearchPattern, PULONG FirstEntry, PFILE_RECORD_HEADER *FileRecord, - PNTFS_ATTR_CONTEXT *DataContext, PULONGLONG MFTIndex, ULONGLONG CurrentMFTIndex) { NTSTATUS Status; - DPRINT("NtfsFindFileAt(%p, %wZ, %p, %p, %p, %p, %I64x)\n", Vcb, SearchPattern, FirstEntry, FileRecord, DataContext, MFTIndex, CurrentMFTIndex); + DPRINT("NtfsFindFileAt(%p, %wZ, %p, %p, %p, %I64x)\n", Vcb, SearchPattern, FirstEntry, FileRecord, MFTIndex, CurrentMFTIndex); Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, SearchPattern, FirstEntry, TRUE, &CurrentMFTIndex); if (!NT_SUCCESS(Status)) @@ -826,21 +825,6 @@ return Status; } - if (!((*FileRecord)->Flags & FRH_DIRECTORY)) - { - Status = FindAttribute(Vcb, *FileRecord, AttributeData, L"", 0, DataContext); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtfsFindFileAt: Can't find data attribute\n"); - ExFreePoolWithTag(*FileRecord, TAG_NTFS); - return Status; - } - } - else - { - *DataContext = NULL; - } - *MFTIndex = CurrentMFTIndex; return STATUS_SUCCESS; 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] Thu Jun 25 20:49:40 2015 @@ -739,7 +739,6 @@ PUNICODE_STRING SearchPattern, PULONG FirstEntry, PFILE_RECORD_HEADER *FileRecord, - PNTFS_ATTR_CONTEXT *DataContext, PULONGLONG MFTIndex, ULONGLONG CurrentMFTIndex);

1 0

[gedmurphy] 68267: [DEVMGR] - When disabling a device, show the user a message box to confirm before disabling - Some code cleanup
by gedmurphy＠svn.reactos.org 25 Jun '15

25 Jun '15

Author: gedmurphy Date: Thu Jun 25 20:34:57 2015 New Revision: 68267 URL: http://svn.reactos.org/svn/reactos?rev=68267&view=rev Log: [DEVMGR] - When disabling a device, show the user a message box to confirm before disabling - Some code cleanup Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.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/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] Thu Jun 25 20:34:57 2015 @@ -340,6 +340,8 @@ if (Enable) { + // config specific enablling first, then global enabling. + // The global appears to be the one that starts the device pcp.Scope = DICS_FLAG_GLOBAL; if (SetupDiSetClassInstallParamsW(m_hDevInfo, &m_DevinfoData, 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] Thu Jun 25 20:34:57 2015 @@ -311,6 +311,21 @@ CDeviceNode *Node = dynamic_cast<CDeviceNode *>(GetSelectedNode()); if (Node) { + 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); 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] Thu Jun 25 20:34:57 2015 @@ -49,19 +49,6 @@ }; - - - -#define IDS_HINT_BLANK 20000 -#define IDS_HINT_PROPERTIES 20001 -#define IDS_HINT_SCAN 20002 -#define IDS_HINT_ENABLE 20003 -#define IDS_HINT_DISABLE 20004 -#define IDS_HINT_UPDATE 20005 -#define IDS_HINT_UNINSTALL 20006 -#define IDS_HINT_ADD 20007 -#define IDS_HINT_ABOUT 20008 -#define IDS_HINT_EXIT 20009 // system menu hints static const MENU_HINT SystemMenuHintTable[] = 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] Thu Jun 25 20:34:57 2015 @@ -1,4 +1,6 @@ #define IDC_STATIC -1 + +#define IDS_APPNAME 10 #define IDI_MAIN_ICON 20 #define IDB_ROOT_IMAGE 21 @@ -29,31 +31,27 @@ #define IDC_RESBYCONN 203 #define IDC_SHOWHIDDEN 204 -/* about box info */ -#define IDD_ABOUTBOX 300 -#define IDC_LICENSE_EDIT 301 -#define IDS_APPNAME 302 -#define IDS_LICENSE 303 /* tooltips */ -#define IDS_TOOLTIP_PROPERTIES 6000 -#define IDS_TOOLTIP_SCAN 6001 -#define IDS_TOOLTIP_ENABLE 6002 -#define IDS_TOOLTIP_DIABLE 6003 -#define IDS_TOOLTIP_UPDATE 6004 -#define IDS_TOOLTIP_UNINSTALL 6005 +#define IDS_TOOLTIP_PROPERTIES 300 +#define IDS_TOOLTIP_SCAN 301 +#define IDS_TOOLTIP_ENABLE 302 +#define IDS_TOOLTIP_DIABLE 303 +#define IDS_TOOLTIP_UPDATE 304 +#define IDS_TOOLTIP_UNINSTALL 305 - +/* General strings */ +#define IDS_CONFIRM_DISABLE 400 /* menu hints */ -#define IDS_HINT_BLANK 20000 -#define IDS_HINT_PROPERTIES 20001 -#define IDS_HINT_SCAN 20002 -#define IDS_HINT_ENABLE 20003 -#define IDS_HINT_DISABLE 20004 -#define IDS_HINT_UPDATE 20005 -#define IDS_HINT_UNINSTALL 20006 -#define IDS_HINT_ADD 20007 +#define IDS_HINT_BLANK 1000 +#define IDS_HINT_PROPERTIES 1001 +#define IDS_HINT_SCAN 1002 +#define IDS_HINT_ENABLE 1003 +#define IDS_HINT_DISABLE 1004 +#define IDS_HINT_UPDATE 1005 +#define IDS_HINT_UNINSTALL 1006 +#define IDS_HINT_ADD 1007 #define IDS_HINT_ABOUT 20008 #define IDS_HINT_EXIT 20009 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] Thu Jun 25 20:34:57 2015 @@ -49,12 +49,12 @@ END END -#define IDS_HINT_PROPERTIES 20001 -#define IDS_HINT_SCAN 20002 -#define IDS_HINT_ENABLE 20003 -#define IDS_HINT_DISABLE 20004 -#define IDS_HINT_UPDATE 20005 -#define IDS_HINT_UNINSTALL 20006 + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONFIRM_DISABLE "Disabling this device will cause it to stop functioning.\r\nDo you really want to disable it?" +END STRINGTABLE DISCARDABLE BEGIN

1 0

[ekohl] 68266: [USETUP] Remove obsolete restriction info.
by ekohl＠svn.reactos.org 25 Jun '15

25 Jun '15

Author: ekohl Date: Thu Jun 25 20:20:21 2015 New Revision: 68266 URL: http://svn.reactos.org/svn/reactos?rev=68266&view=rev Log: [USETUP] Remove obsolete restriction info. Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/bn-BD.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/et-EE.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/he-IL.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/pt-BR.h trunk/reactos/base/setup/usetup/lang/ro-RO.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sq-AL.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/tr-TR.h trunk/reactos/base/setup/usetup/lang/uk-UA.h Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -166,42 +166,12 @@ { 8, 13, - "- áâà®©¢ çêâ ¥ ¬®¦¥ ¤ à ¡®â¨ á ¯®¢¥ç¥ ®â ¥¤¨ ¤ï« ¤¨áª.", + "- áâà®©¢ çêâ ¯®¤¤êà¦ á ¬® FAT.", TEXT_STYLE_NORMAL }, { 8, 14, - "- áâà®©¢ çêâ ¥ ¬®¦¥ ¤ ¨§âà¨e ¯êà¢¨çe ¤ï«,", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " ª® ¤¨áª ¨¬ à §è¨à¥ ¤ï«." , - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- áâà®©¢ çêâ ¥ ¬®¦¥ ¤ ¨§âà¨¥ ¯êà¢¨ï à §è¨à¥ ¤ï« ®â ¤¨áª , ", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " ª® ¤¨áª ¨¬ ¨ ¤àã£¨ à §è¨à¥¨ ¤ï«®¢¥.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- áâà®©¢ çêâ ¯®¤¤êà¦ á ¬® FAT.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- à®¢¥àª â ä ©«®¢ â ãà¥¤¡ ¢á¥ ®é¥ ¥ ¥ £®â®¢ .", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/bn-BD.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bn-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -157,42 +157,12 @@ { 8, 13, - "- Setup can not handle more than one primary partition per disk.", + "- Setup supports FAT file systems only.", TEXT_STYLE_NORMAL }, { 8, 14, - "- Setup can not delete a primary partition from a disk", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " as long as extended partitions exist on this disk.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- Setup can not delete the first extended partition from a disk", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " as long as other extended partitions exist on this disk.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Setup supports FAT file systems only.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- File system checks are not implemented yet.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -165,42 +165,12 @@ { 8, 13, - "- Instalace nedok §e zpracovat v¡ce ne§ jeden prim rn¡ odd¡l na disku.", + "- Instalace podporuje pouze souborovì systm FAT.", TEXT_STYLE_NORMAL }, { 8, 14, - "- Instalace nedok §e vymazat prim rn¡ odd¡l z disku,", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " pokud na tomto disku existuj¡ rozç¡ýen odd¡ly.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- Instalace nedok §e vymazat prvn¡ rozç¡ýenì odd¡l z disku,", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " pokud na tomto disku existuj¡ dalç¡ rozç¡ýen odd¡ly.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Instalace podporuje pouze souborovì systm FAT.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- Kontroly souborovìch systm zat¡m nejsou implementov ny.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -158,42 +158,12 @@ { 8, 13, - "- Nur primre Festplattenpartitionen knnen verwaltet werden.", + "- Es werden nur FAT-Dateisysteme untersttzt.", TEXT_STYLE_NORMAL }, { 8, 14, - "- Eine primre Partition kann nicht gelscht werden,", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " solange erweiterte Partitionen auf der Festplatte existieren.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- Die jeweils erste erweiterte Partition kann nicht gelscht werden,", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " solange weitere erweiterte Partitionen auf der Festplatte existieren.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Es werden nur FAT-Dateisysteme untersttzt.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- Die Dateisystemberprfung ist noch nicht implementiert.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -158,48 +158,12 @@ { 8, 12, - "- ¡«á©«© £§¦¨å ¤ ® ¨ ©«å §á¤à §æ â¤ §¨à«ç¦¤", + "- ¡«á©«© ¬§¦©«¨å £æ¤¦ FAT ©¬©«ã£« ¨®åà¤.", TEXT_STYLE_NORMAL }, { 8, 13, - " £â¨ ©£ ¤á å©¡¦.", - TEXT_STYLE_NORMAL - }, - { - 8, - 14, - "- ¡«á©«© £§¦¨å ¤ ¨á¯ â¤ §¨à«ç¦¤ £â¨ ©£ ", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " §æ â¤ å©¡¦ æ©¦¤ ¬§á¨®¦¬¤ ¡««£â¤ £¨å©£« ©«¦ å©¡¦ ¬«æ.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- ¡«á©© £§¦¨å ¤ ¨á¯ «¦ §¨é«¦ ¡««£â¤¦ £â¨ ©£ ¤æª ", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " å©¡¦¬ æ©¦¤ ¬§á¨®¦¬¤ ¡ á¢¢ ¡««£â¤ £¨å©£« ©«¦ å©¡¦ ¬«æ.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- ¡«á©«© ¬§¦©«¨å £æ¤¦ FAT ©¬©«ã£« ¨®åà¤.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- ¤ ¬§¦©«¨å« ¡æ£ â¢®¦ª ©¢£á«à¤ ©« ©¬«ã£« ¨®åà¤.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -157,42 +157,12 @@ { 8, 13, - "- Setup can not handle more than one primary partition per disk.", + "- Setup supports FAT file systems only.", TEXT_STYLE_NORMAL }, { 8, 14, - "- Setup can not delete a primary partition from a disk", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " as long as extended partitions exist on this disk.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- Setup can not delete the first extended partition from a disk", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " as long as other extended partitions exist on this disk.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Setup supports FAT file systems only.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- File system checks are not implemented yet.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -158,48 +158,18 @@ { 8, 13, - "- El instalador no soporta m s de una partici¢n primaria por disco.", + "- El instalador soporta solamente el sistema de archivos FAT.", TEXT_STYLE_NORMAL }, { 8, 14, - "- El instalador no puede eliminar una partici¢n primaria de un disco", + "- El comprobador de integridad del sistema de archivos no est a£n", TEXT_STYLE_NORMAL }, { 8, 15, - " si hay particiones extendidas en el mismo.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- El instalador no puede eliminar la primer partici¢n extendida", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " si existen otras particiones extendidas en el disco.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- El instalador soporta solamente el sistema de archivos FAT.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, - "- El comprobador de integridad del sistema de archivos no est a£n", - TEXT_STYLE_NORMAL - }, - { - 8, - 20, " implementado.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -157,42 +157,12 @@ { 8, 13, - "- Sihtkettal väib olla ainult ks peamine partitsioon.", + "- Toetatud on ainult FAT failissteem.", TEXT_STYLE_NORMAL }, { 8, 14, - "- Peamist partitsiooni ei saa kettalt kustutada", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " kui kettal on ka laiendatud partitsioone.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- Esimest laiendatud partitsiooni ei saa kettalt kustutada", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " kui kettal on ka teisi laiendatud partitsioone.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Toetatud on ainult FAT failissteem.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- Failissteemi kontrollimist veel ei tehta.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -164,42 +164,12 @@ { 8, 13, - "- L'installation ne peut grer plus d'une partition primaire par disque.", + "- L'installation supporte uniquement le systme de fichiers FAT.", TEXT_STYLE_NORMAL }, { 8, 14, - "- L'installation ne peut effacer une partition primaire d'un disque", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " tant que des partitions secondaires existent sur ce disque.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- L'installation ne peut effacer la premire partition secondaire", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " tant que des autres partitions secondaires existent sur ce disque.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- L'installation supporte uniquement le systme de fichiers FAT.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- Les vrifications de systme de fichers ne sont pas implmentes.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -158,42 +158,12 @@ { 8, 13, - ". -", + "- Setup supports FAT file systems only.", TEXT_STYLE_NORMAL }, { 8, 14, - " -", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - ". ", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- Setup can not delete the first extended partition from a disk", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " as long as other extended partitions exist on this disk.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Setup supports FAT file systems only.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- File system checks are not implemented yet.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -163,38 +163,14 @@ }, { 8, - 13, - "- Il setup non gestisce pi di una partizione primaria per disco.", + 13, + "- Il setup supporta solamente il sistema FAT.", TEXT_STYLE_NORMAL }, { 8, 14, - "- Il setup non pu eliminare una partizione primaria", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " se ci sono partizioni estese nel disco fisso.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- Il setup non pu eliminare la prima partizione estesa", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " se ci sono altre partizioni estese nel disco fisso.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Il setup supporta solamente il sistema FAT.", + "- File system checks are not implemented yet.", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -158,42 +158,12 @@ { 8, 13, - "- ¾¯Ä±¯ÌßÊ 1ÂÉ ÃÞ¨½¸Æ Â· 1Â²¼Þ®³É Ìß×²ÏØ Êß°Ã¨¼®Ý¦ ±Â¶³ºÄ¶Þ ÃÞ·Ï¾Ý¡", + "- ¾¯Ä±¯ÌßÊ FAT Ì§²Ù¼½ÃÑ ÉÐ »Îß°Ä ¼Ï½¡", TEXT_STYLE_NORMAL }, { 8, 14, - "- ¶¸Á®³ Êß°Ã¨¼®Ý¶Þ ºÉ ÃÞ¨½¸¼Þ®³Æ ¿Ý»Þ²½Ù ÊÞ±²¤ ¾¯Ä±¯ÌßÊ", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " Ìß×²ÏØ Êß°Ã¨¼®Ý¦ ÃÞ¨½¸¶× »¸¼Þ® ÃÞ·Ï¾Ý¡", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- ÀÉ ¶¸Á®³ Ø®³²·¶Þ ºÉ ÃÞ¨½¸¼Þ®³Æ ¿Ý»Þ² ¼Ã²Ù ÊÞ±²¤ ¾¯Ä±¯ÌßÊ", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " »²¼®É ¶¸Á®³ Ø®³²·¦ ÃÞ¨½¸¶× »¸¼Þ® ÃÞ·Ï¾Ý¡", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- ¾¯Ä±¯ÌßÊ FAT Ì§²Ù¼½ÃÑ ÉÐ »Îß°Ä ¼Ï½¡", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- Ì§²Ù¼½ÃÑÉ Áª¯¸·É³Ê ÏÀÞ ¼Þ¯¿³ »ÚÃ ²Ï¾Ý¡", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -167,42 +167,12 @@ { 8, 13, - "- Setup can not handle more than one primary partition per disk.", + "- Setup supports FAT file systems only.", TEXT_STYLE_NORMAL }, { 8, 14, - "- Setup can not delete a primary partition from a disk", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " as long as extended partitions exist on this disk.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- Setup can not delete the first extended partition from a disk", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " as long as other extended partitions exist on this disk.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Setup supports FAT file systems only.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- File system checks are not implemented yet.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -179,48 +179,12 @@ { 8, 13, - "\x07 Setup kan niet meer dan 1 primaire partitie per vaste schijf aan.", + "\x07 Setup ondersteunt alleen FAT bestandssystemen.", TEXT_STYLE_NORMAL }, { 8, 14, - "\x07 Setup kan geen primaire partitie van een schijf verwijderen", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " zo lang er nog uitgebreide partities bestaan op deze schijf.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "\x07 Setup kan de eerste uitgebreide partitie van een schijf niet", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " verwijderen zolang er nog andere uitgebreide partities", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - " op deze schijf bestaan.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, - "\x07 Setup ondersteunt alleen FAT bestandssystemen.", - TEXT_STYLE_NORMAL - }, - { - 8, - 20, "\x07 Bestandssysteemcontrole is nog niet ge\x8Bmplementeerd.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -167,42 +167,12 @@ { 8, 13, - "- Instalator obsuguje jedn¥ partycj© Podstawow¥ na dysku.", + "- Instalator obsuguje jedynie system plik¢w FAT.", TEXT_STYLE_NORMAL }, { 8, 14, - "- Instalator nie mo¾e skasowa partycji podstawowej z dysku", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " o ile nadal znajduje si© na nim tak¾e partycja Rozszerzona.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- Instalator nie mo¾e skasowa pierwszej partycji Rozszerzonej z dysku", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " o ile nadal znajduj¥ si© na nim kolejne partycje Rozszerzone.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Instalator obsuguje jedynie system plik¢w FAT.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- Brakuje sprawdzenia poprawnoci systemu plik¢w.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -157,49 +157,19 @@ }, { 8, + 12, + "- O instalador suporta somente o sistema de arquivos FAT.", + TEXT_STYLE_NORMAL + }, + { + 8, 13, - "- O instalador nÆo suporta mais de uma partiÆo prim ria por disco.", + "- O verificador de integridade de sistema de arquivos ainda nÆo est ", TEXT_STYLE_NORMAL }, { 8, 14, - "- O instalador nÆo pode excluir uma partiÆo prim ria de um disco", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " se houverem partiäes estendidas no mesmo disco.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- O instalador nÆo pode remover a primeira partiÆo estendida de um", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " disco se existirem outras partiäes estendidas no mesmo disco.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- O instalador suporta somente o sistema de arquivos FAT.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, - "- O verificador de integridade de sistema de arquivos ainda nÆo est ", - TEXT_STYLE_NORMAL - }, - { - 8, - 20, " implementado.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -177,60 +177,24 @@ { 8, 14, - "- Programul curent de instalare nu e capabil de mai mult", + "- Programul curent de instalare poate opera doar cu sisteme", TEXT_STYLE_NORMAL }, { 8, 15, - " de o partiîie per disc.", + " de fiiere FAT.", TEXT_STYLE_NORMAL }, { 8, 16, - "- Programul curent de instalare nu poate terge o partiîie", + "- VerificÇrile de integritate pentru fiiere nu sunt", TEXT_STYLE_NORMAL }, { 8, 17, - " primarÇ ct timp existÇ partiîii extinse.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Programul curent de instalare nu poate terge prima partiîie", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, - " extinsÇ, ct timp existÇ alte partiîii extinse.", - TEXT_STYLE_NORMAL - }, - { - 8, - 20, - "- Programul curent de instalare poate opera doar cu sisteme", - TEXT_STYLE_NORMAL - }, - { - 8, - 21, - " de fiiere FAT.", - TEXT_STYLE_NORMAL - }, - { - 8, - 22, - "- VerificÇrile de integritate pentru fiiere nu sunt", - TEXT_STYLE_NORMAL - }, - { - 8, - 23, " ncÇ implementate.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -158,42 +158,12 @@ { 8, 13, - "- áâ ®¢ª ¢®§¬®¦ â®«ìª® ¯¥à¢¨çë© à §¤¥« ¤¨áª ", + "- à¨ ãáâ ®¢ª¥ ¯®¤¤¥à¦¨¢ ¥âáï â®«ìª® ä ©«®¢ ï á¨áâ¥¬ FAT.", TEXT_STYLE_NORMAL }, { 8, 14, - "- à¨ ãáâ ®¢ª¥ ¥«ì§ï ã¤ «¨âì ¯¥à¢¨çë© à §¤¥« ¤¨áª ", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " ¯®ª ¨¬¥¥âáï à áè¨à¥ë© à §¤¥«.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- à¨ ãáâ ®¢ª¥ ¥«ì§ï ã¤ «¨âì ¯¥à¢ë© à áè¨à¥ë© à §¤¥« á ¤¨áª ", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " ¯®ª áãé¥áâ¢ãîâ ¤àã£¨¥ à áè¨à¥ë¥ à §¤¥«ë.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- à¨ ãáâ ®¢ª¥ ¯®¤¤¥à¦¨¢ ¥âáï â®«ìª® ä ©«®¢ ï á¨áâ¥¬ FAT.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- à®¢¥àª ä ©«®¢®© á¨áâ¥¬ë ¥ ®áãé¥áâ¢«ï¥âáï.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -165,42 +165,12 @@ { 8, 13, - "- Inçtal tor nepracuje s viac ako 1 prim rnou oblasou na 1 disku.", + "- Inçtal tor podporuje iba s£borovì systm FAT.", TEXT_STYLE_NORMAL }, { 8, 14, - "- Inçtal tor nevie odstr ni prim rnu oblas z disku,", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " pokia existuj£ rozç¡ren oblasti na disku.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- Inçtal tor nevie odstr ni prv£ rozç¡ren£ oblas z disku,", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " pokia existuj£ in rozç¡ren oblasti na disku.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Inçtal tor podporuje iba s£borovì systm FAT.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- Kontrola s£borovho systmu zatia nie je implementovan .", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sq-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -161,42 +161,12 @@ { 8, 13, - "- Instalimi nuk prballoje m shum se nj particion primare pr disk.", + "- Instalimi suporton vetm dokumentat FAT t sistemit.", TEXT_STYLE_NORMAL }, { 8, 14, - "- Instalimi nuk mund t fshij nj particion primare nga hard disku", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " pr aq koh sa nj particion i zgjatur ekziston n kt hard disk.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- Instalimi nuk mund t fshij particionin e pare nga nj hard disk", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " pr aq koh sa particione t tjera t zgjatura ekzistojne n hard disk.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Instalimi suporton vetm dokumentat FAT t sistemit.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- Kontrollet e dokumentave t sistemit nuk jan implementuar ende.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -164,42 +164,12 @@ { 8, 13, - "- Setup kan ej hantera mer n 1 primr partition per hrddisk.", + "- Setup stder endast filsystem av typen FAT.", TEXT_STYLE_NORMAL }, { 8, 14, - "- Setup kan ej radera en primr partition frn en hrddisk", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " om utkade partitioner existerar p hrddisken.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- Setup kan ej radera den frsta utkade partitionen frn en hrddisk", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " om andra utkade partitioner existerar p hrddisken.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Setup stder endast filsystem av typen FAT.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- Kontrollering av hrddiskens filsystem stds (nnu) ej.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -161,42 +161,12 @@ { 8, 13, - "- Kur, bir diskte birden ok ana blm ynetemez.", + "- Kur, yalnzca FAT ktk dizgelerini destekler.", TEXT_STYLE_NORMAL }, { 8, 14, - "- Kur, bir diskte geniletilmi blmler oldu§u srece", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " o diskten bir ana blm silemez.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- Kur, bir diskte baka geniletilmi blmlerin oldu§u srece", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " o diskten ilk geniletilmi blm silemez.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Kur, yalnzca FAT ktk dizgelerini destekler.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- Ktk dizgesi denetimi daha bitirilmemitir.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -163,42 +163,12 @@ { 8, 13, - "- áâ ®¢«î¢ ç ¥ ¯i¤âà¨¬ãó ¡i«ìè¥ i¦ ®¤¨ ¯¥à¢¨¨© à®§¤i« ¤¨áª.", + "- áâ ®¢«î¢ ç ¯i¤âà¨¬ãó «¨è¥ ä ©«®¢ã á¨áâ¥¬ã FAT.", TEXT_STYLE_NORMAL }, { 8, 14, - "- áâ ®¢«î¢ ç ¥ ¬®¦¥ ¢¨¤ «¨â¨ ¯¥à¢¨¨© à®§¤i« § ¤¨áªã", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " ¯®ª¨ ¤¨áªã ï¢¨© à®§è¨à¥¨© à®§¤i«.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- áâ ®¢«î¢ ç ¥ ¬®¦¥ ¢¨¤ «¨â¨ ¯¥àè¨© à®§è¨à¥¨© à®§¤i« § ¤¨áªã", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " ¯®ª¨ ¤¨áªã iáãîâì ièi à®§è¨à¥i à®§¤i«¨.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- áâ ®¢«î¢ ç ¯i¤âà¨¬ãó «¨è¥ ä ©«®¢ã á¨áâ¥¬ã FAT.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- ¥à¥¢iàª ä ©«®¢®õ á¨áâ¥¬¨ é¥ ¥ ¢¯à®¢ ¤¦¥ .", TEXT_STYLE_NORMAL },

1 0

[gedmurphy] 68265: [DEVMGR] - Add basic functionality for enabling and disabling devices. Make it accessible via the toolbar and main menu - Implement checking whether a device has a problem and if...
by gedmurphy＠svn.reactos.org 25 Jun '15

25 Jun '15

Author: gedmurphy Date: Thu Jun 25 18:59:23 2015 New Revision: 68265 URL: http://svn.reactos.org/svn/reactos?rev=68265&view=rev Log: [DEVMGR] - Add basic functionality for enabling and disabling devices. Make it accessible via the toolbar and main menu - Implement checking whether a device has a problem and if a device can be uninstalled - Implement getting, setting and removing device flags in the install params - Fix creating and destroying the (currently empty) context menu 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 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] Thu Jun 25 18:59:23 2015 @@ -22,10 +22,12 @@ m_ProblemNumber(0), m_OverlayImage(0) { + ZeroMemory(&m_DevinfoData, sizeof(SP_DEVINFO_DATA)); } CDeviceNode::~CDeviceNode() { + SetupDiDestroyDeviceInfoList(m_hDevInfo); } bool @@ -36,6 +38,7 @@ CONFIGRET cr; // ATLASSERT(m_DeviceId == NULL); + // Get the length of the device id string cr = CM_Get_Device_ID_Size(&ulLength, m_DevInst, 0); @@ -64,6 +67,23 @@ if (m_DeviceId == NULL) return false; + //SP_DEVINFO_DATA DevinfoData; + m_hDevInfo = SetupDiCreateDeviceInfoListExW(NULL, + NULL, + NULL, + NULL); + if (m_hDevInfo != INVALID_HANDLE_VALUE) + { + m_DevinfoData.cbSize = sizeof(SP_DEVINFO_DATA); + SetupDiOpenDeviceInfoW(m_hDevInfo, + m_DeviceId, + NULL, + 0, + &m_DevinfoData); + } + + + // Get the current status of the device cr = CM_Get_DevNode_Status_Ex(&m_Status, &m_ProblemNumber, @@ -145,6 +165,22 @@ return (cr == CR_SUCCESS ? true : false); } +bool +CDeviceNode::HasProblem() +{ + CONFIGRET cr; + cr = CM_Get_DevNode_Status_Ex(&m_Status, + &m_ProblemNumber, + m_DevInst, + 0, + NULL); + if (cr == CR_SUCCESS) + { + return ((m_Status & (DN_HAS_PROBLEM | DN_PRIVATE_PROBLEM)) != 0); + } + + return false; +} bool CDeviceNode::IsHidden() @@ -230,4 +266,155 @@ } return false; -} +} + +bool +CDeviceNode::CanUninstall() +{ + CONFIGRET cr; + cr = CM_Get_DevNode_Status_Ex(&m_Status, + &m_ProblemNumber, + m_DevInst, + 0, + NULL); + if (cr == CR_SUCCESS) + { + return ((m_Status & DN_DISABLEABLE) != 0 && + (m_Status & DN_ROOT_ENUMERATED) == 0); + } + + return false; +} + +bool +CDeviceNode::EnableDevice( + _In_ bool Enable, + _Out_ bool &NeedsReboot + ) +{ + bool Ret = false; + bool Canceled = false; + + SetFlags(DI_NODI_DEFAULTACTION, 0); + + SP_PROPCHANGE_PARAMS pcp; + pcp.ClassInstallHeader.cbSize = sizeof(SP_CLASSINSTALL_HEADER); + pcp.ClassInstallHeader.InstallFunction = DIF_PROPERTYCHANGE; + pcp.StateChange = (Enable ? DICS_ENABLE : DICS_DISABLE); + pcp.HwProfile = 0; + + + // check both scopes to make sure we can make the change + for (int i = 0; i < 2; i++) + { + // Check globally first, then check config specific + pcp.Scope = (i == 0) ? DICS_FLAG_GLOBAL : DICS_FLAG_CONFIGSPECIFIC; + + if (SetupDiSetClassInstallParamsW(m_hDevInfo, + &m_DevinfoData, + &pcp.ClassInstallHeader, + sizeof(SP_PROPCHANGE_PARAMS))) + { + SetupDiCallClassInstaller(DIF_PROPERTYCHANGE, + m_hDevInfo, + &m_DevinfoData); + } + + if (GetLastError() == ERROR_CANCELLED) + { + Canceled = true; + break; + } + } + + if (Canceled == false) + { + pcp.Scope = DICS_FLAG_CONFIGSPECIFIC; + if (SetupDiSetClassInstallParamsW(m_hDevInfo, + &m_DevinfoData, + &pcp.ClassInstallHeader, + sizeof(SP_PROPCHANGE_PARAMS))) + { + SetupDiChangeState(m_hDevInfo, &m_DevinfoData); + } + + if (Enable) + { + pcp.Scope = DICS_FLAG_GLOBAL; + if (SetupDiSetClassInstallParamsW(m_hDevInfo, + &m_DevinfoData, + &pcp.ClassInstallHeader, + sizeof(SP_PROPCHANGE_PARAMS))) + { + SetupDiChangeState(m_hDevInfo, &m_DevinfoData); + } + } + + SetFlags(DI_PROPERTIES_CHANGE, 0); + + NeedsReboot = ((GetFlags() & (DI_NEEDRESTART | DI_NEEDREBOOT)) != 0); + } + + RemoveFlags(DI_NODI_DEFAULTACTION, 0); + + return true; +} + +DWORD +CDeviceNode::GetFlags( + ) +{ + SP_DEVINSTALL_PARAMS DevInstallParams; + DevInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); + if (SetupDiGetDeviceInstallParamsW(m_hDevInfo, + &m_DevinfoData, + &DevInstallParams)) + { + return DevInstallParams.Flags; + } + return 0; +} + +bool +CDeviceNode::SetFlags( + _In_ DWORD Flags, + _In_ DWORD FlagsEx + ) +{ + SP_DEVINSTALL_PARAMS DevInstallParams; + DevInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); + if (SetupDiGetDeviceInstallParamsW(m_hDevInfo, + &m_DevinfoData, + &DevInstallParams)) + { + DevInstallParams.Flags |= Flags; + DevInstallParams.FlagsEx |= FlagsEx; + return SetupDiSetDeviceInstallParamsW(m_hDevInfo, + &m_DevinfoData, + &DevInstallParams); + } + return false; +} + +bool +CDeviceNode::RemoveFlags( + _In_ DWORD Flags, + _In_ DWORD FlagsEx + ) +{ + SP_DEVINSTALL_PARAMS DevInstallParams; + DevInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); + if (SetupDiGetDeviceInstallParamsW(m_hDevInfo, + &m_DevinfoData, + &DevInstallParams)) + { + DevInstallParams.Flags &= ~Flags; + DevInstallParams.FlagsEx &= ~FlagsEx; + return SetupDiSetDeviceInstallParamsW(m_hDevInfo, + &m_DevinfoData, + &DevInstallParams); + } + return false; +} + + 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] Thu Jun 25 18:59:23 2015 @@ -4,6 +4,8 @@ class CDeviceNode : public CNode { private: + SP_DEVINFO_DATA m_DevinfoData; + HDEVINFO m_hDevInfo; DEVINST m_DevInst; ULONG m_Status; ULONG m_ProblemNumber; @@ -22,13 +24,31 @@ DEVINST GetDeviceInst() { return m_DevInst; } int GetOverlayImage() { return m_OverlayImage; } - bool HasProblem() { return !!(m_ProblemNumber); } + bool HasProblem(); bool IsHidden(); bool CanDisable(); bool IsDisabled(); bool IsStarted(); bool IsInstalled(); - bool CanInstall() { return TRUE; } // unimplemented - bool CanUninstall() { return TRUE; } // unimplemented + bool CanUninstall(); + + bool EnableDevice( + _In_ bool Enable, + _Out_ bool &NeedsReboot + ); + +private: + bool SetFlags( + _In_ DWORD Flags, + _In_ DWORD FlagsEx + ); + + bool RemoveFlags( + _In_ DWORD Flags, + _In_ DWORD FlagsEx + ); + + DWORD GetFlags( + ); }; 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] Thu Jun 25 18:59:23 2015 @@ -92,8 +92,7 @@ } // Create the context menu and make properties the default item - m_hMenu = LoadMenuW(g_hInstance, MAKEINTRESOURCEW(IDR_POPUP)); - m_hContextMenu = GetSubMenu(m_hMenu, 0); + m_hContextMenu = CreatePopupMenu(); SetMenuDefaultItem(m_hContextMenu, IDC_PROPERTIES, FALSE); return !!(m_hTreeView); @@ -110,7 +109,7 @@ ZeroMemory(&m_ImageListData, sizeof(SP_CLASSIMAGELIST_DATA)); } - DestroyMenu(m_hMenu); + DestroyMenu(m_hContextMenu); return true; } @@ -167,6 +166,18 @@ ScreenToClient(m_hTreeView, &pt) && PtInRect(&rc, pt)) { + + CNode *Node = GetSelectedNode(); + if (Node && Node->HasProperties()) + { + + } + + + + + + INT xPos = GET_X_LPARAM(lParam); INT yPos = GET_Y_LPARAM(lParam); @@ -287,6 +298,24 @@ if (Node) { return Node->CanDisable(); + } + return false; +} + +bool +CDeviceView::EnableSelectedDevice( + _In_ bool Enable, + _Out_ bool &NeedsReboot + ) +{ + CDeviceNode *Node = dynamic_cast<CDeviceNode *>(GetSelectedNode()); + if (Node) + { + if (Node->EnableDevice(Enable, NeedsReboot)) + { + Refresh(m_ViewType, true, true); + return true; + } } return false; } @@ -362,10 +391,10 @@ 0); if (cr != CR_SUCCESS) return false; - // Check for devices without a class + // Check if this is the unknown class if (IsEqualGUID(*ClassGuid, GUID_DEVCLASS_UNKNOWN)) { - // Get device info for all devices for all classes + // Get device info for all devices *hDevInfo = SetupDiGetClassDevsW(NULL, NULL, NULL, @@ -378,7 +407,6 @@ NULL, NULL, DIGCF_PRESENT); - } return (hDevInfo != INVALID_HANDLE_VALUE); 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] Thu Jun 25 18:59:23 2015 @@ -78,6 +78,12 @@ bool IsDisabled( _In_ LPTV_ITEMW TvItem ); + + bool EnableSelectedDevice( + _In_ bool Enable, + _Out_ bool &NeedsReboot + ); + bool SelDeviceIsStarted(); bool SelDeviceIsInstalled(); 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] Thu Jun 25 18:59:23 2015 @@ -507,7 +507,7 @@ { LPTOOLTIPTEXT lpttt = (LPTOOLTIPTEXT)lParam; - UINT_PTR idButton = (UINT)lpttt->hdr.idFrom; + UINT_PTR idButton = lpttt->hdr.idFrom; switch (idButton) { case IDC_PROPERTIES: @@ -568,13 +568,19 @@ case IDC_ENABLE_DRV: { - MessageBox(m_hMainWnd, L"Not yet implemented", L"Enable Driver", MB_OK); + bool NeedsReboot; + if (m_DeviceView->EnableSelectedDevice(true, NeedsReboot) && + NeedsReboot) + { + MessageBox(m_hMainWnd, L"Rebooting", L"Enable", MB_OK); + } break; } case IDC_DISABLE_DRV: { - MessageBox(m_hMainWnd, L"Not yet implemented", L"Disable Driver", MB_OK); + bool NeedsReboot; + m_DeviceView->EnableSelectedDevice(false, NeedsReboot); break; }

1 0

[cfinck] 68264: [LOCALSPL] Implement LocalEnumJobs the easy way by using the new Skiplist function LookupNodeByIndexSkiplist and calling _LocalGetJobLevelX for each job. This required changes in _L...
by cfinck＠svn.reactos.org 25 Jun '15

25 Jun '15

Author: cfinck Date: Thu Jun 25 15:27:38 2015 New Revision: 68264 URL: http://svn.reactos.org/svn/reactos?rev=68264&view=rev Log: [LOCALSPL] Implement LocalEnumJobs the easy way by using the new Skiplist function LookupNodeByIndexSkiplist and calling _LocalGetJobLevelX for each job. This required changes in _LocalGetJobLevelX, so that the strings are now copied in reverse to the end of the buffer while the structure is copied to the start. By preserving the pointers after each call, the function can be called multiple times. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c [iso-8859-1] Thu Jun 25 15:27:38 2015 @@ -359,7 +359,7 @@ static DWORD -_LocalGetJobLevel1(PLOCAL_PRINTER_HANDLE pPrinterHandle, PLOCAL_JOB pJob, PBYTE pOutput, DWORD cbBuf, PDWORD pcbNeeded) +_LocalGetJobLevel1(PLOCAL_PRINTER_HANDLE pPrinterHandle, PLOCAL_JOB pJob, PBYTE* ppStart, PBYTE* ppEnd, DWORD cbBuf, PDWORD pcbNeeded) { DWORD cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); DWORD cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); @@ -369,58 +369,57 @@ DWORD cbUserName = (wcslen(pJob->pwszUserName) + 1) * sizeof(WCHAR); DWORD dwErrorCode; JOB_INFO_1W JobInfo1 = { 0 }; - PBYTE pString; // A Status Message is optional. if (pJob->pwszStatus) cbStatus = (wcslen(pJob->pwszStatus) + 1) * sizeof(WCHAR); // Check if the supplied buffer is large enough. - *pcbNeeded = sizeof(JOB_INFO_1W) + cbDatatype + cbDocumentName + cbMachineName + cbPrinterName + cbStatus + cbUserName; + *pcbNeeded += sizeof(JOB_INFO_1W) + cbDatatype + cbDocumentName + cbMachineName + cbPrinterName + cbStatus + cbUserName; if (cbBuf < *pcbNeeded) { dwErrorCode = ERROR_INSUFFICIENT_BUFFER; goto Cleanup; } - // Put the strings right after the JOB_INFO_1W structure. - pString = pOutput + sizeof(JOB_INFO_1W); - - JobInfo1.pDatatype = (PWSTR)pString; - CopyMemory(pString, pJob->pwszDatatype, cbDatatype); - pString += cbDatatype; - - JobInfo1.pDocument = (PWSTR)pString; - CopyMemory(pString, pJob->pwszDocumentName, cbDocumentName); - pString += cbDocumentName; - - JobInfo1.pMachineName = (PWSTR)pString; - CopyMemory(pString, pJob->pwszMachineName, cbMachineName); - pString += cbMachineName; - - JobInfo1.pPrinterName = (PWSTR)pString; - CopyMemory(pString, pJob->pPrinter->pwszPrinterName, cbPrinterName); - pString += cbPrinterName; + // Put the strings at the end of the buffer. + *ppEnd -= cbDatatype; + JobInfo1.pDatatype = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszDatatype, cbDatatype); + + *ppEnd -= cbDocumentName; + JobInfo1.pDocument = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszDocumentName, cbDocumentName); + + *ppEnd -= cbMachineName; + JobInfo1.pMachineName = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszMachineName, cbMachineName); + + *ppEnd -= cbPrinterName; + JobInfo1.pPrinterName = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pPrinter->pwszPrinterName, cbPrinterName); if (cbStatus) { - JobInfo1.pStatus = (PWSTR)pString; - CopyMemory(pString, pJob->pwszStatus, cbStatus); - pString += cbStatus; - } - - JobInfo1.pUserName = (PWSTR)pString; - CopyMemory(pString, pJob->pwszUserName, cbUserName); - pString += cbUserName; - - // Fill the structure and copy it as well. + *ppEnd -= cbStatus; + JobInfo1.pStatus = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszStatus, cbStatus); + } + + *ppEnd -= cbUserName; + JobInfo1.pUserName = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszUserName, cbUserName); + + // Fill the rest of the structure. JobInfo1.JobId = pJob->dwJobID; JobInfo1.Priority = pJob->dwPriority; JobInfo1.Status = pJob->dwStatus; JobInfo1.TotalPages = pJob->dwTotalPages; CopyMemory(&JobInfo1.Submitted, &pJob->stSubmitted, sizeof(SYSTEMTIME)); - CopyMemory(pOutput, &JobInfo1, sizeof(JOB_INFO_1W)); - + + // Finally copy the structure to the output pointer. + CopyMemory(*ppStart, &JobInfo1, sizeof(JOB_INFO_1W)); + *ppStart += sizeof(JOB_INFO_1W); dwErrorCode = ERROR_SUCCESS; Cleanup: @@ -428,7 +427,7 @@ } static DWORD -_LocalGetJobLevel2(PLOCAL_PRINTER_HANDLE pPrinterHandle, PLOCAL_JOB pJob, PBYTE pOutput, DWORD cbBuf, PDWORD pcbNeeded) +_LocalGetJobLevel2(PLOCAL_PRINTER_HANDLE pPrinterHandle, PLOCAL_JOB pJob, PBYTE* ppStart, PBYTE* ppEnd, DWORD cbBuf, PDWORD pcbNeeded) { DWORD cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); DWORD cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); @@ -444,7 +443,6 @@ FILETIME ftNow; FILETIME ftSubmitted; JOB_INFO_2W JobInfo2 = { 0 }; - PBYTE pString; ULARGE_INTEGER uliNow; ULARGE_INTEGER uliSubmitted; @@ -456,65 +454,63 @@ cbStatus = (wcslen(pJob->pwszStatus) + 1) * sizeof(WCHAR); // Check if the supplied buffer is large enough. - *pcbNeeded = sizeof(JOB_INFO_2W) + cbDatatype + sizeof(DEVMODEW) + cbDocumentName + cbDriverName + cbMachineName + cbNotifyName + cbPrinterName + cbPrintProcessor + cbPrintProcessorParameters + cbStatus + cbUserName; + *pcbNeeded += sizeof(JOB_INFO_2W) + cbDatatype + sizeof(DEVMODEW) + cbDocumentName + cbDriverName + cbMachineName + cbNotifyName + cbPrinterName + cbPrintProcessor + cbPrintProcessorParameters + cbStatus + cbUserName; if (cbBuf < *pcbNeeded) { dwErrorCode = ERROR_INSUFFICIENT_BUFFER; goto Cleanup; } - // Put the strings right after the JOB_INFO_2W structure. - pString = pOutput + sizeof(JOB_INFO_2W); - - JobInfo2.pDatatype = (PWSTR)pString; - CopyMemory(pString, pJob->pwszDatatype, cbDatatype); - pString += cbDatatype; - - JobInfo2.pDevMode = (PDEVMODEW)pString; - CopyMemory(pString, &pJob->DevMode, sizeof(DEVMODEW)); - pString += sizeof(DEVMODEW); - - JobInfo2.pDocument = (PWSTR)pString; - CopyMemory(pString, pJob->pwszDocumentName, cbDocumentName); - pString += cbDocumentName; - - JobInfo2.pDriverName = (PWSTR)pString; - CopyMemory(pString, pJob->pPrinter->pwszPrinterDriver, cbDriverName); - pString += cbDriverName; - - JobInfo2.pMachineName = (PWSTR)pString; - CopyMemory(pString, pJob->pwszMachineName, cbMachineName); - pString += cbMachineName; - - JobInfo2.pNotifyName = (PWSTR)pString; - CopyMemory(pString, pJob->pwszNotifyName, cbNotifyName); - pString += cbNotifyName; - - JobInfo2.pPrinterName = (PWSTR)pString; - CopyMemory(pString, pJob->pPrinter->pwszPrinterName, cbPrinterName); - pString += cbPrinterName; - - JobInfo2.pPrintProcessor = (PWSTR)pString; - CopyMemory(pString, pJob->pPrintProcessor->pwszName, cbPrintProcessor); - pString += cbPrintProcessor; + // Put the strings at the end of the buffer. + *ppEnd -= cbDatatype; + JobInfo2.pDatatype = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszDatatype, cbDatatype); + + *ppEnd -= sizeof(DEVMODEW); + JobInfo2.pDevMode = (PDEVMODEW)*ppEnd; + CopyMemory(*ppEnd, &pJob->DevMode, sizeof(DEVMODEW)); + + *ppEnd -= cbDocumentName; + JobInfo2.pDocument = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszDocumentName, cbDocumentName); + + *ppEnd -= cbDriverName; + JobInfo2.pDriverName = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pPrinter->pwszPrinterDriver, cbDriverName); + + *ppEnd -= cbMachineName; + JobInfo2.pMachineName = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszMachineName, cbMachineName); + + *ppEnd -= cbNotifyName; + JobInfo2.pNotifyName = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszNotifyName, cbNotifyName); + + *ppEnd -= cbPrinterName; + JobInfo2.pPrinterName = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pPrinter->pwszPrinterName, cbPrinterName); + + *ppEnd -= cbPrintProcessor; + JobInfo2.pPrintProcessor = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pPrintProcessor->pwszName, cbPrintProcessor); if (cbPrintProcessorParameters) { - JobInfo2.pParameters = (PWSTR)pString; - CopyMemory(pString, pJob->pwszPrintProcessorParameters, cbPrintProcessorParameters); - pString += cbPrintProcessorParameters; + *ppEnd -= cbPrintProcessorParameters; + JobInfo2.pParameters = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszPrintProcessorParameters, cbPrintProcessorParameters); } if (cbStatus) { - JobInfo2.pStatus = (PWSTR)pString; - CopyMemory(pString, pJob->pwszStatus, cbStatus); - pString += cbStatus; - } - - JobInfo2.pUserName = (PWSTR)pString; - CopyMemory(pString, pJob->pwszUserName, cbUserName); - pString += cbUserName; + *ppEnd -= cbStatus; + JobInfo2.pStatus = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszStatus, cbStatus); + } + + *ppEnd -= cbUserName; + JobInfo2.pUserName = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszUserName, cbUserName); // Time in JOB_INFO_2W is the number of milliseconds elapsed since the job was submitted. Calculate this time. if (!SystemTimeToFileTime(&pJob->stSubmitted, &ftSubmitted)) @@ -553,7 +549,8 @@ CopyMemory(&JobInfo2.Submitted, &pJob->stSubmitted, sizeof(SYSTEMTIME)); // Finally copy the structure to the output pointer. - CopyMemory(pOutput, &JobInfo2, sizeof(JOB_INFO_2W)); + CopyMemory(*ppStart, &JobInfo2, sizeof(JOB_INFO_2W)); + *ppStart += sizeof(JOB_INFO_2W); dwErrorCode = ERROR_SUCCESS; Cleanup: @@ -561,9 +558,10 @@ } BOOL WINAPI -LocalGetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pOutput, DWORD cbBuf, LPDWORD pcbNeeded) +LocalGetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pStart, DWORD cbBuf, LPDWORD pcbNeeded) { DWORD dwErrorCode; + PBYTE pEnd = &pStart[cbBuf]; PLOCAL_HANDLE pHandle; PLOCAL_JOB pJob; PLOCAL_PRINTER_HANDLE pPrinterHandle; @@ -586,11 +584,14 @@ goto Cleanup; } + // Begin counting. + *pcbNeeded = 0; + // The function behaves differently for each level. if (Level == 1) - dwErrorCode = _LocalGetJobLevel1(pPrinterHandle, pJob, pOutput, cbBuf, pcbNeeded); + dwErrorCode = _LocalGetJobLevel1(pPrinterHandle, pJob, &pStart, &pEnd, cbBuf, pcbNeeded); else if (Level == 2) - dwErrorCode = _LocalGetJobLevel2(pPrinterHandle, pJob, pOutput, cbBuf, pcbNeeded); + dwErrorCode = _LocalGetJobLevel2(pPrinterHandle, pJob, &pStart, &pEnd, cbBuf, pcbNeeded); else dwErrorCode = ERROR_INVALID_LEVEL; @@ -871,6 +872,99 @@ if (Command) { // TODO + } + + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); +} + +BOOL WINAPI +LocalEnumJobs(HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs, DWORD Level, PBYTE pStart, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) +{ + DWORD dwErrorCode; + PBYTE pEnd = &pStart[cbBuf]; + PLOCAL_HANDLE pHandle; + PLOCAL_JOB pJob; + PSKIPLIST_NODE pFirstJobNode; + PSKIPLIST_NODE pNode; + PLOCAL_PRINTER_HANDLE pPrinterHandle; + + // Check if this is a printer handle. + pHandle = (PLOCAL_HANDLE)hPrinter; + if (pHandle->HandleType != Printer) + { + dwErrorCode = ERROR_INVALID_HANDLE; + goto Cleanup; + } + + pPrinterHandle = (PLOCAL_PRINTER_HANDLE)pHandle->pSpecificHandle; + + // Check the level. + if (Level > 2) + { + dwErrorCode = ERROR_INVALID_LEVEL; + goto Cleanup; + } + + // Begin counting. + *pcbNeeded = 0; + *pcReturned = 0; + + // Lookup the node of the first job requested by the caller in the Printer's Job List. + pFirstJobNode = LookupNodeByIndexSkiplist(&pPrinterHandle->pPrinter->JobList, FirstJob); + + // Count the required buffer size and the number of jobs. + pNode = pFirstJobNode; + + while (*pcReturned < NoJobs && pNode) + { + pJob = (PLOCAL_JOB)pNode->Element; + + // The function behaves differently for each level. + if (Level == 1) + _LocalGetJobLevel1(pPrinterHandle, pJob, NULL, NULL, 0, pcbNeeded); + else if (Level == 2) + _LocalGetJobLevel2(pPrinterHandle, pJob, NULL, NULL, 0, pcbNeeded); + + // We stop either when there are no more jobs in the list or when the caller didn't request more, whatever comes first. + *pcReturned++; + pNode = pNode->Next[0]; + } + + // Check if the supplied buffer is large enough. + if (cbBuf < *pcbNeeded) + { + dwErrorCode = ERROR_INSUFFICIENT_BUFFER; + goto Cleanup; + } + + // Begin counting again and also empty the given buffer. + *pcbNeeded = 0; + *pcReturned = 0; + ZeroMemory(pStart, cbBuf); + + // Now call the same functions again to copy the actual data for each job into the buffer. + pNode = pFirstJobNode; + + while (*pcReturned < NoJobs && pNode) + { + pJob = (PLOCAL_JOB)pNode->Element; + + // The function behaves differently for each level. + if (Level == 1) + dwErrorCode = _LocalGetJobLevel1(pPrinterHandle, pJob, &pStart, &pEnd, cbBuf, pcbNeeded); + else if (Level == 2) + dwErrorCode = _LocalGetJobLevel2(pPrinterHandle, pJob, &pStart, &pEnd, cbBuf, pcbNeeded); + + if (dwErrorCode != ERROR_SUCCESS) + goto Cleanup; + + // We stop either when there are no more jobs in the list or when the caller didn't request more, whatever comes first. + *pcReturned++; + pNode = pNode->Next[0]; } dwErrorCode = ERROR_SUCCESS; Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c [iso-8859-1] Thu Jun 25 15:27:38 2015 @@ -36,7 +36,7 @@ LocalOpenPrinter, // fpOpenPrinter LocalSetJob, // fpSetJob LocalGetJob, // fpGetJob - NULL, // fpEnumJobs + LocalEnumJobs, // fpEnumJobs NULL, // fpAddPrinter NULL, // fpDeletePrinter NULL, // fpSetPrinter Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] Thu Jun 25 15:27:38 2015 @@ -187,7 +187,8 @@ void InitializeGlobalJobList(); void InitializePrinterJobList(PLOCAL_PRINTER pPrinter); BOOL WINAPI LocalAddJob(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPDWORD pcbNeeded); -BOOL WINAPI LocalGetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, LPBYTE pOutput, DWORD cbBuf, LPDWORD pcbNeeded); +BOOL WINAPI LocalEnumJobs(HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs, DWORD Level, PBYTE pStart, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned); +BOOL WINAPI LocalGetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pStart, DWORD cbBuf, LPDWORD pcbNeeded); BOOL WINAPI LocalSetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJobInfo, DWORD Command); PLOCAL_JOB ReadJobShadowFile(PCWSTR pwszFilePath); BOOL WriteJobShadowFile(PCWSTR pwszFilePath, const PLOCAL_JOB pJob);

1 0

[tfaber] 68263: [SHELL32] - Fix shell folder reference leak in _OpenDirectory. CORE-9867
by tfaber＠svn.reactos.org 25 Jun '15

25 Jun '15

Author: tfaber Date: Thu Jun 25 14:04:02 2015 New Revision: 68263 URL: http://svn.reactos.org/svn/reactos?rev=68263&view=rev Log: [SHELL32] - Fix shell folder reference leak in _OpenDirectory. CORE-9867 Modified: trunk/reactos/dll/win32/shell32/wine/changenotify.c Modified: trunk/reactos/dll/win32/shell32/wine/changenotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/cha… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/changenotify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/changenotify.c [iso-8859-1] Thu Jun 25 14:04:02 2015 @@ -634,6 +634,7 @@ return FALSE; hr = IShellFolder_GetDisplayNameOf(psfDesktop, item->pidl, SHGDN_FORPARSING, &strFile); + IShellFolder_Release(psfDesktop); if (!SUCCEEDED(hr)) return FALSE;

1 0

[cfinck] 68262: [SKIPLIST] - Add a LookupNodeByIndexSkiplist function and a small test for it in skiplist_test. - Remove a redundant double-set in LookupElementSkiplist. Yes, we now have one lookup...
by cfinck＠svn.reactos.org 25 Jun '15

25 Jun '15

Author: cfinck Date: Thu Jun 25 13:12:01 2015 New Revision: 68262 URL: http://svn.reactos.org/svn/reactos?rev=68262&view=rev Log: [SKIPLIST] - Add a LookupNodeByIndexSkiplist function and a small test for it in skiplist_test. - Remove a redundant double-set in LookupElementSkiplist. Yes, we now have one lookup function that accepts search criteria and returns an element and another one that accepts an index and returns a SKIPLIST_NODE. It's simply because I have exactly these two cases :) You're free to implement the two missing functions or refactor this code another way. Modified: branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.c branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.h branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist_test.c Modified: branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.c [iso-8859-1] Thu Jun 25 13:12:01 2015 @@ -366,8 +366,6 @@ // * Walk through all nodes on this level that come before the node we're looking for. // * When we have reached such a node, go down a level and continue there. // * Repeat these steps till we're in level 0, right in front of the node we're looking for. - pNode = &Skiplist->Head; - for (i = Skiplist->MaximumLevel + 1; --i >= 0;) { while (pNode->Next[i] && pNode->Next[i] != pLastComparedNode && Skiplist->CompareRoutine(pNode->Next[i]->Element, Element) < 0) @@ -395,3 +393,48 @@ // Return the stored element of the found node. return pNode->Element; } + +/** + * @name LookupNodeByIndexSkiplist + * + * Looks up a node in the Skiplist at the given position. The efficiency of this operation is O(log N) on average. + * + * @param Skiplist + * Pointer to the SKIPLIST structure to operate on. + * + * @param ElementIndex + * Zero-based position of the node in the Skiplist. + * + * @return + * Returns the found node or NULL if the position is invalid. + */ +PSKIPLIST_NODE +LookupNodeByIndexSkiplist(PSKIPLIST Skiplist, DWORD ElementIndex) +{ + CHAR i; + DWORD dwIndex = 0; + PSKIPLIST_NODE pNode = &Skiplist->Head; + + // The only way the node can't be found is when the index is out of range. + if (ElementIndex >= Skiplist->NodeCount) + return NULL; + + // Do the efficient lookup in Skiplists: + // * Start from the maximum level. + // * Walk through all nodes on this level that come before the node we're looking for. + // * When we have reached such a node, go down a level and continue there. + // * Repeat these steps till we're in level 0, right in front of the node we're looking for. + for (i = Skiplist->MaximumLevel + 1; --i >= 0;) + { + // We compare with <= instead of < here, because the added distances make up a 1-based index while ElementIndex is zero-based, + // so we have to jump one node further. + while (pNode->Next[i] && dwIndex + pNode->Distance[i] <= ElementIndex) + { + dwIndex += pNode->Distance[i]; + pNode = pNode->Next[i]; + } + } + + // We are right in front of the node we're looking for now. + return pNode->Next[0]; +} Modified: branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.h [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.h [iso-8859-1] Thu Jun 25 13:12:01 2015 @@ -49,5 +49,6 @@ BOOL InsertTailElementSkiplist(PSKIPLIST Skiplist, PVOID Element); PVOID DeleteElementSkiplist(PSKIPLIST Skiplist, PVOID Element); PVOID LookupElementSkiplist(PSKIPLIST Skiplist, PVOID Element, PDWORD ElementIndex); +PSKIPLIST_NODE LookupNodeByIndexSkiplist(PSKIPLIST Skiplist, DWORD ElementIndex); #endif Modified: branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist_test.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist_test.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist_test.c [iso-8859-1] Thu Jun 25 13:12:01 2015 @@ -67,6 +67,7 @@ DWORD ElementIndex; DWORD i; SKIPLIST Skiplist; + PSKIPLIST_NODE pNode; system("mode con cols=300"); InitializeSkiplist(&Skiplist, MyAlloc, MyCompare, MyFree); @@ -83,6 +84,10 @@ for (i = 0; i < 40; i++) InsertElementSkiplist(&Skiplist, (PVOID)(rand() % 100)); + // Output the third element (with zero-based index 2). + pNode = LookupNodeByIndexSkiplist(&Skiplist, 2); + printf("Element = %lu for index 2\n", (DWORD)pNode->Element); + // Check if an element with number 44 is in the list and output its index. Element = (DWORD)LookupElementSkiplist(&Skiplist, (PVOID)44, &ElementIndex); printf("Element = %lu, ElementIndex = %lu\n\n", Element, ElementIndex);

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