Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 62644: [NTOS:CC] - Correctly set output parameter in CcRosCreateCacheSegment failure case
by tfaber＠svn.reactos.org 06 Apr '14

06 Apr '14

Author: tfaber Date: Sun Apr 6 11:02:52 2014 New Revision: 62644 URL: http://svn.reactos.org/svn/reactos?rev=62644&view=rev Log: [NTOS:CC] - Correctly set output parameter in CcRosCreateCacheSegment failure case Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=626… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sun Apr 6 11:02:52 2014 @@ -598,7 +598,7 @@ if (FileOffset >= Bcb->FileSize.u.LowPart) { - CacheSeg = NULL; + *CacheSeg = NULL; return STATUS_INVALID_PARAMETER; }

1 0

[tfaber] 62643: [NTOS:CC] - Remove unused CACHE_BITMAP feature that adds unnecessary complexity
by tfaber＠svn.reactos.org 06 Apr '14

06 Apr '14

Author: tfaber Date: Sun Apr 6 10:52:17 2014 New Revision: 62643 URL: http://svn.reactos.org/svn/reactos?rev=62643&view=rev Log: [NTOS:CC] - Remove unused CACHE_BITMAP feature that adds unnecessary complexity Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=626… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sun Apr 6 10:52:17 2014 @@ -41,14 +41,6 @@ /* GLOBALS *******************************************************************/ -/* - * If CACHE_BITMAP is defined, the cache manager uses one large memory region - * within the kernel address space and allocate/deallocate space from this block - * over a bitmap. If CACHE_BITMAP is used, the size of the mdl mapping region - * must be reduced (ntoskrnl\mm\mdl.c, MI_MDLMAPPING_REGION_SIZE). - */ -//#define CACHE_BITMAP - static LIST_ENTRY DirtySegmentListHead; static LIST_ENTRY CacheSegmentListHead; static LIST_ENTRY CacheSegmentLRUListHead; @@ -56,15 +48,6 @@ ULONG DirtyPageCount = 0; KGUARDED_MUTEX ViewLock; - -#ifdef CACHE_BITMAP -#define CI_CACHESEG_MAPPING_REGION_SIZE (128*1024*1024) - -static PVOID CiCacheSegMappingRegionBase = NULL; -static RTL_BITMAP CiCacheSegMappingRegionAllocMap; -static ULONG CiCacheSegMappingRegionHint; -static KSPIN_LOCK CiCacheSegMappingRegionLock; -#endif NPAGED_LOOKASIDE_LIST iBcbLookasideList; static NPAGED_LOOKASIDE_LIST BcbLookasideList; @@ -608,9 +591,6 @@ PLIST_ENTRY current_entry; NTSTATUS Status; KIRQL oldIrql; -#ifdef CACHE_BITMAP - ULONG StartingOffset; -#endif ASSERT(Bcb); @@ -708,28 +688,7 @@ InsertTailList(&CacheSegmentListHead, &current->CacheSegmentListEntry); InsertTailList(&CacheSegmentLRUListHead, &current->CacheSegmentLRUListEntry); KeReleaseGuardedMutex(&ViewLock); -#ifdef CACHE_BITMAP - KeAcquireSpinLock(&CiCacheSegMappingRegionLock, &oldIrql); - - StartingOffset = RtlFindClearBitsAndSet(&CiCacheSegMappingRegionAllocMap, - VACB_MAPPING_GRANULARITY / PAGE_SIZE, - CiCacheSegMappingRegionHint); - - if (StartingOffset == 0xffffffff) - { - DPRINT1("Out of CacheSeg mapping space\n"); - KeBugCheck(CACHE_MANAGER); - } - - current->BaseAddress = CiCacheSegMappingRegionBase + StartingOffset * PAGE_SIZE; - - if (CiCacheSegMappingRegionHint == StartingOffset) - { - CiCacheSegMappingRegionHint += VACB_MAPPING_GRANULARITY / PAGE_SIZE; - } - - KeReleaseSpinLock(&CiCacheSegMappingRegionLock, oldIrql); -#else + MmLockAddressSpace(MmGetKernelAddressSpace()); current->BaseAddress = NULL; Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), @@ -746,7 +705,6 @@ { KeBugCheck(CACHE_MANAGER); } -#endif /* Create a virtual mapping for this memory area */ MI_SET_USAGE(MI_USAGE_CACHE); @@ -916,8 +874,7 @@ UptoDate, CacheSeg); } -#ifdef CACHE_BITMAP -#else + static VOID CcFreeCachePage ( @@ -935,7 +892,7 @@ MmReleasePageMemoryConsumer(MC_CACHE, Page); } } -#endif + NTSTATUS CcRosInternalFreeCacheSegment ( PCACHE_SEGMENT CacheSeg) @@ -943,13 +900,6 @@ * FUNCTION: Releases a cache segment associated with a BCB */ { -#ifdef CACHE_BITMAP - ULONG i; - ULONG RegionSize; - ULONG Base; - PFN_NUMBER Page; - KIRQL oldIrql; -#endif DPRINT("Freeing cache segment 0x%p\n", CacheSeg); #if DBG if ( CacheSeg->Bcb->Trace ) @@ -957,37 +907,14 @@ DPRINT1("CacheMap 0x%p: deleting Cache Segment: 0x%p\n", CacheSeg->Bcb, CacheSeg ); } #endif -#ifdef CACHE_BITMAP - RegionSize = VACB_MAPPING_GRANULARITY / PAGE_SIZE; - - /* Unmap all the pages. */ - for (i = 0; i < RegionSize; i++) - { - MmDeleteVirtualMapping(NULL, - CacheSeg->BaseAddress + (i * PAGE_SIZE), - FALSE, - NULL, - &Page); - MmReleasePageMemoryConsumer(MC_CACHE, Page); - } - - KeAcquireSpinLock(&CiCacheSegMappingRegionLock, &oldIrql); - /* Deallocate all the pages used. */ - Base = (ULONG)(CacheSeg->BaseAddress - CiCacheSegMappingRegionBase) / PAGE_SIZE; - - RtlClearBits(&CiCacheSegMappingRegionAllocMap, Base, RegionSize); - - CiCacheSegMappingRegionHint = min(CiCacheSegMappingRegionHint, Base); - - KeReleaseSpinLock(&CiCacheSegMappingRegionLock, oldIrql); -#else + MmLockAddressSpace(MmGetKernelAddressSpace()); MmFreeMemoryArea(MmGetKernelAddressSpace(), CacheSeg->MemoryArea, CcFreeCachePage, NULL); MmUnlockAddressSpace(MmGetKernelAddressSpace()); -#endif + ExFreeToNPagedLookasideList(&CacheSegLookasideList, CacheSeg); return STATUS_SUCCESS; } @@ -1365,48 +1292,8 @@ CcInitView ( VOID) { -#ifdef CACHE_BITMAP - PMEMORY_AREA marea; - PVOID Buffer; -#endif - DPRINT("CcInitView()\n"); -#ifdef CACHE_BITMAP - CiCacheSegMappingRegionHint = 0; - CiCacheSegMappingRegionBase = NULL; - - MmLockAddressSpace(MmGetKernelAddressSpace()); - - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_CACHE_SEGMENT, - &CiCacheSegMappingRegionBase, - CI_CACHESEG_MAPPING_REGION_SIZE, - PAGE_READWRITE, - &marea, - FALSE, - 0, - PAGE_SIZE); - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - if (!NT_SUCCESS(Status)) - { - KeBugCheck(CACHE_MANAGER); - } - - Buffer = ExAllocatePoolWithTag(NonPagedPool, - CI_CACHESEG_MAPPING_REGION_SIZE / (PAGE_SIZE * 8), - TAG_CC); - if (!Buffer) - { - KeBugCheck(CACHE_MANAGER); - } - - RtlInitializeBitMap(&CiCacheSegMappingRegionAllocMap, - Buffer, - CI_CACHESEG_MAPPING_REGION_SIZE / PAGE_SIZE); - RtlClearAllBits(&CiCacheSegMappingRegionAllocMap); - - KeInitializeSpinLock(&CiCacheSegMappingRegionLock); -#endif + InitializeListHead(&CacheSegmentListHead); InitializeListHead(&DirtySegmentListHead); InitializeListHead(&CacheSegmentLRUListHead);

1 0

[tkreuzer] 62642: [ACPI] Add some DPRINTs on failure
by tkreuzer＠svn.reactos.org 06 Apr '14

06 Apr '14

Author: tkreuzer Date: Sun Apr 6 08:55:44 2014 New Revision: 62642 URL: http://svn.reactos.org/svn/reactos?rev=62642&view=rev Log: [ACPI] Add some DPRINTs on failure Modified: trunk/reactos/drivers/bus/acpi/main.c Modified: trunk/reactos/drivers/bus/acpi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/main.c?re… ============================================================================== --- trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] Sun Apr 6 08:55:44 2014 @@ -465,7 +465,10 @@ KEY_READ, &ProcessorHandle); if (!NT_SUCCESS(Status)) - goto done; + { + DPRINT1("Failed to open CentralProcessor registry key: 0x%lx\n", Status); + goto done; + } /* Query the processor identifier length */ Status = AcpiRegQueryValue(ProcessorHandle, @@ -474,7 +477,10 @@ NULL, &Length); if (!NT_SUCCESS(Status)) - goto done; + { + DPRINT1("Failed to query Identifier value: 0x%lx\n", Status); + goto done; + } /* Remember the length as fallback for level 1-3 length */ Level1Length = Level2Length = Level3Length = Length; @@ -484,6 +490,7 @@ ProcessorIdentifier = ExAllocatePoolWithTag(PagedPool, Length, 'IPCA'); if (ProcessorIdentifier == NULL) { + DPRINT1("Failed to allocate 0x%lx bytes\n", Length); Status = STATUS_INSUFFICIENT_RESOURCES; goto done; } @@ -495,7 +502,10 @@ ProcessorIdentifier, &Length); if (!NT_SUCCESS(Status)) - goto done; + { + DPRINT1("Failed to query Identifier value: 0x%lx\n", Status); + goto done; + } /* Query the processor name length */ Length = 0; @@ -505,13 +515,17 @@ NULL, &Length); if (!NT_SUCCESS(Status)) - goto done; + { + DPRINT1("Failed to query ProcessorNameString value: 0x%lx\n", Status); + goto done; + } /* Allocate a buffer large enough to be zero terminated */ Length += sizeof(UNICODE_NULL); ProcessorNameString = ExAllocatePoolWithTag(PagedPool, Length, 'IPCA'); if (ProcessorNameString == NULL) { + DPRINT1("Failed to allocate 0x%lx bytes\n", Length); Status = STATUS_INSUFFICIENT_RESOURCES; goto done; } @@ -523,7 +537,10 @@ ProcessorNameString, &Length); if (!NT_SUCCESS(Status)) - goto done; + { + DPRINT1("Failed to query ProcessorNameString value: 0x%lx\n", Status); + goto done; + } /* Query the vendor identifier length */ Length = 0; @@ -533,13 +550,17 @@ NULL, &Length); if (!NT_SUCCESS(Status) || (Length == 0)) - goto done; + { + DPRINT1("Failed to query VendorIdentifier value: 0x%lx\n", Status); + goto done; + } /* Allocate a buffer large enough to be zero terminated */ Length += sizeof(UNICODE_NULL); ProcessorVendorIdentifier = ExAllocatePoolWithTag(PagedPool, Length, 'IPCA'); if (ProcessorVendorIdentifier == NULL) { + DPRINT1("Failed to allocate 0x%lx bytes\n", Length); Status = STATUS_INSUFFICIENT_RESOURCES; goto done; } @@ -551,7 +572,10 @@ ProcessorVendorIdentifier, &Length); if (!NT_SUCCESS(Status)) - goto done; + { + DPRINT1("Failed to query VendorIdentifier value: 0x%lx\n", Status); + goto done; + } /* Change spaces to underscores */ for (i = 0; i < wcslen(ProcessorIdentifier); i++)

1 0

[tfaber] 62641: [NPFS] - Fix some uninitialized and over-initialized variables and some DPRINTs. CID 1102515
by tfaber＠svn.reactos.org 06 Apr '14

06 Apr '14

Author: tfaber Date: Sun Apr 6 07:54:57 2014 New Revision: 62641 URL: http://svn.reactos.org/svn/reactos?rev=62641&view=rev Log: [NPFS] - Fix some uninitialized and over-initialized variables and some DPRINTs. CID 1102515 Modified: trunk/reactos/drivers/filesystems/npfs/create.c Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] Sun Apr 6 07:54:57 2014 @@ -96,7 +96,7 @@ IoStatus.Information = 0; } - TRACE("Leaving, IoStatus = %lx\n", IoStatus); + TRACE("Leaving, IoStatus.Status = %lx\n", IoStatus.Status); return IoStatus; } @@ -122,7 +122,6 @@ PNP_CCB Ccb = NULL; TRACE("Entered\n"); - IoStatus.Status = STATUS_SUCCESS; IoStatus.Information = 0; Privileges = NULL; @@ -172,7 +171,7 @@ ((GrantedAccess & FILE_WRITE_DATA) && (NamedPipeConfiguration == FILE_PIPE_OUTBOUND))) { IoStatus.Status = STATUS_ACCESS_DENIED; - TRACE("Leaving, IoStatus = %lx\n", IoStatus); + TRACE("Leaving, IoStatus.Status = %lx\n", IoStatus.Status); return IoStatus; } @@ -191,7 +190,7 @@ if (NextEntry == ListHead) { IoStatus.Status = STATUS_PIPE_NOT_AVAILABLE; - TRACE("Leaving, IoStatus = %lx\n", IoStatus); + TRACE("Leaving, IoStatus.Status = %lx\n", IoStatus.Status); return IoStatus; } @@ -202,7 +201,7 @@ if (!NT_SUCCESS(IoStatus.Status)) { NpUninitializeSecurity(Ccb); - TRACE("Leaving, IoStatus = %lx\n", IoStatus); + TRACE("Leaving, IoStatus.Status = %lx\n", IoStatus.Status); return IoStatus; } @@ -211,7 +210,7 @@ IoStatus.Information = FILE_OPENED; IoStatus.Status = STATUS_SUCCESS; - TRACE("Leaving, IoStatus = %lx\n", IoStatus); + TRACE("Leaving, IoStatus.Status = %lx\n", IoStatus.Status); return IoStatus; } @@ -373,7 +372,6 @@ ACCESS_MASK DesiredAccess; LIST_ENTRY DeferredList; UNICODE_STRING Prefix; - NTSTATUS Status; TRACE("Entered\n"); InitializeListHead(&DeferredList); @@ -384,7 +382,6 @@ DesiredAccess = IoStack->Parameters.CreatePipe.SecurityContext->DesiredAccess; IoStatus.Information = 0; - IoStatus.Status = STATUS_SUCCESS; FsRtlEnterFileSystem(); ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); @@ -428,8 +425,8 @@ goto Quickie; } - Status = NpTranslateAlias(&FileName); - if (!NT_SUCCESS(Status)) goto Quickie; + IoStatus.Status = NpTranslateAlias(&FileName); + if (!NT_SUCCESS(IoStatus.Status)) goto Quickie; if (RelatedFileObject) { @@ -543,6 +540,8 @@ SubjectSecurityContext = &AccessState->SubjectSecurityContext; SeLockSubjectContext(SubjectSecurityContext); + IoStatus.Information = 0; + AccessGranted = SeAccessCheck(Fcb->SecurityDescriptor, SubjectSecurityContext, TRUE, @@ -581,21 +580,21 @@ SeUnlockSubjectContext(SubjectSecurityContext); if (!AccessGranted) { - TRACE("Leaving, IoStatus = %lx\n", IoStatus); + TRACE("Leaving, IoStatus.Status = %lx\n", IoStatus.Status); return IoStatus; } if (Fcb->CurrentInstances >= Fcb->MaximumInstances) { IoStatus.Status = STATUS_INSTANCE_NOT_AVAILABLE; - TRACE("Leaving, IoStatus = %lx\n", IoStatus); + TRACE("Leaving, IoStatus.Status = %lx\n", IoStatus.Status); return IoStatus; } if (Disposition == FILE_CREATE) { IoStatus.Status = STATUS_ACCESS_DENIED; - TRACE("Leaving, IoStatus = %lx\n", IoStatus); + TRACE("Leaving, IoStatus.Status = %lx\n", IoStatus.Status); return IoStatus; } @@ -616,7 +615,7 @@ if (CheckShareAccess != ShareAccess) { IoStatus.Status = STATUS_ACCESS_DENIED; - TRACE("Leaving, IoStatus = %lx\n", IoStatus); + TRACE("Leaving, IoStatus.Status = %lx\n", IoStatus.Status); return IoStatus; } @@ -638,7 +637,7 @@ { --Ccb->Fcb->CurrentInstances; NpDeleteCcb(Ccb, List); - TRACE("Leaving, IoStatus = %lx\n", IoStatus); + TRACE("Leaving, IoStatus.Status = %lx\n", IoStatus.Status); return IoStatus; } @@ -647,8 +646,8 @@ NpCheckForNotify(Fcb->ParentDcb, 0, List); IoStatus.Status = STATUS_SUCCESS; - IoStatus.Information = 1; - TRACE("Leaving, IoStatus = %lx\n", IoStatus); + IoStatus.Information = FILE_OPENED; + TRACE("Leaving, IoStatus.Status = %lx\n", IoStatus.Status); return IoStatus; } @@ -664,7 +663,7 @@ IN PNAMED_PIPE_CREATE_PARAMETERS Parameters, IN PEPROCESS Process, IN PLIST_ENTRY List, - IN PIO_STATUS_BLOCK IoStatus) + OUT PIO_STATUS_BLOCK IoStatus) { NTSTATUS Status; USHORT NamedPipeConfiguration; @@ -817,7 +816,6 @@ FileName = FileObject->FileName; - IoStatus.Status = STATUS_SUCCESS; IoStatus.Information = 0; FsRtlEnterFileSystem();

1 0

[hbelusca] 62640: [NTDLL_APITEST] Add/refine RtlDoesFileExists* and RtlDosSearchPath_U APIs tests. CORE-6373 #comment Tests for RtlDoesFileExists* and RtlDosSearchPath_U APIs added in revision 62640.
by hbelusca＠svn.reactos.org 05 Apr '14

05 Apr '14

Author: hbelusca Date: Sat Apr 5 23:58:54 2014 New Revision: 62640 URL: http://svn.reactos.org/svn/reactos?rev=62640&view=rev Log: [NTDLL_APITEST] Add/refine RtlDoesFileExists* and RtlDosSearchPath_U APIs tests. CORE-6373 #comment Tests for RtlDoesFileExists* and RtlDosSearchPath_U APIs added in revision 62640. Modified: trunk/rostests/apitests/ntdll/RtlDoesFileExists.c trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c Modified: trunk/rostests/apitests/ntdll/RtlDoesFileExists.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlDoesFil… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlDoesFileExists.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlDoesFileExists.c [iso-8859-1] Sat Apr 5 23:58:54 2014 @@ -139,11 +139,27 @@ { L"C:\\/\\%ls", TRUE }, { L"C:\\%ls\\", TRUE }, { L"C:\\%ls\\ThisFolderExists", TRUE }, + { L"C:\\%ls\\ThisFolderExists ", TRUE }, + { L"C:\\%ls\\ThisFolderExists ", TRUE }, + { L"C:\\%ls\\ThisFolderExists ", TRUE }, + { L"C:\\%ls\\ThisFolderExists:", FALSE }, + { L"C:\\%ls\\ThisFolderExists\t", FALSE }, + { L"C:\\%ls\\ThisFolderExists\n", FALSE }, + { L"C:\\%ls\\ThisFolderExists\r", FALSE }, + { L" C:\\%ls\\ThisFolderExists", FALSE }, + { L"C:\\%ls\\ ThisFolderExists", FALSE }, + { L"C:\\%ls \\ThisFolderExists", FALSE }, { L"C:\\%ls\\ThisDoesntExist", FALSE }, { L"C:\\\\%ls\\\\ThisFolderExists", TRUE }, { L"C:\\%ls\\ThisFolderExists\\ThisFileExists", TRUE }, { L"c:\\%ls\\thisfolderexists\\thisfileexists", TRUE }, { L"C:\\%ls\\THISFOLDEREXISTS\\THISFILEEXISTS", TRUE }, + { L"C:\\%ls\\ThisFolderExists\\SomeProgram.exe",TRUE }, + { L"C:\\%ls\\ThisFolderExists\\SomeProgram", FALSE }, + { L"C:\\%ls\\ThisFolderExists\\With", FALSE }, + { L"C:\\%ls\\ThisFolderExists\\With Space", TRUE }, + { L"C:\\%ls\\ThisFolderExists\\Without", TRUE }, + { L"C:\\%ls\\ThisFolderExists\\Without Space", FALSE }, { L"C:\\%ls abc", FALSE }, { L"\"C:\\%ls\" abc", FALSE }, { L"\"C:\\\"", FALSE }, @@ -251,6 +267,21 @@ CloseHandle(Handle); } + swprintf(FileName, L"C:\\%ls\\ThisFolderExists\\SomeProgram.exe", CustomPath); + Handle = CreateFileW(FileName, 0, 0, NULL, CREATE_NEW, 0, NULL); + ok(Handle != INVALID_HANDLE_VALUE, "CreateFile failed, results might not be accurate\n"); + if (Handle != INVALID_HANDLE_VALUE) CloseHandle(Handle); + + swprintf(FileName, L"C:\\%ls\\ThisFolderExists\\With Space", CustomPath); + Handle = CreateFileW(FileName, 0, 0, NULL, CREATE_NEW, 0, NULL); + ok(Handle != INVALID_HANDLE_VALUE, "CreateFile failed, results might not be accurate\n"); + if (Handle != INVALID_HANDLE_VALUE) CloseHandle(Handle); + + swprintf(FileName, L"C:\\%ls\\ThisFolderExists\\Without", CustomPath); + Handle = CreateFileW(FileName, 0, 0, NULL, CREATE_NEW, 0, NULL); + ok(Handle != INVALID_HANDLE_VALUE, "CreateFile failed, results might not be accurate\n"); + if (Handle != INVALID_HANDLE_VALUE) CloseHandle(Handle); + for (i = 0; i < sizeof(Tests) / sizeof(Tests[0]); i++) { swprintf(FileName, Tests[i].FileName, CustomPath); @@ -301,13 +332,23 @@ } } + swprintf(FileName, L"C:\\%ls\\ThisFolderExists\\Without", CustomPath); + Success = DeleteFileW(FileName); + ok(Success, "DeleteFile failed (%lu), test might leave stale file\n", GetLastError()); + swprintf(FileName, L"C:\\%ls\\ThisFolderExists\\With Space", CustomPath); + Success = DeleteFileW(FileName); + ok(Success, "DeleteFile failed (%lu), test might leave stale file\n", GetLastError()); + swprintf(FileName, L"C:\\%ls\\ThisFolderExists\\SomeProgram.exe", CustomPath); + Success = DeleteFileW(FileName); + ok(Success, "DeleteFile failed (%lu), test might leave stale file\n", GetLastError()); + swprintf(FileName, L"C:\\%ls\\ThisFolderExists\\ThisFileExists", CustomPath); Success = DeleteFileW(FileName); - ok(Success, "DeleteFile failed, test might leave stale file\n"); + ok(Success, "DeleteFile failed (%lu), test might leave stale file\n", GetLastError()); swprintf(FileName, L"C:\\%ls\\ThisFolderExists", CustomPath); Success = RemoveDirectoryW(FileName); - ok(Success, "RemoveDirectory failed, test might leave stale directory\n"); + ok(Success, "RemoveDirectory failed (%lu), test might leave stale directory\n", GetLastError()); swprintf(FileName, L"C:\\%ls", CustomPath); Success = RemoveDirectoryW(FileName); - ok(Success, "RemoveDirectory failed, test might leave stale directory\n"); + ok(Success, "RemoveDirectory failed (%lu), test might leave stale directory\n", GetLastError()); } Modified: trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlDosSear… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c [iso-8859-1] Sat Apr 5 23:58:54 2014 @@ -24,6 +24,8 @@ ); */ +#define PrintablePointer(p) ((p) == InvalidPointer ? NULL : (p)) + static BOOLEAN CheckStringBuffer( @@ -92,6 +94,218 @@ return TRUE; } +static +VOID +RunTestCases( + PCWSTR CustomPath) +{ + struct + { + PCWSTR SearchPath; + PCWSTR FileName; + PCWSTR Extension; + PCWSTR ResultPath; + PCWSTR ResultFileName; + } Tests[] = + { + { L"", L"", NULL, NULL, NULL }, + { L"C:\\%ls\\Folder1", L"File1", NULL, L"C:\\%ls\\Folder1\\", L"File1" }, + /* No path: current directory */ + { L"", L"File1", NULL, L"C:\\%ls\\CurrentDirectory\\", L"File1" }, + /* Full path as FileName */ + { L"", L"C:\\", NULL, L"C:\\", NULL }, + { L"", L"C:\\%ls\\Folder1", NULL, L"C:\\%ls\\", L"Folder1" }, + /* No FileName */ + { L"C:\\", L"", NULL, L"C:\\", NULL }, + { L"C:\\%ls\\Folder1", L"", NULL, L"C:\\%ls\\Folder1\\", NULL }, + /* Full path as FileName */ + { L"", L"C:\\%ls\\Folder1\\SomeProgram.exe", NULL, L"C:\\%ls\\Folder1\\", L"SomeProgram.exe" }, + { L"", L"C:\\%ls\\Folder1\\SomeProgram.exe", L".exe", L"C:\\%ls\\Folder1\\", L"SomeProgram.exe" }, + { L"", L"C:\\%ls\\Folder1\\SomeProgram", NULL, NULL, NULL }, + // 10 + { L"", L"C:\\%ls\\Folder1\\SomeProgram", L".exe", NULL, NULL }, + /* Both SearchPath and FileName */ + { L"C:\\%ls\\Folder1\\", L"SomeProgram.exe", NULL, L"C:\\%ls\\Folder1\\", L"SomeProgram.exe" }, + { L"C:\\%ls\\Folder1\\", L"SomeProgram.exe", L".exe", L"C:\\%ls\\Folder1\\", L"SomeProgram.exe" }, + { L"C:\\%ls\\Folder1\\", L"SomeProgram", NULL, NULL, NULL }, + { L"C:\\%ls\\Folder1\\", L"SomeProgram", L".exe", L"C:\\%ls\\Folder1\\", L"SomeProgram.exe" }, + { L"C:\\%ls\\Folder1", L"SomeProgram.exe", NULL, L"C:\\%ls\\Folder1\\", L"SomeProgram.exe" }, + { L"C:\\%ls\\Folder1", L"SomeProgram.exe", L".exe", L"C:\\%ls\\Folder1\\", L"SomeProgram.exe" }, + { L"C:\\%ls\\Folder1", L"SomeProgram", NULL, NULL, NULL }, + { L"C:\\%ls\\Folder1", L"SomeProgram", L".exe", L"C:\\%ls\\Folder1\\", L"SomeProgram.exe" }, + /* Full path to file in SearchPath doesn't work */ + { L"C:\\%ls\\Folder1\\SomeProgram.exe", L"", NULL, NULL, NULL }, + // 20 + { L"C:\\%ls\\Folder1\\SomeProgram.exe", L"", L".exe", NULL, NULL }, + { L"C:\\%ls\\Folder1\\SomeProgram", L"", NULL, NULL, NULL }, + { L"C:\\%ls\\Folder1\\SomeProgram", L"", L".exe", NULL, NULL }, + /* */ + { L"C:\\%ls\\Folder1", L"File1", NULL, L"C:\\%ls\\Folder1\\", L"File1" }, + { L"C:\\%ls\\CurrentDirectory", L"File1", NULL, L"C:\\%ls\\CurrentDirectory\\", L"File1" }, + { L"C:\\%ls\\Folder1 ", L"File1", NULL, NULL, NULL }, + { L"C:\\%ls\\CurrentDirectory ",L"File1", NULL, NULL, NULL }, + { L" C:\\%ls\\Folder1", L"File1", NULL, NULL, NULL }, + { L" C:\\%ls\\CurrentDirectory",L"File1", NULL, NULL, NULL }, + { L" C:\\%ls\\Folder1 ", L"File1", NULL, NULL, NULL }, + // 30 + { L" C:\\%ls\\CurrentDirectory ",L"File1", NULL, NULL, NULL }, + /* Multiple search paths */ + { L"C:\\%ls\\Folder1;C:\\%ls\\CurrentDirectory", + L"File1", NULL, L"C:\\%ls\\Folder1\\", L"File1" }, + { L"C:\\%ls\\CurrentDirectory;C:\\%ls\\Folder1", + L"File1", NULL, L"C:\\%ls\\CurrentDirectory\\", L"File1" }, + { L"C:\\%ls\\CurrentDirectory ; C:\\%ls\\Folder1", + L"File1", NULL, NULL, NULL }, + { L"C:\\%ls\\CurrentDirectory ;C:\\%ls\\Folder1", + L"File1", NULL, L"C:\\%ls\\Folder1\\", L"File1" }, + { L"C:\\%ls\\CurrentDirectory; C:\\%ls\\Folder1", + L"File1", NULL, L"C:\\%ls\\CurrentDirectory\\", L"File1" }, + { L";C:\\%ls\\Folder1", L"File1", NULL, L"C:\\%ls\\CurrentDirectory\\", L"File1" }, + { L";C:\\%ls\\Folder1;", L"File1", NULL, L"C:\\%ls\\CurrentDirectory\\", L"File1" }, + { L";C:\\%ls\\Folder1;", L"File1", NULL, L"C:\\%ls\\CurrentDirectory\\", L"File1" }, + { L"C:\\%ls\\Folder1", L"OnlyInCurr", NULL, NULL, NULL }, + // 40 + { L"", L"OnlyInCurr", NULL, L"C:\\%ls\\CurrentDirectory\\", L"OnlyInCurr" }, + { L"", L"OnlyInCurr ", NULL, L"C:\\%ls\\CurrentDirectory\\", L"OnlyInCurr" }, + { L"", L" OnlyInCurr", NULL, NULL, NULL }, + { L" ", L"OnlyInCurr", NULL, NULL, NULL }, + { L";", L"OnlyInCurr", NULL, L"C:\\%ls\\CurrentDirectory\\", L"OnlyInCurr" }, + { L"; ", L"OnlyInCurr", NULL, L"C:\\%ls\\CurrentDirectory\\", L"OnlyInCurr" }, + { L" ;", L"OnlyInCurr", NULL, NULL, NULL }, + { L" ; ", L"OnlyInCurr", NULL, NULL, NULL }, + { L";C:\\%ls\\Folder1", L"OnlyInCurr", NULL, L"C:\\%ls\\CurrentDirectory\\", L"OnlyInCurr" }, + { L"C:\\%ls\\Folder1;", L"OnlyInCurr", NULL, NULL, NULL }, + // 50 + { L"C:\\%ls\\Folder1;;", L"OnlyInCurr", NULL, L"C:\\%ls\\CurrentDirectory\\", L"OnlyInCurr" }, + { L";C:\\%ls\\Folder1;", L"OnlyInCurr", NULL, L"C:\\%ls\\CurrentDirectory\\", L"OnlyInCurr" }, + { L"C:\\%ls\\Folder1;C:\\%ls\\Folder2", + L"OnlyInCurr", NULL, NULL, NULL }, + { L";C:\\%ls\\Folder1;C:\\%ls\\Folder2", + L"OnlyInCurr", NULL, L"C:\\%ls\\CurrentDirectory\\", L"OnlyInCurr" }, + { L"C:\\%ls\\Folder1;;C:\\%ls\\Folder2", + L"OnlyInCurr", NULL, L"C:\\%ls\\CurrentDirectory\\", L"OnlyInCurr" }, + { L"C:\\%ls\\Folder1;C:\\%ls\\Folder2;", + L"OnlyInCurr", NULL, NULL, NULL }, + { L"C:\\%ls\\Folder1;C:\\%ls\\Folder2;;", + L"OnlyInCurr", NULL, L"C:\\%ls\\CurrentDirectory\\", L"OnlyInCurr" }, + /* Spaces in FileName! */ + { L"", L"C:\\%ls\\Folder1\\SomeProgram With Spaces", + L".exe", NULL, NULL }, + { L"", L"C:\\%ls\\Folder1\\SomeProgram With Spaces.exe", + L".exe", NULL, NULL }, + { L"", L"C:\\%ls\\Folder1\\Program", L".exe", NULL, NULL }, + // 60 + { L"", L"C:\\%ls\\Folder1\\Program.exe", L".exe", L"C:\\%ls\\Folder1\\", L"Program.exe" }, + { L"", L"C:\\%ls\\Folder1\\Program With", L".exe", NULL, NULL }, + { L"", L"C:\\%ls\\Folder1\\Program With.exe", L".exe", L"C:\\%ls\\Folder1\\", L"Program With.exe" }, + { L"", L"C:\\%ls\\Folder1\\Program With Spaces",L".exe", NULL, NULL }, + { L"", L"C:\\%ls\\Folder1\\Program With Spaces.exe", + L".exe", L"C:\\%ls\\Folder1\\", L"Program With Spaces.exe" }, + /* Same tests with path in SearchPath - now extensions are appended */ + { L"C:\\%ls\\Folder1", L"SomeProgram With Spaces", + L".exe", NULL, NULL }, + { L"C:\\%ls\\Folder1", L"SomeProgram With Spaces.exe", + L".exe", NULL, NULL }, + { L"C:\\%ls\\Folder1", L"Program", L".exe", L"C:\\%ls\\Folder1\\", L"Program.exe" }, + { L"C:\\%ls\\Folder1", L"Program.exe", L".exe", L"C:\\%ls\\Folder1\\", L"Program.exe" }, + { L"C:\\%ls\\Folder1", L"Program With", L".exe", L"C:\\%ls\\Folder1\\", L"Program With.exe" }, + // 70 + { L"C:\\%ls\\Folder1", L"Program With.exe", L".exe", L"C:\\%ls\\Folder1\\", L"Program With.exe" }, + { L"C:\\%ls\\Folder1", L"Program With Spaces", L".exe", L"C:\\%ls\\Folder1\\", L"Program With Spaces.exe" }, + { L"C:\\%ls\\Folder1", L"Program With Spaces.exe", + L".exe", L"C:\\%ls\\Folder1\\", L"Program With Spaces.exe" }, + }; + + ULONG i; + ULONG Length; + PWSTR PartName; + WCHAR SearchPath[MAX_PATH]; + WCHAR FileName[MAX_PATH]; + WCHAR ResultPath[MAX_PATH]; + WCHAR Buffer[MAX_PATH]; + BOOLEAN Okay; + + for (i = 0; i < sizeof(Tests) / sizeof(Tests[0]); i++) + { + swprintf(SearchPath, Tests[i].SearchPath, CustomPath, CustomPath, CustomPath, CustomPath); + swprintf(FileName, Tests[i].FileName, CustomPath, CustomPath, CustomPath, CustomPath); + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + PartName = InvalidPointer; + + StartSeh() + Length = RtlDosSearchPath_U(SearchPath, + FileName, + Tests[i].Extension, + sizeof(Buffer), + Buffer, + &PartName); + EndSeh(STATUS_SUCCESS); + + if (Tests[i].ResultPath) + { + swprintf(ResultPath, Tests[i].ResultPath, CustomPath, CustomPath, CustomPath, CustomPath); + if (Tests[i].ResultFileName) + { + ok(PartName == &Buffer[wcslen(ResultPath)], + "PartName = %p (%ls), expected %p\n", + PartName, PrintablePointer(PartName), &Buffer[wcslen(ResultPath)]); + wcscat(ResultPath, Tests[i].ResultFileName); + } + else + { + ok(PartName == NULL, + "PartName = %p (%ls), expected NULL\n", + PartName, PrintablePointer(PartName)); + } + Okay = CheckStringBuffer(Buffer, Length, sizeof(Buffer), ResultPath); + ok(Okay == TRUE, "CheckStringBuffer failed. Got '%ls', expected '%ls'\n", Buffer, ResultPath); + } + else + { + Okay = CheckBuffer(Buffer, sizeof(Buffer), 0x55); + ok(Okay == TRUE, "CheckBuffer failed\n"); + ok(Length == 0, "Length = %lu\n", Length); + ok(PartName == InvalidPointer, + "PartName = %p (%ls), expected %p\n", + PartName, PrintablePointer(PartName), InvalidPointer); + } + } +} + +#define MAKE_DIRECTORY(path) \ +do { \ + swprintf(FileName, path, CustomPath); \ + Success = CreateDirectoryW(FileName, NULL); \ + ok(Success, "CreateDirectory failed, results might not be accurate\n"); \ +} while (0) + +#define MAKE_FILE(path) \ +do { \ + swprintf(FileName, path, CustomPath); \ + Handle = CreateFileW(FileName, 0, 0, NULL, CREATE_NEW, 0, NULL); \ + ok(Handle != INVALID_HANDLE_VALUE, \ + "CreateFile failed, results might not be accurate\n"); \ + if (Handle != INVALID_HANDLE_VALUE) CloseHandle(Handle); \ +} while (0) + +#define DELETE_DIRECTORY(path) \ +do { \ + swprintf(FileName, path, CustomPath); \ + Success = RemoveDirectoryW(FileName); \ + ok(Success, \ + "RemoveDirectory failed (%lu), test might leave stale directory\n", \ + GetLastError()); \ +} while (0) + +#define DELETE_FILE(path) \ +do { \ + swprintf(FileName, path, CustomPath); \ + Success = DeleteFileW(FileName); \ + ok(Success, \ + "DeleteFile failed (%lu), test might leave stale file\n", \ + GetLastError()); \ +} while (0) + START_TEST(RtlDosSearchPath_U) { ULONG Length = 0; @@ -112,22 +326,30 @@ } Success = CreateDirectoryW(FileName, NULL); ok(Success, "CreateDirectory failed, results might not be accurate\n"); - swprintf(FileName, L"C:\\%ls\\ThisFolderExists", CustomPath); - Success = CreateDirectoryW(FileName, NULL); - ok(Success, "CreateDirectory failed, results might not be accurate\n"); - swprintf(FileName, L"C:\\%ls\\ThisFolderExists\\ThisFileExists", CustomPath); - Handle = CreateFileW(FileName, 0, 0, NULL, CREATE_NEW, 0, NULL); - ok(Handle != INVALID_HANDLE_VALUE, "CreateFile failed, results might not be accurate\n"); - if (Handle != INVALID_HANDLE_VALUE) - CloseHandle(Handle); + + MAKE_DIRECTORY(L"C:\\%ls\\Folder1"); + MAKE_DIRECTORY(L"C:\\%ls\\Folder2"); + MAKE_DIRECTORY(L"C:\\%ls\\CurrentDirectory"); + Success = SetCurrentDirectoryW(FileName); + ok(Success, "SetCurrentDirectory failed\n"); + MAKE_FILE(L"C:\\%ls\\Folder1\\File1"); + MAKE_FILE(L"C:\\%ls\\Folder1\\SomeProgram.exe"); + MAKE_FILE(L"C:\\%ls\\Folder1\\SomeProgram2.exe"); + MAKE_FILE(L"C:\\%ls\\Folder1\\SomeProgram2.exe.exe"); + MAKE_FILE(L"C:\\%ls\\Folder1\\SomeProgram3.exe.exe"); + MAKE_FILE(L"C:\\%ls\\Folder1\\Program.exe"); + MAKE_FILE(L"C:\\%ls\\Folder1\\Program With.exe"); + MAKE_FILE(L"C:\\%ls\\Folder1\\Program With Spaces.exe"); + MAKE_FILE(L"C:\\%ls\\CurrentDirectory\\File1"); + MAKE_FILE(L"C:\\%ls\\CurrentDirectory\\OnlyInCurr"); /* NULL parameters */ - StartSeh() RtlDosSearchPath_U(NULL, NULL, NULL, 0, NULL, NULL); EndSeh(STATUS_ACCESS_VIOLATION); - StartSeh() Length = RtlDosSearchPath_U(NULL, L"", NULL, 0, NULL, NULL); EndSeh(STATUS_ACCESS_VIOLATION); - StartSeh() Length = RtlDosSearchPath_U(NULL, L"", NULL, 0, Buffer, NULL); EndSeh(STATUS_ACCESS_VIOLATION); - StartSeh() Length = RtlDosSearchPath_U(NULL, L"", NULL, 1, Buffer, NULL); EndSeh(STATUS_ACCESS_VIOLATION); - StartSeh() Length = RtlDosSearchPath_U(NULL, L"", NULL, 2, Buffer, NULL); EndSeh(STATUS_ACCESS_VIOLATION); - StartSeh() Length = RtlDosSearchPath_U(L"", NULL, NULL, 0, NULL, NULL); EndSeh(STATUS_ACCESS_VIOLATION); + StartSeh() RtlDosSearchPath_U(NULL, NULL, NULL, 0, NULL , NULL); EndSeh(STATUS_ACCESS_VIOLATION); + StartSeh() RtlDosSearchPath_U(NULL, L"" , NULL, 0, NULL , NULL); EndSeh(STATUS_ACCESS_VIOLATION); + StartSeh() RtlDosSearchPath_U(NULL, L"" , NULL, 0, Buffer, NULL); EndSeh(STATUS_ACCESS_VIOLATION); + StartSeh() RtlDosSearchPath_U(NULL, L"" , NULL, 1, Buffer, NULL); EndSeh(STATUS_ACCESS_VIOLATION); + StartSeh() RtlDosSearchPath_U(NULL, L"" , NULL, 2, Buffer, NULL); EndSeh(STATUS_ACCESS_VIOLATION); + StartSeh() RtlDosSearchPath_U(L"" , NULL, NULL, 0, NULL , NULL); EndSeh(STATUS_ACCESS_VIOLATION); /* Empty strings - first one that doesn't crash */ StartSeh() @@ -161,52 +383,26 @@ Okay = CheckBuffer(Buffer, sizeof(Buffer), 0x55); ok(Okay, "CheckBuffer failed\n"); - /* Empty path string searches in current directory */ - swprintf(FileName, L"C:\\%ls\\ThisFolderExists", CustomPath); - Success = SetCurrentDirectoryW(FileName); - ok(Success, "SetCurrentDirectory failed\n"); - PartName = InvalidPointer; - RtlFillMemory(Buffer, sizeof(Buffer), 0x55); - StartSeh() - Length = RtlDosSearchPath_U(L"", L"ThisFileExists", NULL, sizeof(Buffer), Buffer, &PartName); - ok(Length == wcslen(FileName) * sizeof(WCHAR) + sizeof(L"\\ThisFileExists") - sizeof(UNICODE_NULL), "Length %lu\n", Length); - EndSeh(STATUS_SUCCESS); - ok(PartName == &Buffer[wcslen(FileName) + 1], "PartName = %p\n", PartName); - wcscat(FileName, L"\\ThisFileExists"); - Okay = CheckStringBuffer(Buffer, Length, sizeof(Buffer), FileName); - ok(Okay, "CheckStringBuffer failed\n"); - - /* Absolute path in FileName is also okay */ - PartName = InvalidPointer; - RtlFillMemory(Buffer, sizeof(Buffer), 0x55); - StartSeh() - Length = RtlDosSearchPath_U(L"", L"C:\\", NULL, sizeof(Buffer), Buffer, &PartName); - ok(Length == sizeof(L"C:\\") - sizeof(UNICODE_NULL), "Length %lu\n", Length); - EndSeh(STATUS_SUCCESS); - ok(PartName == NULL, "PartName = %p\n", PartName); - Okay = CheckStringBuffer(Buffer, Length, sizeof(Buffer), L"C:\\"); - ok(Okay, "CheckStringBuffer failed\n"); - - /* Empty FileName also works */ - PartName = InvalidPointer; - RtlFillMemory(Buffer, sizeof(Buffer), 0x55); - StartSeh() - Length = RtlDosSearchPath_U(L"C:\\", L"", NULL, sizeof(Buffer), Buffer, &PartName); - ok(Length == sizeof(L"C:\\") - sizeof(UNICODE_NULL), "Length %lu\n", Length); - EndSeh(STATUS_SUCCESS); - ok(PartName == NULL, "PartName = %p\n", PartName); - Okay = CheckStringBuffer(Buffer, Length, sizeof(Buffer), L"C:\\"); - ok(Okay, "CheckStringBuffer failed\n"); - - /* Clean up test folder */ + /* Now test the actual functionality */ + RunTestCases(CustomPath); + + /* + * Clean up test folder - We can't delete it + * if our current directory is inside. + */ SetCurrentDirectoryW(L"C:\\"); - swprintf(FileName, L"C:\\%ls\\ThisFolderExists\\ThisFileExists", CustomPath); - Success = DeleteFileW(FileName); - ok(Success, "DeleteFile failed, test might leave stale file\n"); - swprintf(FileName, L"C:\\%ls\\ThisFolderExists", CustomPath); - Success = RemoveDirectoryW(FileName); - ok(Success, "RemoveDirectory failed (%lu), test might leave stale directory\n", GetLastError()); - swprintf(FileName, L"C:\\%ls", CustomPath); - Success = RemoveDirectoryW(FileName); - ok(Success, "RemoveDirectory failed (%lu), test might leave stale directory\n", GetLastError()); + DELETE_FILE(L"C:\\%ls\\CurrentDirectory\\OnlyInCurr"); + DELETE_FILE(L"C:\\%ls\\CurrentDirectory\\File1"); + DELETE_FILE(L"C:\\%ls\\Folder1\\Program With Spaces.exe"); + DELETE_FILE(L"C:\\%ls\\Folder1\\Program With.exe"); + DELETE_FILE(L"C:\\%ls\\Folder1\\Program.exe"); + DELETE_FILE(L"C:\\%ls\\Folder1\\SomeProgram3.exe.exe"); + DELETE_FILE(L"C:\\%ls\\Folder1\\SomeProgram2.exe.exe"); + DELETE_FILE(L"C:\\%ls\\Folder1\\SomeProgram2.exe"); + DELETE_FILE(L"C:\\%ls\\Folder1\\SomeProgram.exe"); + DELETE_FILE(L"C:\\%ls\\Folder1\\File1"); + DELETE_DIRECTORY(L"C:\\%ls\\CurrentDirectory"); + DELETE_DIRECTORY(L"C:\\%ls\\Folder2"); + DELETE_DIRECTORY(L"C:\\%ls\\Folder1"); + DELETE_DIRECTORY(L"C:\\%ls"); }

1 0

[pschweitzer] 62639: [RAPPS] Don't pass structures by copy, give a pointer instead CID #502621 CID #502622 CID #502623
by pschweitzer＠svn.reactos.org 05 Apr '14

05 Apr '14

Author: pschweitzer Date: Sat Apr 5 22:49:18 2014 New Revision: 62639 URL: http://svn.reactos.org/svn/reactos?rev=62639&view=rev Log: [RAPPS] Don't pass structures by copy, give a pointer instead CID #502621 CID #502622 CID #502623 Modified: trunk/reactos/base/applications/rapps/available.c trunk/reactos/base/applications/rapps/installed.c trunk/reactos/base/applications/rapps/rapps.h trunk/reactos/base/applications/rapps/settingsdlg.c trunk/reactos/base/applications/rapps/winmain.c Modified: trunk/reactos/base/applications/rapps/available.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/av… ============================================================================== --- trunk/reactos/base/applications/rapps/available.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/available.c [iso-8859-1] Sat Apr 5 22:49:18 2014 @@ -219,7 +219,7 @@ GET_STRING2(L"URLSite", Info.szUrlSite); GET_STRING2(L"CDPath", Info.szCDPath); - if (!lpEnumProc(Info)) break; + if (!lpEnumProc(&Info)) break; } while (FindNextFileW(hFind, &FindFileData) != 0); FindClose(hFind); Modified: trunk/reactos/base/applications/rapps/installed.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/in… ============================================================================== --- trunk/reactos/base/applications/rapps/installed.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/installed.c [iso-8859-1] Sat Apr 5 22:49:18 2014 @@ -279,7 +279,7 @@ ((EnumType == ENUM_APPLICATIONS) && (!bIsUpdate)) || /* Applications only */ ((EnumType == ENUM_UPDATES) && (bIsUpdate))) /* Updates only */ { - if (!lpEnumProc(ItemIndex, pszDisplayName, Info)) + if (!lpEnumProc(ItemIndex, pszDisplayName, &Info)) break; } } Modified: trunk/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] Sat Apr 5 22:49:18 2014 @@ -107,7 +107,7 @@ } SETTINGS_INFO, *PSETTINGS_INFO; /* available.c */ -typedef BOOL (CALLBACK *AVAILENUMPROC)(APPLICATION_INFO Info); +typedef BOOL (CALLBACK *AVAILENUMPROC)(PAPPLICATION_INFO Info); BOOL EnumAvailableApplications(INT EnumType, AVAILENUMPROC lpEnumProc); BOOL ShowAvailableAppInfo(INT Index); BOOL UpdateAppsDB(VOID); @@ -116,7 +116,7 @@ BOOL InstallApplication(INT Index); /* installed.c */ -typedef BOOL (CALLBACK *APPENUMPROC)(INT ItemIndex, LPWSTR lpName, INSTALLED_INFO Info); +typedef BOOL (CALLBACK *APPENUMPROC)(INT ItemIndex, LPWSTR lpName, PINSTALLED_INFO Info); BOOL EnumInstalledApplications(INT EnumType, BOOL IsUserKey, APPENUMPROC lpEnumProc); BOOL GetApplicationString(HKEY hKey, LPWSTR lpKeyName, LPWSTR lpString); BOOL ShowInstalledAppInfo(INT Index); Modified: trunk/reactos/base/applications/rapps/settingsdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/se… ============================================================================== --- trunk/reactos/base/applications/rapps/settingsdlg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/settingsdlg.c [iso-8859-1] Sat Apr 5 22:49:18 2014 @@ -48,15 +48,15 @@ } static VOID -InitSettingsControls(HWND hDlg, SETTINGS_INFO Info) +InitSettingsControls(HWND hDlg, PSETTINGS_INFO Info) { - SendDlgItemMessage(hDlg, IDC_SAVE_WINDOW_POS, BM_SETCHECK, Info.bSaveWndPos, 0); - SendDlgItemMessage(hDlg, IDC_UPDATE_AVLIST, BM_SETCHECK, Info.bUpdateAtStart, 0); - SendDlgItemMessage(hDlg, IDC_LOG_ENABLED, BM_SETCHECK, Info.bLogEnabled, 0); - SendDlgItemMessage(hDlg, IDC_DEL_AFTER_INSTALL, BM_SETCHECK, Info.bDelInstaller, 0); + SendDlgItemMessage(hDlg, IDC_SAVE_WINDOW_POS, BM_SETCHECK, Info->bSaveWndPos, 0); + SendDlgItemMessage(hDlg, IDC_UPDATE_AVLIST, BM_SETCHECK, Info->bUpdateAtStart, 0); + SendDlgItemMessage(hDlg, IDC_LOG_ENABLED, BM_SETCHECK, Info->bLogEnabled, 0); + SendDlgItemMessage(hDlg, IDC_DEL_AFTER_INSTALL, BM_SETCHECK, Info->bDelInstaller, 0); SetWindowTextW(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT), - Info.szDownloadDir); + Info->szDownloadDir); } static @@ -68,7 +68,7 @@ case WM_INITDIALOG: { NewSettingsInfo = SettingsInfo; - InitSettingsControls(hDlg, SettingsInfo); + InitSettingsControls(hDlg, &SettingsInfo); } break; @@ -98,7 +98,7 @@ case IDC_DEFAULT_SETTINGS: FillDefaultSettings(&NewSettingsInfo); - InitSettingsControls(hDlg, NewSettingsInfo); + InitSettingsControls(hDlg, &NewSettingsInfo); break; case IDOK: Modified: trunk/reactos/base/applications/rapps/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/wi… ============================================================================== --- trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] Sat Apr 5 22:49:18 2014 @@ -115,7 +115,7 @@ BOOL CALLBACK -EnumInstalledAppProc(INT ItemIndex, LPWSTR lpName, INSTALLED_INFO Info) +EnumInstalledAppProc(INT ItemIndex, LPWSTR lpName, PINSTALLED_INFO Info) { PINSTALLED_INFO ItemInfo; WCHAR szText[MAX_PATH]; @@ -127,7 +127,7 @@ ItemInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(INSTALLED_INFO)); if (!ItemInfo) return FALSE; - *ItemInfo = Info; + RtlCopyMemory(ItemInfo, Info, sizeof(INSTALLED_INFO)); Index = ListViewAddItem(ItemIndex, 0, lpName, (LPARAM)ItemInfo); @@ -158,13 +158,13 @@ BOOL CALLBACK -EnumAvailableAppProc(APPLICATION_INFO Info) +EnumAvailableAppProc(PAPPLICATION_INFO Info) { PAPPLICATION_INFO ItemInfo; INT Index; - if (!SearchPatternMatch(Info.szName, szSearchPattern) && - !SearchPatternMatch(Info.szDesc, szSearchPattern)) + if (!SearchPatternMatch(Info->szName, szSearchPattern) && + !SearchPatternMatch(Info->szDesc, szSearchPattern)) { return TRUE; } @@ -173,16 +173,16 @@ - no RegName was supplied (so we cannot determine whether the application is installed or not) or - a RegName was supplied and the application is not installed */ - if (!*Info.szRegName || (!IsInstalledApplication(Info.szRegName, FALSE) && !IsInstalledApplication(Info.szRegName, TRUE))) + if (!*Info->szRegName || (!IsInstalledApplication(Info->szRegName, FALSE) && !IsInstalledApplication(Info->szRegName, TRUE))) { ItemInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(APPLICATION_INFO)); if (!ItemInfo) return FALSE; - *ItemInfo = Info; - - Index = ListViewAddItem(Info.Category, 0, Info.szName, (LPARAM)ItemInfo); - ListView_SetItemText(hListView, Index, 1, Info.szVersion); - ListView_SetItemText(hListView, Index, 2, Info.szDesc); + RtlCopyMemory(ItemInfo, Info, sizeof(APPLICATION_INFO)); + + Index = ListViewAddItem(Info->Category, 0, Info->szName, (LPARAM)ItemInfo); + ListView_SetItemText(hListView, Index, 1, Info->szVersion); + ListView_SetItemText(hListView, Index, 2, Info->szDesc); } return TRUE;

1 0

[pschweitzer] 62638: [SERVMAN] - Call LocalFree() to free memory allocated with LocalAlloc() - Fix leak CID #716291 CID #1101891 CID #1101892 CID #1101893 CID #1101894 CID #1101895 CID #1101896
by pschweitzer＠svn.reactos.org 05 Apr '14

05 Apr '14

Author: pschweitzer Date: Sat Apr 5 22:31:19 2014 New Revision: 62638 URL: http://svn.reactos.org/svn/reactos?rev=62638&view=rev Log: [SERVMAN] - Call LocalFree() to free memory allocated with LocalAlloc() - Fix leak CID #716291 CID #1101891 CID #1101892 CID #1101893 CID #1101894 CID #1101895 CID #1101896 Modified: trunk/reactos/base/applications/mscutils/servman/create.c trunk/reactos/base/applications/mscutils/servman/delete.c trunk/reactos/base/applications/mscutils/servman/dependencies_tv1.c trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c trunk/reactos/base/applications/mscutils/servman/listview.c trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c Modified: trunk/reactos/base/applications/mscutils/servman/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/create.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/create.c [iso-8859-1] Sat Apr 5 22:31:19 2014 @@ -65,9 +65,7 @@ { DisplayString(lpSuccess); - HeapFree(ProcessHeap, - 0, - lpSuccess); + LocalFree(lpSuccess); } CloseServiceHandle(hSc); Modified: trunk/reactos/base/applications/mscutils/servman/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/delete.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/delete.c [iso-8859-1] Sat Apr 5 22:31:19 2014 @@ -38,9 +38,7 @@ { DisplayString(lpSuccess); - HeapFree(ProcessHeap, - 0, - lpSuccess); + LocalFree(lpSuccess); } bRet = TRUE; Modified: trunk/reactos/base/applications/mscutils/servman/dependencies_tv1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/dependencies_tv1.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/dependencies_tv1.c [iso-8859-1] Sat Apr 5 22:31:19 2014 @@ -163,9 +163,7 @@ 0, FALSE); - HeapFree(ProcessHeap, - 0, - lpNoDepends); + LocalFree(lpNoDepends); /* Disable the window */ EnableWindow(pDlgInfo->hDependsTreeView1, FALSE); Modified: trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c [iso-8859-1] Sat Apr 5 22:31:19 2014 @@ -41,6 +41,8 @@ bRet = TRUE; } } + + CloseServiceHandle(hService); } CloseServiceHandle(hSCManager); @@ -163,9 +165,7 @@ 0, FALSE); - HeapFree(ProcessHeap, - 0, - lpNoDepends); + LocalFree(lpNoDepends); /* Disable the window */ EnableWindow(pDlgInfo->hDependsTreeView2, FALSE); Modified: trunk/reactos/base/applications/mscutils/servman/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/listview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/listview.c [iso-8859-1] Sat Apr 5 22:31:19 2014 @@ -192,9 +192,7 @@ lvItem.iItem, (LPARAM)&lvItem); - HeapFree(ProcessHeap, - 0, - lpStartup); + LocalFree(lpStartup); HeapFree(ProcessHeap, 0, lpServiceConfig); Modified: trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c [iso-8859-1] Sat Apr 5 22:31:19 2014 @@ -238,9 +238,7 @@ bRet = TRUE; } - HeapFree(ProcessHeap, - 0, - lpPartialStr); + LocalFree(lpPartialStr); } /* Display the list of services which need stopping */

1 0

[pschweitzer] 62637: [KBSWITCH] Fix buffer overflow. Static strings are already \0 terminated. CID #515202
by pschweitzer＠svn.reactos.org 05 Apr '14

05 Apr '14

Author: pschweitzer Date: Sat Apr 5 22:14:53 2014 New Revision: 62637 URL: http://svn.reactos.org/svn/reactos?rev=62637&view=rev Log: [KBSWITCH] Fix buffer overflow. Static strings are already \0 terminated. CID #515202 Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Sat Apr 5 22:14:53 2014 @@ -43,7 +43,7 @@ szBuf, sizeof(szBuf) / sizeof(TCHAR)) == 0) { - lstrcpy(szBuf, _T("??\0")); + lstrcpy(szBuf, _T("??")); } hdcsrc = GetDC(NULL);

1 0

[pschweitzer] 62636: [CHARMAP] Remove useless checks CID #1102274
by pschweitzer＠svn.reactos.org 05 Apr '14

05 Apr '14

Author: pschweitzer Date: Sat Apr 5 22:08:57 2014 New Revision: 62636 URL: http://svn.reactos.org/svn/reactos?rev=62636&view=rev Log: [CHARMAP] Remove useless checks CID #1102274 Modified: trunk/reactos/base/applications/charmap/settings.c Modified: trunk/reactos/base/applications/charmap/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/settings.c [iso-8859-1] Sat Apr 5 22:08:57 2014 @@ -122,13 +122,13 @@ hWnd = GetDlgItem(hCharmapDlg, IDC_FONTCOMBO); ComboBox_GetText(hWnd, szBuffer, MAX_PATH); - if(szBuffer != NULL && *szBuffer != '\0') + if(*szBuffer != '\0') RegSetValueEx(hKey, _T("Font"), 0, REG_SZ, (LPBYTE) szBuffer, (DWORD) MAX_PATH); hWnd = GetDlgItem(hCharmapDlg, IDC_COMBO_CHARSET); ComboBox_GetText(hWnd, szBuffer, MAX_PATH); - if(szBuffer != NULL && *szBuffer != '\0') + if(*szBuffer != '\0') RegSetValueEx(hKey, _T("CodePage"), 0, REG_SZ, (LPBYTE) szBuffer, (DWORD) MAX_PATH); RegSetValueEx(hKey, _T("Advanced"), 0, REG_DWORD, (LPBYTE)&Settings.IsAdvancedView, (DWORD) sizeof(DWORD));

1 0

[pschweitzer] 62635: [ROSAUTOTEST] Use matching delete operator CID #1102027 CID #1102028
by pschweitzer＠svn.reactos.org 05 Apr '14

05 Apr '14

Author: pschweitzer Date: Sat Apr 5 21:56:15 2014 New Revision: 62635 URL: http://svn.reactos.org/svn/reactos?rev=62635&view=rev Log: [ROSAUTOTEST] Use matching delete operator CID #1102027 CID #1102028 Modified: trunk/rostests/rosautotest/CWineTest.cpp trunk/rostests/rosautotest/tools.cpp Modified: trunk/rostests/rosautotest/CWineTest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWineTest.cpp… ============================================================================== --- trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] Sat Apr 5 21:56:15 2014 @@ -178,7 +178,7 @@ m_CurrentFile.clear(); /* Also free the memory for the list buffer */ - delete m_ListBuffer; + delete[] m_ListBuffer; m_ListBuffer = NULL; return false; Modified: trunk/rostests/rosautotest/tools.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/tools.cpp?rev… ============================================================================== --- trunk/rostests/rosautotest/tools.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/tools.cpp [iso-8859-1] Sat Apr 5 21:56:15 2014 @@ -196,7 +196,7 @@ WideCharToMultiByte(CP_ACP, 0, Buffer, Length + 1, AsciiBuffer, Length + 1, NULL, NULL); ReturnedString = AsciiBuffer; - delete AsciiBuffer; + delete[] AsciiBuffer; } return ReturnedString;

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