Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 67811: [WIN32K] Add debugprints to some region and path functions.
by tkreuzer＠svn.reactos.org 17 May '15

17 May '15

Author: tkreuzer Date: Sun May 17 14:34:49 2015 New Revision: 67811 URL: http://svn.reactos.org/svn/reactos?rev=67811&view=rev Log: [WIN32K] Add debugprints to some region and path functions. Modified: trunk/reactos/win32ss/gdi/ntgdi/path.c trunk/reactos/win32ss/gdi/ntgdi/region.c Modified: trunk/reactos/win32ss/gdi/ntgdi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/path.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/path.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/path.c [iso-8859-1] Sun May 17 14:34:49 2015 @@ -1252,6 +1252,7 @@ if (numStrokes == 0) { + DPRINT1("numStrokes is 0\n"); return FALSE; } @@ -1259,6 +1260,7 @@ pNumPointsInStroke = ExAllocatePoolWithTag(PagedPool, sizeof(ULONG) * numStrokes, TAG_PATH); if (!pNumPointsInStroke) { + DPRINT1("Failed to allocate %lu strokes\n", numStrokes); EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -1285,6 +1287,10 @@ pNumPointsInStroke, numStrokes, nPolyFillMode); + if (!Ret) + { + DPRINT1("REGION_SetPolyPolygonRgn failed\n"); + } /* Free memory for number-of-points-in-stroke array */ ExFreePoolWithTag(pNumPointsInStroke, TAG_PATH); Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Sun May 17 14:34:49 2015 @@ -3253,7 +3253,10 @@ /* Check if iMode is valid */ if ((iMode != ALTERNATE) && (iMode != WINDING)) + { + DPRINT1("Invalid iMode: %lu\n", iMode); return FALSE; + } /* Special case a rectangle */ if (((cPolygons == 1) && ((pcPoints[0] == 4) || @@ -3283,6 +3286,7 @@ TAG_REGION); if (pETEs == NULL) { + DPRINT1("Failed to allocate %lu edge entries\n", total); return FALSE; } @@ -3320,7 +3324,7 @@ TAG_REGION); if (tmpPtBlock == NULL) { - DPRINT1("Can't alloc tPB\n"); + DPRINT1("Can't alloc tmpPtBlock\n"); ExFreePoolWithTag(pETEs, TAG_REGION); return FALSE; }

1 0

[tkreuzer] 67810: [NTOSKRNL] Implement MiGetFileObjectForSectionAddress and use it in MmGetFileNameForAddress and NtAreMappedFilesTheSame. Don't call MmLocateMemoryAreaByAddress from these function...
by tkreuzer＠svn.reactos.org 17 May '15

17 May '15

Author: tkreuzer Date: Sun May 17 13:46:12 2015 New Revision: 67810 URL: http://svn.reactos.org/svn/reactos?rev=67810&view=rev Log: [NTOSKRNL] Implement MiGetFileObjectForSectionAddress and use it in MmGetFileNameForAddress and NtAreMappedFilesTheSame. Don't call MmLocateMemoryAreaByAddress from these functions anymore. Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Sun May 17 13:46:12 2015 @@ -1603,6 +1603,69 @@ return STATUS_SUCCESS; } +NTSTATUS +NTAPI +MiGetFileObjectForSectionAddress( + IN PVOID Address, + OUT PFILE_OBJECT *FileObject) +{ + PMMVAD Vad; + PCONTROL_AREA ControlArea; + + /* Get the VAD */ + Vad = MiLocateAddress(Address); + if (Vad == NULL) + { + /* Fail, the address does not exist */ + DPRINT1("Invalid address\n"); + return STATUS_INVALID_ADDRESS; + } + + /* Check if this is a RosMm memory area */ + if (Vad->u.VadFlags.Spare != 0) + { + PMEMORY_AREA MemoryArea = (PMEMORY_AREA)Vad; + PROS_SECTION_OBJECT Section; + + /* Check if it's a section view (RosMm section) */ + if (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) + { + /* Get the section pointer to the SECTION_OBJECT */ + Section = MemoryArea->Data.SectionData.Section; + *FileObject = Section->FileObject; + } + else + { + ASSERT(MemoryArea->Type == MEMORY_AREA_CACHE); + DPRINT1("Address is a cache section!\n"); + return STATUS_SECTION_NOT_IMAGE; + } + } + else + { + /* Make sure it's not a VM VAD */ + if (Vad->u.VadFlags.PrivateMemory == 1) + { + DPRINT1("Address is not a section\n"); + return STATUS_SECTION_NOT_IMAGE; + } + + /* Get the control area */ + ControlArea = Vad->ControlArea; + if (!(ControlArea) || !(ControlArea->u.Flags.Image)) + { + DPRINT1("Address is not a section\n"); + return STATUS_SECTION_NOT_IMAGE; + } + + /* Get the file object */ + *FileObject = ControlArea->FilePointer; + } + + /* Return success */ + return STATUS_SUCCESS; +} + PFILE_OBJECT NTAPI MmGetFileObjectForSection(IN PVOID SectionObject) @@ -1705,92 +1768,46 @@ MmGetFileNameForAddress(IN PVOID Address, OUT PUNICODE_STRING ModuleName) { - PVOID Section; - PMEMORY_AREA MemoryArea; - POBJECT_NAME_INFORMATION ModuleNameInformation; - PVOID AddressSpace; - NTSTATUS Status; - PFILE_OBJECT FileObject = NULL; - PMMVAD Vad; - PCONTROL_AREA ControlArea; - - /* Lock address space */ - AddressSpace = MmGetCurrentAddressSpace(); - MmLockAddressSpace(AddressSpace); - - /* Locate the memory area for the process by address */ - MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, Address); - if (!MemoryArea) - { - /* Fail, the address does not exist */ -InvalidAddress: - DPRINT1("Invalid address\n"); - MmUnlockAddressSpace(AddressSpace); - return STATUS_INVALID_ADDRESS; - } - - /* Check if it's a section view (RosMm section) or ARM3 section */ - if (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) - { - /* Get the section pointer to the SECTION_OBJECT */ - Section = MemoryArea->Data.SectionData.Section; - - /* Unlock address space */ - MmUnlockAddressSpace(AddressSpace); - - /* Get the filename of the section */ - Status = MmGetFileNameForSection(Section, &ModuleNameInformation); - } - else if (MemoryArea->Type == MEMORY_AREA_OWNED_BY_ARM3) - { - /* Get the VAD */ - Vad = MiLocateAddress(Address); - if (!Vad) goto InvalidAddress; - - /* Make sure it's not a VM VAD */ - if (Vad->u.VadFlags.PrivateMemory == 1) - { -NotSection: - DPRINT1("Address is not a section\n"); - MmUnlockAddressSpace(AddressSpace); - return STATUS_SECTION_NOT_IMAGE; - } - - /* Get the control area */ - ControlArea = Vad->ControlArea; - if (!(ControlArea) || !(ControlArea->u.Flags.Image)) goto NotSection; - - /* Get the file object */ - FileObject = ControlArea->FilePointer; - ASSERT(FileObject != NULL); - ObReferenceObject(FileObject); - - /* Unlock address space */ - MmUnlockAddressSpace(AddressSpace); - - /* Get the filename of the file object */ - Status = MmGetFileNameForFileObject(FileObject, &ModuleNameInformation); - - /* Dereference it */ - ObDereferenceObject(FileObject); - } - else - { - /* Trying to access virtual memory or something */ - goto InvalidAddress; - } - - /* Check if we were able to get the file object name */ - if (NT_SUCCESS(Status)) - { + POBJECT_NAME_INFORMATION ModuleNameInformation; + PVOID AddressSpace; + NTSTATUS Status; + PFILE_OBJECT FileObject = NULL; + + /* Lock address space */ + AddressSpace = MmGetCurrentAddressSpace(); + MmLockAddressSpace(AddressSpace); + + /* Get the file object pointer for the address */ + Status = MiGetFileObjectForSectionAddress(Address, &FileObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get file object for Address %p\n", Address); + MmUnlockAddressSpace(AddressSpace); + return Status; + } + + /* Reference the file object */ + ObReferenceObject(FileObject); + + /* Unlock address space */ + MmUnlockAddressSpace(AddressSpace); + + /* Get the filename of the file object */ + Status = MmGetFileNameForFileObject(FileObject, &ModuleNameInformation); + + /* Dereference the file object */ + ObDereferenceObject(FileObject); + + /* Check if we were able to get the file object name */ + if (NT_SUCCESS(Status)) + { /* Init modulename */ - RtlCreateUnicodeString(ModuleName, - ModuleNameInformation->Name.Buffer); - - /* Free temp taged buffer from MmGetFileNameForFileObject() */ - ExFreePoolWithTag(ModuleNameInformation, TAG_MM); - DPRINT("Found ModuleName %S by address %p\n", ModuleName->Buffer, Address); - } + RtlCreateUnicodeString(ModuleName, ModuleNameInformation->Name.Buffer); + + /* Free temp taged buffer from MmGetFileNameForFileObject() */ + ExFreePoolWithTag(ModuleNameInformation, TAG_MM); + DPRINT("Found ModuleName %S by address %p\n", ModuleName->Buffer, Address); + } /* Return status */ return Status; @@ -3082,74 +3099,41 @@ IN PVOID File2MappedAsFile) { PVOID AddressSpace; - PMEMORY_AREA MemoryArea1, MemoryArea2; - PROS_SECTION_OBJECT Section1, Section2; + PFILE_OBJECT FileObject1, FileObject2; + NTSTATUS Status; /* Lock address space */ AddressSpace = MmGetCurrentAddressSpace(); MmLockAddressSpace(AddressSpace); - /* Locate the memory area for the process by address */ - MemoryArea1 = MmLocateMemoryAreaByAddress(AddressSpace, File1MappedAsAnImage); - if (!MemoryArea1) - { - /* Fail, the address does not exist */ + /* Get the file object pointer for address 1 */ + Status = MiGetFileObjectForSectionAddress(File1MappedAsAnImage, &FileObject1); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get file object for Address %p\n", File1MappedAsAnImage); MmUnlockAddressSpace(AddressSpace); - return STATUS_INVALID_ADDRESS; - } - - /* Check if it's a section view (RosMm section) or ARM3 section */ - if (MemoryArea1->Type != MEMORY_AREA_SECTION_VIEW) - { - /* Fail, the address is not a section */ + return Status; + } + + /* Get the file object pointer for address 2 */ + Status = MiGetFileObjectForSectionAddress(File2MappedAsFile, &FileObject2); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get file object for Address %p\n", File1MappedAsAnImage); MmUnlockAddressSpace(AddressSpace); - return STATUS_CONFLICTING_ADDRESSES; - } - - /* Get the section pointer to the SECTION_OBJECT */ - Section1 = MemoryArea1->Data.SectionData.Section; - if (Section1->FileObject == NULL) + return Status; + } + + /* SectionObjectPointer is equal if the files are equal */ + if (FileObject1->SectionObjectPointer != FileObject2->SectionObjectPointer) { MmUnlockAddressSpace(AddressSpace); - return STATUS_CONFLICTING_ADDRESSES; - } - - /* Locate the memory area for the process by address */ - MemoryArea2 = MmLocateMemoryAreaByAddress(AddressSpace, File2MappedAsFile); - if (!MemoryArea2) - { - /* Fail, the address does not exist */ - MmUnlockAddressSpace(AddressSpace); - return STATUS_INVALID_ADDRESS; - } - - /* Check if it's a section view (RosMm section) or ARM3 section */ - if (MemoryArea2->Type != MEMORY_AREA_SECTION_VIEW) - { - /* Fail, the address is not a section */ - MmUnlockAddressSpace(AddressSpace); - return STATUS_CONFLICTING_ADDRESSES; - } - - /* Get the section pointer to the SECTION_OBJECT */ - Section2 = MemoryArea2->Data.SectionData.Section; - if (Section2->FileObject == NULL) - { - MmUnlockAddressSpace(AddressSpace); - return STATUS_CONFLICTING_ADDRESSES; - } - - /* The shared cache map seems to be the same if both of these are equal */ - if (Section1->FileObject->SectionObjectPointer->SharedCacheMap == - Section2->FileObject->SectionObjectPointer->SharedCacheMap) - { - MmUnlockAddressSpace(AddressSpace); - return STATUS_SUCCESS; + return STATUS_NOT_SAME_DEVICE; } /* Unlock address space */ MmUnlockAddressSpace(AddressSpace); - return STATUS_NOT_SAME_DEVICE; + return STATUS_SUCCESS; } /*

1 0

[tkreuzer] 67809: [GDIPLUS] Add even more debugprints
by tkreuzer＠svn.reactos.org 17 May '15

17 May '15

Author: tkreuzer Date: Sun May 17 13:44:34 2015 New Revision: 67809 URL: http://svn.reactos.org/svn/reactos?rev=67809&view=rev Log: [GDIPLUS] Add even more debugprints Modified: trunk/reactos/dll/win32/gdiplus/region.c Modified: trunk/reactos/dll/win32/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/region.c… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] Sun May 17 13:44:34 2015 @@ -1098,12 +1098,16 @@ { new_hdc = CreateCompatibleDC(0); if (!new_hdc) + { + ERR("CreateCompatibleDC failed\n"); return OutOfMemory; + } stat = GdipCreateFromHDC(new_hdc, &new_graphics); graphics = new_graphics; if (stat != Ok) { + ERR("GdipCreateFromHDC failed: 0x%x\n", stat); DeleteDC(new_hdc); return stat; } @@ -1112,7 +1116,10 @@ { graphics->hdc = new_hdc = CreateCompatibleDC(0); if (!new_hdc) + { + ERR("CreateCompatibleDC failed\n"); return OutOfMemory; + } } save_state = SaveDC(graphics->hdc); @@ -1125,7 +1132,15 @@ if (stat == Ok) { *hrgn = PathToRegion(graphics->hdc); + if (*hrgn == NULL) + { + ERR("PathToRegion failed\n"); + } stat = *hrgn ? Ok : OutOfMemory; + } + else + { + ERR("trace_path failed: 0x%x\n", stat); } RestoreDC(graphics->hdc, save_state); @@ -1282,12 +1297,18 @@ */ GpStatus WINGDIPAPI GdipGetRegionHRgn(GpRegion *region, GpGraphics *graphics, HRGN *hrgn) { + GpStatus status; TRACE("(%p, %p, %p)\n", region, graphics, hrgn); if (!region || !hrgn) return InvalidParameter; - return get_region_hrgn(&region->node, graphics, hrgn); + status = get_region_hrgn(&region->node, graphics, hrgn); + if (status != Ok) + { + ERR("get_region_hrgn() failed. region->node.type = 0x%x\n", region->node.type); + } + return status; } GpStatus WINGDIPAPI GdipIsEmptyRegion(GpRegion *region, GpGraphics *graphics, BOOL *res)

1 0

[pschweitzer] 67808: [FASTFAT] Fix a fixme in VfatGetUserBuffer(): Only request high priority page when in the paging path. Otherwise, request normal priority
by pschweitzer＠svn.reactos.org 17 May '15

17 May '15

Author: pschweitzer Date: Sun May 17 12:22:28 2015 New Revision: 67808 URL: http://svn.reactos.org/svn/reactos?rev=67808&view=rev Log: [FASTFAT] Fix a fixme in VfatGetUserBuffer(): Only request high priority page when in the paging path. Otherwise, request normal priority Modified: trunk/reactos/drivers/filesystems/fastfat/dir.c trunk/reactos/drivers/filesystems/fastfat/misc.c trunk/reactos/drivers/filesystems/fastfat/rw.c trunk/reactos/drivers/filesystems/fastfat/vfat.h Modified: trunk/reactos/drivers/filesystems/fastfat/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/dir.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/dir.c [iso-8859-1] Sun May 17 12:22:28 2015 @@ -419,7 +419,7 @@ ProbeForWrite(IrpContext->Irp->UserBuffer, BufferLength, 1); } #endif - Buffer = VfatGetUserBuffer(IrpContext->Irp); + Buffer = VfatGetUserBuffer(IrpContext->Irp, FALSE); if (!ExAcquireResourceSharedLite(&pFcb->MainResource, (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) Modified: trunk/reactos/drivers/filesystems/fastfat/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/misc.c [iso-8859-1] Sun May 17 12:22:28 2015 @@ -327,15 +327,14 @@ PVOID VfatGetUserBuffer( - IN PIRP Irp) + IN PIRP Irp, + IN BOOLEAN Paging) { ASSERT(Irp); if (Irp->MdlAddress) { - /* This call may be in the paging path, so use maximum priority */ - /* FIXME: call with normal priority in the non-paging path */ - return MmGetSystemAddressForMdlSafe(Irp->MdlAddress, HighPagePriority); + return MmGetSystemAddressForMdlSafe(Irp->MdlAddress, (Paging ? HighPagePriority : NormalPagePriority)); } else { Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Sun May 17 12:22:28 2015 @@ -655,7 +655,7 @@ } } - Buffer = VfatGetUserBuffer(IrpContext->Irp); + Buffer = VfatGetUserBuffer(IrpContext->Irp, IrpContext->Irp->Flags & IRP_PAGING_IO); if (!Buffer) { Status = STATUS_INVALID_USER_BUFFER; @@ -926,7 +926,7 @@ OldFileSize = Fcb->RFCB.FileSize; - Buffer = VfatGetUserBuffer(IrpContext->Irp); + Buffer = VfatGetUserBuffer(IrpContext->Irp, IrpContext->Irp->Flags & IRP_PAGING_IO); if (!Buffer) { Status = STATUS_INVALID_USER_BUFFER; Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Sun May 17 12:22:28 2015 @@ -928,7 +928,8 @@ PVOID VfatGetUserBuffer( - IN PIRP); + IN PIRP, + IN BOOLEAN Paging); NTSTATUS VfatLockUserBuffer(

1 0

[tkreuzer] 67807: [GDIPLUS] Add some debug output to try to track winetest failures.
by tkreuzer＠svn.reactos.org 17 May '15

17 May '15

Author: tkreuzer Date: Sun May 17 11:49:04 2015 New Revision: 67807 URL: http://svn.reactos.org/svn/reactos?rev=67807&view=rev Log: [GDIPLUS] Add some debug output to try to track winetest failures. Modified: trunk/reactos/dll/win32/gdiplus/region.c Modified: trunk/reactos/dll/win32/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/region.c… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] Sun May 17 11:49:04 2015 @@ -1161,11 +1161,18 @@ stat = GdipCreatePath(FillModeAlternate, &path); if (stat != Ok) + { + ERR("GdipCreatePath failed: 0x%x\n", stat); return stat; + } stat = GdipAddPathRectangle(path, rc->X, rc->Y, rc->Width, rc->Height); if (stat == Ok) stat = get_path_hrgn(path, graphics, hrgn); + else + { + ERR("GdipAddPathRectangle failed: 0x%x\n", stat); + } GdipDeletePath(path);

1 0

[tkreuzer] 67806: [DINPUT_WINETEST] Skip randomly failing tests. See ROSTESTS-176 and CORE-9710
by tkreuzer＠svn.reactos.org 17 May '15

17 May '15

Author: tkreuzer Date: Sun May 17 10:55:03 2015 New Revision: 67806 URL: http://svn.reactos.org/svn/reactos?rev=67806&view=rev Log: [DINPUT_WINETEST] Skip randomly failing tests. See ROSTESTS-176 and CORE-9710 Modified: trunk/rostests/winetests/dinput/mouse.c Modified: trunk/rostests/winetests/dinput/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dinput/mouse.c?… ============================================================================== --- trunk/rostests/winetests/dinput/mouse.c [iso-8859-1] (original) +++ trunk/rostests/winetests/dinput/mouse.c [iso-8859-1] Sun May 17 10:55:03 2015 @@ -147,6 +147,10 @@ hr = IDirectInputDevice_Acquire(pMouse); ok(hr == S_OK, "Acquire() failed: %08x\n", hr); +if (!winetest_interactive) + skip("ROSTESTS-176/CORE-9710: Skipping randomly failing tests\n"); +else { + mouse_event(MOUSEEVENTF_MOVE, 10, 10, 0, 0); cnt = 1; hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); @@ -176,7 +180,7 @@ cnt = 1; hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); ok(hr == DI_OK && cnt == 1, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); - +} if (pMouse) IUnknown_Release(pMouse); DestroyWindow( hwnd2 );

1 0

[pschweitzer] 67805: [CONSOLE] Fix memory leaks
by pschweitzer＠svn.reactos.org 17 May '15

17 May '15

Author: pschweitzer Date: Sun May 17 10:20:58 2015 New Revision: 67805 URL: http://svn.reactos.org/svn/reactos?rev=67805&view=rev Log: [CONSOLE] Fix memory leaks Modified: trunk/reactos/dll/cpl/console/layout.c Modified: trunk/reactos/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/layout.c?r… ============================================================================== --- trunk/reactos/dll/cpl/console/layout.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/layout.c [iso-8859-1] Sun May 17 10:20:58 2015 @@ -140,6 +140,7 @@ if (Font == NULL) { DPRINT1("PaintText: CreateFont failed\n"); + DeleteObject(hBrush); return FALSE; } @@ -147,6 +148,7 @@ if (OldFont == NULL) { DeleteObject(Font); + DeleteObject(hBrush); return FALSE; }

1 0

[pschweitzer] 67804: [SETUPAPI] Fix a memory leak
by pschweitzer＠svn.reactos.org 17 May '15

17 May '15

Author: pschweitzer Date: Sun May 17 10:09:50 2015 New Revision: 67804 URL: http://svn.reactos.org/svn/reactos?rev=67804&view=rev Log: [SETUPAPI] Fix a memory leak Modified: trunk/reactos/dll/win32/setupapi/interface.c Modified: trunk/reactos/dll/win32/setupapi/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/interfa… ============================================================================== --- trunk/reactos/dll/win32/setupapi/interface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/interface.c [iso-8859-1] Sun May 17 10:09:50 2015 @@ -586,6 +586,7 @@ Slash = wcsrchr(Path, '\\'); if (!Guid || !Slash) { + HeapFree(GetProcessHeap(), 0, Path); SetLastError(ERROR_INVALID_PARAMETER); return INVALID_HANDLE_VALUE; }

1 0

[pschweitzer] 67803: [WS2_32] RtlFreeHeap -> FreeHeap
by pschweitzer＠svn.reactos.org 17 May '15

17 May '15

Author: pschweitzer Date: Sun May 17 10:07:00 2015 New Revision: 67803 URL: http://svn.reactos.org/svn/reactos?rev=67803&view=rev Log: [WS2_32] RtlFreeHeap -> FreeHeap Modified: trunk/reactos/dll/win32/ws2_32/misc/catalog.c Modified: trunk/reactos/dll/win32/ws2_32/misc/catalog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/cata… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/catalog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/catalog.c [iso-8859-1] Sun May 17 10:07:00 2015 @@ -68,7 +68,7 @@ if (!RtlCreateUnicodeString(&Provider->LibraryName, LibraryName)) { - RtlFreeHeap(GlobalHeap, 0, Provider); + HeapFree(GlobalHeap, 0, Provider); return NULL; }

1 0

[pschweitzer] 67802: [INFLIB] Don't free memory twice on failure
by pschweitzer＠svn.reactos.org 17 May '15

17 May '15

Author: pschweitzer Date: Sun May 17 09:41:54 2015 New Revision: 67802 URL: http://svn.reactos.org/svn/reactos?rev=67802&view=rev Log: [INFLIB] Don't free memory twice on failure Modified: trunk/reactos/lib/inflib/infrosput.c Modified: trunk/reactos/lib/inflib/infrosput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infrosput.c?rev… ============================================================================== --- trunk/reactos/lib/inflib/infrosput.c [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/infrosput.c [iso-8859-1] Sun May 17 09:41:54 2015 @@ -101,7 +101,6 @@ if (!INF_SUCCESS(Status)) { DPRINT1("NtWriteFile() failed (Status %lx)\n", Status); - FREE(Buffer); return(Status); }

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