Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[sginsberg] 37914: - Change more ASSERT(FALSE) to KeBugCheck(MEMORY_MANAGEMENT) so it dies on release build too

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sun Dec 7 12:05:28 2008 New Revision: 37914 URL: http://svn.reactos.org/svn/reactos?rev=37914&view=rev Log: - Change more ASSERT(FALSE) to KeBugCheck(MEMORY_MANAGEMENT) so it dies on release build too Modified: trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/balance.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/iospace.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/mdlsup.c trunk/reactos/ntoskrnl/mm/mpw.c trunk/reactos/ntoskrnl/mm/npool.c trunk/reactos/ntoskrnl/mm/pagefile.c trunk/reactos/ntoskrnl/mm/pageop.c trunk/reactos/ntoskrnl/mm/procsup.c trunk/reactos/ntoskrnl/mm/rmap.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Sun Dec 7 12:05:28 2008 @@ -163,7 +163,7 @@ if (Page == 0) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } /* @@ -301,7 +301,7 @@ if (PageOp == NULL) { DPRINT1("MmGetPageOp failed"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } /* @@ -322,12 +322,12 @@ if (Status != STATUS_SUCCESS) { DPRINT1("Failed to wait for page op\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (PageOp->Status == STATUS_PENDING) { DPRINT1("Woke for page op before completion\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } /* * If this wasn't a pagein then we need to restart the handling @@ -373,7 +373,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("MmRequestPageMemoryConsumer failed, status = %x\n", Status); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } /* @@ -387,7 +387,7 @@ Status = MmReadFromSwapPage(SwapEntry, Page); if (!NT_SUCCESS(Status)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmSetSavedSwapEntryPage(Page, SwapEntry); } @@ -414,7 +414,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("MmCreateVirtualMapping failed, not out of memory\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return(Status); } @@ -888,7 +888,7 @@ if (Status != STATUS_SUCCESS) { DPRINT1("Failed to wait for page op\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmLockAddressSpace(&Process->VadRoot); MmReleasePageOp(PageOp); Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Sun Dec 7 12:05:28 2008 @@ -97,7 +97,7 @@ if (Page == 0) { DPRINT1("Tried to release page zero.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } KeAcquireSpinLock(&AllocationListLock, &oldIrql); @@ -169,7 +169,7 @@ Status = MiMemoryConsumers[i].Trim(Target, 0, &NrFreedPages); if (!NT_SUCCESS(Status)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Target = Target - NrFreedPages; } @@ -326,7 +326,7 @@ Status = MiMemoryConsumers[i].Trim(MiMinimumPagesPerRun, 0, &NrFreedPages); if (!NT_SUCCESS(Status)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } } @@ -357,7 +357,7 @@ Status = MiMemoryConsumers[i].Trim(Target, 0, &NrFreedPages); if (!NT_SUCCESS(Status)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } } @@ -366,7 +366,7 @@ else { DPRINT1("KeWaitForMultipleObjects failed, status = %x\n", Status); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } } @@ -406,7 +406,7 @@ NULL); if (!NT_SUCCESS(Status)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Priority = LOW_REALTIME_PRIORITY + 1; Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Sun Dec 7 12:05:28 2008 @@ -270,7 +270,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Unable to create virtual mapping\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } else @@ -416,7 +416,7 @@ if (Page->Flags.Type == MM_PHYSICAL_PAGE_FREE) { DPRINT1("Mapping non-used page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Page->MapCount++; Page->ReferenceCount++; @@ -438,12 +438,12 @@ if (Page->Flags.Type == MM_PHYSICAL_PAGE_FREE) { DPRINT1("Unmapping non-used page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Page->MapCount == 0) { DPRINT1("Unmapping not mapped page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Page->MapCount--; Page->ReferenceCount--; @@ -511,7 +511,7 @@ if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Referencing non-used page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Page->ReferenceCount++; @@ -542,7 +542,7 @@ if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Getting reference count for free page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } RCount = Page->ReferenceCount; @@ -577,12 +577,12 @@ if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Dereferencing free page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Page->ReferenceCount == 0) { DPRINT1("Derefrencing page with reference count 0\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Page->ReferenceCount--; @@ -594,29 +594,29 @@ if (Page->RmapListHead != NULL) { DPRINT1("Freeing page with rmap entries.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Page->MapCount != 0) { DPRINT1("Freeing mapped page (0x%x count %d)\n", Pfn << PAGE_SHIFT, Page->MapCount); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Page->LockCount > 0) { DPRINT1("Freeing locked page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Page->SavedSwapEntry != 0) { DPRINT1("Freeing page with swap entry.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Freeing page with flags %x\n", Page->Flags.Type); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Page->Flags.Type = MM_PHYSICAL_PAGE_FREE; Page->Flags.Consumer = MC_MAXIMUM; @@ -647,7 +647,7 @@ if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Getting lock count for free page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } LockCount = Page->LockCount; @@ -671,7 +671,7 @@ if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Locking free page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Page->LockCount++; @@ -702,7 +702,7 @@ if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Unlocking free page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Page->LockCount--; @@ -757,17 +757,17 @@ if (PageDescriptor->Flags.Type != MM_PHYSICAL_PAGE_FREE) { DPRINT1("Got non-free page from freelist\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (PageDescriptor->MapCount != 0) { DPRINT1("Got mapped page from freelist\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (PageDescriptor->ReferenceCount != 0) { DPRINT1("%d\n", PageDescriptor->ReferenceCount); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } PageDescriptor->Flags.Type = MM_PHYSICAL_PAGE_USED; PageDescriptor->Flags.Consumer = Consumer; @@ -789,7 +789,7 @@ if (PageDescriptor->MapCount != 0) { DPRINT1("Returning mapped page.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } return PfnOffset; } @@ -970,7 +970,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("ZeroPageThread: Wait failed\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (ZeroPageThreadShouldTerminate) @@ -995,7 +995,7 @@ if (PageDescriptor->MapCount != 0) { DPRINT1("Mapped page on freelist.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } PageDescriptor->Flags.Zero = 1; PageDescriptor->Flags.Type = MM_PHYSICAL_PAGE_FREE; Modified: trunk/reactos/ntoskrnl/mm/iospace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/iospace.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/iospace.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/iospace.c [iso-8859-1] Sun Dec 7 12:05:28 2008 @@ -104,7 +104,7 @@ if (!NT_SUCCESS(Status)) { DbgPrint("Unable to create virtual mapping\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } return (PVOID)((ULONG_PTR)Result + Offset); Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=37… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sun Dec 7 12:05:28 2008 @@ -899,7 +899,7 @@ BaseAddress); if (MemoryArea == NULL) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return(STATUS_UNSUCCESSFUL); } @@ -1039,7 +1039,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Unable to allocate page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Status = MmCreateVirtualMapping (NULL, (PVOID)((ULONG_PTR)BaseAddress + (i * PAGE_SIZE)), @@ -1049,7 +1049,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Unable to create virtual mapping\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } } Modified: trunk/reactos/ntoskrnl/mm/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mdlsup.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] Sun Dec 7 12:05:28 2008 @@ -57,7 +57,7 @@ if (!NT_SUCCESS(Status)) { MmUnlockAddressSpace(MmGetKernelAddressSpace()); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmUnlockAddressSpace(MmGetKernelAddressSpace()); @@ -692,7 +692,7 @@ { return NULL; } - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Base = (PVOID)((ULONG_PTR)MiMdlMappingRegionBase + StartingOffset * PAGE_SIZE); if (MiMdlMappingRegionHint == StartingOffset) MiMdlMappingRegionHint += PageCount; Modified: trunk/reactos/ntoskrnl/mm/mpw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mpw.c?rev=3791… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mpw.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mpw.c [iso-8859-1] Sun Dec 7 12:05:28 2008 @@ -71,7 +71,7 @@ if (!NT_SUCCESS(Status)) { DbgPrint("MpwThread: Wait failed\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return(STATUS_UNSUCCESSFUL); } if (MpwThreadShouldTerminate) Modified: trunk/reactos/ntoskrnl/mm/npool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/npool.c?rev=37… ============================================================================== --- trunk/reactos/ntoskrnl/mm/npool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/npool.c [iso-8859-1] Sun Dec 7 12:05:28 2008 @@ -936,7 +936,7 @@ { DbgPrint("Bad block magic (probable pool corruption) at %x\n", current); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (base_addr < MiNonPagedPoolStart || @@ -946,13 +946,13 @@ DbgPrint("Size %d\n",current->hdr.Size); DbgPrint("Limits are %x %x\n",MiNonPagedPoolStart, (ULONG_PTR)MiNonPagedPoolStart+MiNonPagedPoolLength); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } blocks_seen++; if (blocks_seen > EiNrFreeBlocks) { DbgPrint("Too many blocks on free list\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } p = avl_get_next(FreeBlockListRoot, p); } @@ -979,7 +979,7 @@ { DbgPrint("Bad block magic (probable pool corruption) at %x\n", current); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (base_addr < MiNonPagedPoolStart || ((ULONG_PTR)base_addr+current->hdr.Size) > @@ -989,13 +989,13 @@ DbgPrint("Size %d\n",current->hdr.Size); DbgPrint("Limits are %x %x\n",MiNonPagedPoolStart, (ULONG_PTR)MiNonPagedPoolStart+MiNonPagedPoolLength); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } blocks_seen++; if (blocks_seen > EiNrUsedBlocks) { DbgPrint("Too many blocks on used list\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (current->ListEntry.Flink != &UsedBlockListHead && current->ListEntry.Flink->Blink != &current->ListEntry) @@ -1004,7 +1004,7 @@ "current->next->previous %x)\n", __FILE__,__LINE__,current, current->ListEntry.Flink, current->ListEntry.Flink->Blink); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } current_entry = current_entry->Flink; @@ -1035,19 +1035,19 @@ { DbgPrint("Bad block magic (probable pool corruption) at %x\n", free); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if ( (ULONG_PTR)free > base && (ULONG_PTR)free < last ) { DbgPrint("intersecting blocks on list\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if ( (ULONG_PTR)free < base && ((ULONG_PTR)free + free->hdr.Size) > base ) { DbgPrint("intersecting blocks on list\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } p = avl_get_next(FreeBlockListRoot, p); } @@ -1060,13 +1060,13 @@ if ( (ULONG_PTR)used > base && (ULONG_PTR)used < last ) { DbgPrint("intersecting blocks on list\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if ( (ULONG_PTR)used < base && ((ULONG_PTR)used + used->hdr.Size) > base ) { DbgPrint("intersecting blocks on list\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } current_entry = current_entry->Flink; @@ -1460,7 +1460,7 @@ { HDR_USED* blk=(HDR_USED*)((ULONG_PTR)Addr - HDR_USED_SIZE); if (blk->hdr.Magic != BLOCK_HDR_USED_MAGIC) - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return blk->Tag; } @@ -1510,7 +1510,7 @@ DbgPrint("NPPOL: High-side redzone overwritten, Block %x, Size %d, Tag %x(%s), Caller %x\n", (ULONG_PTR)hdr + HDR_USED_SIZE, hdr->UserSize, hdr->Tag, c, hdr->Caller); } - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } #endif @@ -1728,7 +1728,7 @@ if (!NT_SUCCESS(Status)) { DbgPrint("Unable to allocate a page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Status = MmCreateVirtualMapping(NULL, @@ -1739,7 +1739,7 @@ if (!NT_SUCCESS(Status)) { DbgPrint("Unable to create virtual mapping\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Address = (PVOID)((ULONG_PTR)Address + PAGE_SIZE); } Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] Sun Dec 7 12:05:28 2008 @@ -205,7 +205,7 @@ first = mid + 1; } } - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); #if defined(__GNUC__) return (LARGE_INTEGER)0LL; @@ -237,7 +237,7 @@ if (SwapEntry == 0) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return(STATUS_UNSUCCESSFUL); } @@ -247,13 +247,13 @@ if (i >= MAX_PAGING_FILES) { DPRINT1("Bad swap entry 0x%.8X\n", SwapEntry); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (PagingFileList[i]->FileObject == NULL || PagingFileList[i]->FileObject->DeviceObject == NULL) { DPRINT1("Bad paging file 0x%.8X\n", SwapEntry); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmInitializeMdl(Mdl, NULL, PAGE_SIZE); @@ -298,7 +298,7 @@ if (SwapEntry == 0) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return(STATUS_UNSUCCESSFUL); } @@ -308,13 +308,13 @@ if (i >= MAX_PAGING_FILES) { DPRINT1("Bad swap entry 0x%.8X\n", SwapEntry); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (PagingFileList[i]->FileObject == NULL || PagingFileList[i]->FileObject->DeviceObject == NULL) { DPRINT1("Bad paging file 0x%.8X\n", SwapEntry); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmInitializeMdl(Mdl, NULL, PAGE_SIZE); @@ -450,13 +450,13 @@ if (i >= MAX_PAGING_FILES) { DPRINT1("Bad swap entry 0x%.8X\n", Entry); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } KeAcquireSpinLock(&PagingFileListLock, &oldIrql); if (PagingFileList[i] == NULL) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } KeAcquireSpinLockAtDpcLevel(&PagingFileList[i]->AllocMapLock); @@ -504,7 +504,7 @@ off = MiAllocPageFromPagingFile(PagingFileList[i]); if (off == 0xFFFFFFFF) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); KeReleaseSpinLock(&PagingFileListLock, oldIrql); return(STATUS_UNSUCCESSFUL); } @@ -518,7 +518,7 @@ } KeReleaseSpinLock(&PagingFileListLock, oldIrql); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return(0); } Modified: trunk/reactos/ntoskrnl/mm/pageop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pageop.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pageop.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pageop.c [iso-8859-1] Sun Dec 7 12:05:28 2008 @@ -66,7 +66,7 @@ PrevPageOp = PrevPageOp->Next; } KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } PMM_PAGEOP @@ -211,7 +211,7 @@ if (PageOp == NULL) { KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return(NULL); } Modified: trunk/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] Sun Dec 7 12:05:28 2008 @@ -217,7 +217,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create thread stack\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } /* @@ -241,7 +241,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Could not create Virtual Mapping for Kernel Stack\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } /* Return the stack base */ @@ -715,7 +715,7 @@ break; default: - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=379… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] Sun Dec 7 12:05:28 2008 @@ -81,7 +81,7 @@ Address = entry->Address; if ((((ULONG_PTR)Address) & 0xFFF) != 0) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Address < MmSystemRangeStart) { @@ -177,7 +177,7 @@ } else { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Address < MmSystemRangeStart) { @@ -211,7 +211,7 @@ Address = entry->Address; if ((((ULONG_PTR)Address) & 0xFFF) != 0) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Address < MmSystemRangeStart) @@ -301,7 +301,7 @@ } else { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Address < MmSystemRangeStart) { @@ -321,7 +321,7 @@ if (current_entry == NULL) { DPRINT1("MmIsDirtyRmap: No rmaps.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } while (current_entry != NULL) { @@ -342,7 +342,7 @@ if (current_entry == NULL) { DPRINT1("MmIsDirtyRmap: No rmaps.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } while (current_entry != NULL) { @@ -392,7 +392,7 @@ new_entry = ExAllocateFromNPagedLookasideList(&RmapLookasideList); if (new_entry == NULL) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } new_entry->Address = Address; new_entry->Process = (PEPROCESS)Process; @@ -410,7 +410,7 @@ "address 0x%.8X\n", Process->UniqueProcessId, Address, MmGetPfnForProcess(Process, Address) << PAGE_SHIFT, Page << PAGE_SHIFT); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } ExAcquireFastMutex(&RmapListLock); @@ -427,7 +427,7 @@ DbgPrint("\n previous caller "); DbgPrint("%p", current_entry->Caller); DbgPrint("\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } current_entry = current_entry->Next; } @@ -463,7 +463,7 @@ if (current_entry == NULL) { DPRINT1("MmDeleteAllRmaps: No rmaps.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmSetRmapListHeadPage(Page, NULL); ExReleaseFastMutex(&RmapListLock); @@ -527,5 +527,5 @@ previous_entry = current_entry; current_entry = current_entry->Next; } - ASSERT(FALSE); -} + KeBugCheck(MEMORY_MANAGEMENT); +}

16 years

[gschneider] 37913: - Fix drawing the status bar over the play cards, happened if no status bar was specified on sol startup (Win and ROS behavior); the bar has to be created to get the coords right - so we'll just hide it if we don't need it (like it's done when toggling status bar visibility in options) - Additional cleanup by Roel Messiant, <roelmessiant AT gmail DOT com>: - Replace the default options magic value by the proper constant - Status bar height was being set wrong, but the system'

by gschneider＠svn.reactos.org

Author: gschneider Date: Sun Dec 7 12:04:56 2008 New Revision: 37913 URL: http://svn.reactos.org/svn/reactos?rev=37913&view=rev Log: - Fix drawing the status bar over the play cards, happened if no status bar was specified on sol startup (Win and ROS behavior); the bar has to be created to get the coords right - so we'll just hide it if we don't need it (like it's done when toggling status bar visibility in options) - Additional cleanup by Roel Messiant, <roelmessiant AT gmail DOT com>: - Replace the default options magic value by the proper constant - Status bar height was being set wrong, but the system's constraint was fixing this behind the screens - See bugs #3336 and #3820 for more info Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] Sun Dec 7 12:04:56 2008 @@ -20,7 +20,7 @@ TCHAR MsgAbout[128]; TCHAR MsgWin[128]; TCHAR MsgDeal[128]; -DWORD dwOptions = 8; +DWORD dwOptions = OPTION_THREE_CARDS; CardWindow SolWnd; @@ -477,6 +477,13 @@ // Force the window to process WM_GETMINMAXINFO again GetWindowRect(hwndStatus, &rcStatus); nStatusHeight = rcStatus.bottom - rcStatus.top; + + // Hide status bar if options say so + if (!(dwOptions & OPTION_SHOW_STATUS)) + { + ShowWindow(hwndStatus, SW_HIDE); + } + SetWindowPos(hwnd, NULL, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOZORDER); NewGame(); @@ -497,8 +504,7 @@ if (dwOptions & OPTION_SHOW_STATUS) { MoveWindow(SolWnd, 0, 0, nWidth, nHeight - nStatusHeight, TRUE); - MoveWindow(hwndStatus, 0, nHeight - nStatusHeight, nWidth, nHeight, TRUE); - SendMessage(hwndStatus, WM_SIZE, wParam, lParam); + MoveWindow(hwndStatus, 0, nHeight - nStatusHeight, nWidth, nStatusHeight, TRUE); } else {

16 years

[tkreuzer] 37912: revert r35657

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Dec 7 09:15:15 2008 New Revision: 37912 URL: http://svn.reactos.org/svn/reactos?rev=37912&view=rev Log: revert r35657 Modified: branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/chargen.c branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/daytime.c branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/discard.c branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/echo.c branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/qotd.c branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/skelserver.c Modified: branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/chargen.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/chargen.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/chargen.c [iso-8859-1] Sun Dec 7 09:15:15 2008 @@ -96,7 +96,7 @@ ChargenHandler(VOID* sock_) { INT retVal = 0; - SOCKET sock = (SOCKET)(UINT_PTR)sock_; + SOCKET sock = (SOCKET)sock_; if (!GenerateChars(sock)) { Modified: branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/daytime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/daytime.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/daytime.c [iso-8859-1] Sun Dec 7 09:15:15 2008 @@ -30,7 +30,7 @@ time_t aclock; CHAR *pszTime; DWORD retVal = 0; - SOCKET Sock = (SOCKET)(UINT_PTR)Sock_; + SOCKET Sock = (SOCKET)Sock_; time(&aclock); localTime = localtime(&aclock); Modified: branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/discard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/discard.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/discard.c [iso-8859-1] Sun Dec 7 09:15:15 2008 @@ -44,7 +44,7 @@ DiscardHandler(VOID* sock_) { DWORD retVal = 0; - SOCKET sock = (SOCKET)(UINT_PTR)sock_; + SOCKET sock = (SOCKET)sock_; if (!RecieveIncomingPackets(sock)) { Modified: branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/echo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/echo.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/echo.c [iso-8859-1] Sun Dec 7 09:15:15 2008 @@ -69,7 +69,7 @@ EchoHandler(VOID* sock_) { DWORD retVal = 0; - SOCKET sock = (SOCKET)(UINT_PTR)sock_; + SOCKET sock = (SOCKET)sock_; if (!EchoIncomingPackets(sock)) { Modified: branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/qotd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/qotd.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/qotd.c [iso-8859-1] Sun Dec 7 09:15:15 2008 @@ -128,7 +128,7 @@ DWORD WINAPI QotdHandler(VOID* sock_) { - SOCKET sock = (SOCKET)(UINT_PTR)sock_; + SOCKET sock = (SOCKET)sock_; DWORD retVal = 0; if (!RetrieveQuote(sock)) Modified: branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/skelserver.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/skelserver.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/skelserver.c [iso-8859-1] Sun Dec 7 09:15:15 2008 @@ -95,7 +95,7 @@ if (!bShutdown) { - hThread = CreateThread(0, 0, lpService, (PVOID)(UINT_PTR)sock, 0, NULL); + hThread = CreateThread(0, 0, lpService, (void*)sock, 0, NULL); if (hThread != NULL) { CloseHandle(hThread);

16 years

[tkreuzer] 37911: enable saving of xmm registers in RtlCaptureContext

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Dec 7 06:59:41 2008 New Revision: 37911 URL: http://svn.reactos.org/svn/reactos?rev=37911&view=rev Log: enable saving of xmm registers in RtlCaptureContext Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/except_asm.S Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/except_asm.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/except_asm.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/except_asm.S [iso-8859-1] Sun Dec 7 06:59:41 2008 @@ -74,8 +74,8 @@ /* Store return address */ mov [rcx + CONTEXT_Rip], rax - /* Safe mmx registers */ -/* movdqa [rcx + CONTEXT_Xmm0], xmm0 + /* Safe xmm registers */ + movdqa [rcx + CONTEXT_Xmm0], xmm0 movdqa [rcx + CONTEXT_Xmm1], xmm1 movdqa [rcx + CONTEXT_Xmm2], xmm2 movdqa [rcx + CONTEXT_Xmm3], xmm3 @@ -91,7 +91,7 @@ movdqa [rcx + CONTEXT_Xmm13], xmm13 movdqa [rcx + CONTEXT_Xmm14], xmm14 movdqa [rcx + CONTEXT_Xmm15], xmm15 -*/ + /* Cleanup stack and return */ add rsp, 8 ret

16 years

[tkreuzer] 37910: Merge 34758, 34771, 34786, 34787, 34906, 35826, 36174, 36274, 36444, 36445, 36446, 36447, 36448, 36477, 36511, 36898, 36903 from amd64 branch

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Dec 7 06:11:46 2008 New Revision: 37910 URL: http://svn.reactos.org/svn/reactos?rev=37910&view=rev Log: Merge 34758, 34771, 34786, 34787, 34906, 35826, 36174, 36274, 36444, 36445, 36446, 36447, 36448, 36477, 36511, 36898, 36903 from amd64 branch Modified: trunk/reactos/base/applications/calc/winmain.c trunk/reactos/base/applications/charmap/charmap.c trunk/reactos/base/applications/control/control.c trunk/reactos/base/applications/control/control.h trunk/reactos/base/applications/dxdiag/dxdiag.c trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp trunk/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp trunk/reactos/base/applications/games/solitaire/solgame.cpp trunk/reactos/base/applications/games/solitaire/solitaire.cpp trunk/reactos/base/applications/games/winemine/dialog.h trunk/reactos/base/applications/msconfig/msconfig.c trunk/reactos/base/applications/mscutils/devmgmt/about.c trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c trunk/reactos/base/applications/mscutils/devmgmt/precomp.h trunk/reactos/base/applications/mscutils/servman/about.c trunk/reactos/base/applications/mscutils/servman/create.c trunk/reactos/base/applications/mscutils/servman/delete.c trunk/reactos/base/applications/mscutils/servman/mainwnd.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/progress.c trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/network/ftp/cmds.c trunk/reactos/base/applications/network/ftp/ftp.c trunk/reactos/base/applications/network/ftp/ftp_var.h trunk/reactos/base/applications/network/ftp/main.c trunk/reactos/base/applications/notepad/dialog.c trunk/reactos/base/applications/notepad/dialog.h trunk/reactos/base/applications/notepad/main.c trunk/reactos/base/applications/regedit/regedit.rbuild trunk/reactos/base/applications/taskmgr/perfdata.c trunk/reactos/base/applications/winhlp32/lex.yy.c trunk/reactos/base/applications/winhlp32/macro.c trunk/reactos/base/setup/usetup/cabinet.c trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/vmwinst/vmwinst.c trunk/reactos/base/setup/welcome/welcome.c trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.h trunk/reactos/base/system/smss/client.c trunk/reactos/base/system/smss/initss.c trunk/reactos/base/system/smss/smapicomp.c trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/wlx.c trunk/reactos/dll/win32/advapi32/reg/reg.c trunk/reactos/include/psdk/wincrypt.h trunk/reactos/include/psdk/winuser.h trunk/reactos/include/reactos/services/services.h Modified: trunk/reactos/base/applications/calc/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win… ============================================================================== --- trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -804,7 +804,7 @@ return str; } -static LRESULT CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) +static INT_PTR CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) { TCHAR buffer[SIZEOF(calc.buffer)]; DWORD n; @@ -1179,7 +1179,7 @@ return 1L; } -static LRESULT CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) +static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) { unsigned int x; RECT rc; Modified: trunk/reactos/base/applications/charmap/charmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/charmap.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -188,7 +188,7 @@ static -BOOL +INT_PTR CALLBACK DlgProc(HWND hDlg, UINT Message, @@ -359,7 +359,7 @@ Ret = DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_CHARMAP), NULL, - (DLGPROC)DlgProc) >= 0; + DlgProc) >= 0; UnregisterMapClasses(hInstance); } Modified: trunk/reactos/base/applications/control/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/control.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/control/control.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -24,12 +24,12 @@ _tcscpy(szParameters, _T("/n,::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}")); _tcscat(szParameters, lpFolderCLSID); - return (int) ShellExecute(NULL, - _T("open"), - _T("explorer.exe"), - szParameters, - NULL, - SW_SHOWDEFAULT) > 32; + return (INT_PTR)ShellExecute(NULL, + _T("open"), + _T("explorer.exe"), + szParameters, + NULL, + SW_SHOWDEFAULT) > 32; } static Modified: trunk/reactos/base/applications/control/control.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/control.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/control/control.h [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -15,4 +15,4 @@ /* Macro for calling "rundll32.exe" According to MSDN, ShellExecute returns a value greater than 32 if the operation was successful. */ -#define RUNDLL(param) ((int)ShellExecute(NULL, _T("open"), _T("rundll32.exe"), (param), NULL, SW_SHOWDEFAULT) > 32) +#define RUNDLL(param) ((INT_PTR)ShellExecute(NULL, _T("open"), _T("rundll32.exe"), (param), NULL, SW_SHOWDEFAULT) > 32) Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -238,7 +238,7 @@ hInst = hInstance; - DialogBox(hInst, MAKEINTRESOURCE(IDD_MAIN_DIALOG), NULL, (DLGPROC) DxDiagWndProc); + DialogBox(hInst, MAKEINTRESOURCE(IDD_MAIN_DIALOG), NULL, DxDiagWndProc); return 0; } Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -326,7 +326,7 @@ else { HWND hwnd = (HWND)parentWnd; - SendMessage(GetParent(hwnd), WM_COMMAND, MAKEWPARAM(id, BN_CLICKED), (LONG)hwnd); + SendMessage(GetParent(hwnd), WM_COMMAND, MAKEWPARAM(id, BN_CLICKED), (LONG_PTR)hwnd); } } } Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -298,7 +298,7 @@ else fDrawTips = TRUE; - if(yoffset != 0 && abs(xoffset) == 1 || xoffset != 0 && abs(yoffset) == 1) + if((yoffset != 0 && abs(xoffset) == 1) || (xoffset != 0 && abs(yoffset) == 1)) fDrawTips = TRUE; //draw horizontal strips Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -626,7 +626,7 @@ MoveDragCardTo(hdc, ix, iy); - if(attarget || ix == idestx && iy == idesty) + if(attarget || (ix == idestx && iy == idesty)) break; oldx = (int)x; Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -366,7 +366,7 @@ // // associate this class with the window // - SetWindowLong(hwnd, 0, (LONG)cs->lpCreateParams); + SetWindowLong(hwnd, 0, (LONG_PTR)cs->lpCreateParams); return 1; Modified: trunk/reactos/base/applications/games/solitaire/solgame.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solgame.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/solgame.cpp [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -118,8 +118,8 @@ } //can only drop if card is different colour - if( mystack[0].IsBlack() && !dragcard.IsRed() || - !mystack[0].IsBlack() && dragcard.IsRed() ) + if( (mystack[0].IsBlack() && !dragcard.IsRed()) || + (!mystack[0].IsBlack() && dragcard.IsRed()) ) { TRACE("EXIT RowStackDropProc(false)\n"); return false; Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -200,7 +200,7 @@ } -BOOL CALLBACK OptionsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) { @@ -358,7 +358,7 @@ } -BOOL CALLBACK CardBackDlgProc(HWND hDlg, +INT_PTR CALLBACK CardBackDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) Modified: trunk/reactos/base/applications/games/winemine/dialog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/dialog.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winemine/dialog.h [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -19,7 +19,7 @@ */ -BOOL CALLBACK CustomDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); -BOOL CALLBACK CongratsDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); -BOOL CALLBACK TimesDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); -BOOL CALLBACK AboutDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); +INT_PTR CALLBACK CustomDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); +INT_PTR CALLBACK CongratsDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); +INT_PTR CALLBACK TimesDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); +INT_PTR CALLBACK AboutDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); Modified: trunk/reactos/base/applications/msconfig/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/msconfig.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -23,12 +23,12 @@ TCITEM item; hTabWnd = GetDlgItem(hWnd, IDC_TAB); - hGeneralPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_GENERAL_PAGE), hWnd, (DLGPROC) GeneralPageWndProc); - hSystemPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SYSTEM_PAGE), hWnd, (DLGPROC) SystemPageWndProc); - hFreeLdrPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FREELDR_PAGE), hWnd, (DLGPROC) FreeLdrPageWndProc); - hServicesPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SERVICES_PAGE), hWnd, (DLGPROC) ServicesPageWndProc); - hStartupPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_STARTUP_PAGE), hWnd, (DLGPROC) StartupPageWndProc); - hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE), hWnd, (DLGPROC) ToolsPageWndProc); + hGeneralPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_GENERAL_PAGE), hWnd, GeneralPageWndProc); + hSystemPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SYSTEM_PAGE), hWnd, SystemPageWndProc); + hFreeLdrPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FREELDR_PAGE), hWnd, FreeLdrPageWndProc); + hServicesPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SERVICES_PAGE), hWnd, ServicesPageWndProc); + hStartupPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_STARTUP_PAGE), hWnd, StartupPageWndProc); + hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE), hWnd, ToolsPageWndProc); LoadString(hInst, IDS_MSCONFIG, szTemp, 256); SetWindowText(hWnd, szTemp); @@ -202,7 +202,7 @@ break; case WM_NOTIFY: - idctrl = (int)wParam; + idctrl = wParam; pnmh = (LPNMHDR)lParam; if ((pnmh->hwndFrom == hTabWnd) && (pnmh->idFrom == IDC_TAB) && @@ -251,7 +251,7 @@ hInst = hInstance; - DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, (DLGPROC) MsConfigWndProc); + DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, MsConfigWndProc); return 0; } Modified: trunk/reactos/base/applications/mscutils/devmgmt/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/about.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/about.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -9,7 +9,7 @@ #include "precomp.h" -BOOL CALLBACK +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { HWND hLicenseEditWnd; Modified: trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -464,7 +464,7 @@ DialogBox(hInstance, MAKEINTRESOURCE(IDD_ABOUTBOX), Info->hMainWnd, - (DLGPROC)AboutDialogProc); + AboutDialogProc); SetFocus(Info->hTreeView); } Modified: trunk/reactos/base/applications/mscutils/devmgmt/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/precomp.h [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -34,7 +34,7 @@ } MAIN_WND_INFO, *PMAIN_WND_INFO; -BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); /* devmgmt.c */ Modified: trunk/reactos/base/applications/mscutils/servman/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/about.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/about.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -9,7 +9,7 @@ #include "precomp.h" -BOOL CALLBACK +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) 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] Sun Dec 7 06:11:46 2008 @@ -164,7 +164,7 @@ } -BOOL CALLBACK +INT_PTR CALLBACK CreateHelpDialogProc(HWND hDlg, UINT message, WPARAM wParam, @@ -221,7 +221,7 @@ } -BOOL CALLBACK +INT_PTR CALLBACK CreateDialogProc(HWND hDlg, UINT message, WPARAM wParam, @@ -302,7 +302,7 @@ hHelp = CreateDialog(hInstance, MAKEINTRESOURCE(IDD_DLG_HELP_OPTIONS), hDlg, - (DLGPROC)CreateHelpDialogProc); + CreateHelpDialogProc); if(hHelp != NULL) { bHelpOpen = TRUE; 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] Sun Dec 7 06:11:46 2008 @@ -56,7 +56,7 @@ } -BOOL CALLBACK +INT_PTR CALLBACK DeleteDialogProc(HWND hDlg, UINT message, WPARAM wParam, Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -432,7 +432,7 @@ ret = DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_DLG_CREATE), Info->hMainWnd, - (DLGPROC)CreateDialogProc, + CreateDialogProc, (LPARAM)Info); if (ret == IDOK) RefreshServiceList(Info); @@ -448,7 +448,7 @@ DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_DLG_DELETE), Info->hMainWnd, - (DLGPROC)DeleteDialogProc, + DeleteDialogProc, (LPARAM)Info); } else @@ -569,7 +569,7 @@ DialogBox(hInstance, MAKEINTRESOURCE(IDD_ABOUTBOX), Info->hMainWnd, - (DLGPROC)AboutDialogProc); + AboutDialogProc); SetFocus(Info->hListView); break; Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -43,10 +43,10 @@ } MAIN_WND_INFO, *PMAIN_WND_INFO; -BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -BOOL CALLBACK CreateDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -BOOL CALLBACK DeleteDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -BOOL CALLBACK ProgressDialogProc(HWND hDlg, UINT Message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK CreateDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK DeleteDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK ProgressDialogProc(HWND hDlg, UINT Message, WPARAM wParam, LPARAM lParam); /* servman.c */ Modified: trunk/reactos/base/applications/mscutils/servman/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -56,7 +56,7 @@ } } -BOOL CALLBACK +INT_PTR CALLBACK ProgressDialogProc(HWND hDlg, UINT Message, WPARAM wParam, @@ -113,7 +113,7 @@ hProgDlg = CreateDialog(hInstance, MAKEINTRESOURCE(IDD_DLG_PROGRESS), hParent, - (DLGPROC)ProgressDialogProc); + ProgressDialogProc); if (hProgDlg != NULL) { /* write the info to the progress dialog */ Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -989,7 +989,7 @@ if (CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_GENERAL), pInfo->hTab, - (DLGPROC)GeneralDlgProc, + GeneralDlgProc, (LPARAM)pInfo)) { WCHAR str[256]; @@ -1004,7 +1004,7 @@ if (CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_DISPLAY), pInfo->hTab, - (DLGPROC)DisplayDlgProc, + DisplayDlgProc, (LPARAM)pInfo)) { WCHAR str[256]; @@ -1049,7 +1049,7 @@ } } -static BOOL CALLBACK +static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT Message, WPARAM wParam, @@ -1246,6 +1246,6 @@ return (DialogBoxParamW(hInst, MAKEINTRESOURCEW(IDD_CONNECTDIALOG), NULL, - (DLGPROC)DlgProc, + DlgProc, (LPARAM)pRdpSettings) == IDOK); } Modified: trunk/reactos/base/applications/network/ftp/cmds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/cmds.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/cmds.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -416,7 +416,7 @@ if (!*tp) { tp = cp; tp2 = tmpbuf; - while ((*tp2 = *tp) != (int) NULL) { + while ((*tp2 = *tp)) { if (isupper(*tp2)) { *tp2 = 'a' + *tp2 - 'A'; } @@ -573,7 +573,7 @@ if (!*tp) { tp = argv[2]; tp2 = tmpbuf; - while ((*tp2 = *tp) != (int) NULL) { + while ((*tp2 = *tp)) { if (isupper(*tp2)) { *tp2 = 'a' + *tp2 - 'A'; } @@ -715,7 +715,7 @@ if (!*tp) { tp = cp; tp2 = tmpbuf; - while ((*tp2 = *tp) != (int) NULL) { + while ((*tp2 = *tp)) { if (isupper(*tp2)) { *tp2 = 'a' + *tp2 - 'A'; } @@ -1686,7 +1686,7 @@ if (!connected) return; (void) command("QUIT"); - cout = (int) NULL; + cout = 0; connected = 0; data = -1; if (!proxy) { Modified: trunk/reactos/base/applications/network/ftp/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/ftp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/ftp.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -295,7 +295,7 @@ printf("\n"); (void) fflush(stdout); } - if (cout == (int) NULL) { + if (cout == 0) { perror ("No control connection for command"); code = -1; return (0); @@ -583,7 +583,7 @@ return; } dout = dataconn(mode); - if (dout == (int)NULL) + if (!dout) goto abort; (void) gettimeofday(&start, (struct timezone *)0); null();// oldintp = signal(SIGPIPE, SIG_IGN); @@ -887,7 +887,7 @@ } } din = dataconn("r"); - if (din == (int)NULL) + if (!din) goto abort; if (strcmp(local, "-") == 0) fout = stdout; @@ -1271,7 +1271,7 @@ if (s < 0) { perror("ftp: accept"); (void) closesocket(data), data = -1; - return (int) (NULL); + return 0; } if(closesocket(data)) { int iret=WSAGetLastError (); Modified: trunk/reactos/base/applications/network/ftp/ftp_var.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/ftp_var.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/ftp_var.h [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -48,11 +48,6 @@ #define STRU_F 1 #define STRU_R 2 #define STRU_P 3 - -#define SIGQUIT 1 -#define SIGPIPE 2 -#define SIGALRM 3 - #define FORM_N 1 #define FORM_T 2 Modified: trunk/reactos/base/applications/network/ftp/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/main.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -264,9 +264,9 @@ extern int data; if (connected) { - if (cout != (int) NULL) { + if (cout) { closesocket(cout); - cout = (int) NULL; + cout = 0; } if (data >= 0) { (void) shutdown(data, 1+1); @@ -277,9 +277,9 @@ } pswitch(1); if (connected) { - if (cout != (int)NULL) { + if (cout) { closesocket(cout); - cout = (int) NULL; + cout = 0; } connected = 0; } @@ -538,7 +538,7 @@ char *argv[]; { extern struct cmd cmdtab[]; - register struct cmd *c; + struct cmd *c; if (argc == 1) { register int i, j, w, k; @@ -591,7 +591,7 @@ else if (c == (struct cmd *)0) printf("?Invalid help command %s\n", arg); else - printf("%-*s\t%s\n", HELPINDENT, + printf("%-*s\t%s\n", (int)HELPINDENT, c->c_name, c->c_help); } (void) fflush(stdout); Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -926,7 +926,7 @@ #ifdef _MSC_VER #pragma warning(disable : 4100) #endif -BOOL CALLBACK +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { HWND hLicenseEditWnd; Modified: trunk/reactos/base/applications/notepad/dialog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.h [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -55,7 +55,7 @@ VOID DIALOG_TimeDate(VOID); -BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); /* utility functions */ VOID ShowLastError(void); Modified: trunk/reactos/base/applications/notepad/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/main.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -91,7 +91,7 @@ case CMD_ABOUT: DialogBox(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_ABOUTBOX), Globals.hMainWnd, - (DLGPROC) AboutDialogProc); + AboutDialogProc); break; case CMD_ABOUT_WINE: DIALOG_HelpAboutWine(); break; Modified: trunk/reactos/base/applications/regedit/regedit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regedit.rbuild [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<module name="regedit" type="win32gui" installname="regedit.exe"> +<module name="regedit" type="win32gui" installname="regedit.exe" allowwarnings="true"> <include base="regedit">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> @@ -10,7 +10,6 @@ <library>user32</library> <library>gdi32</library> <library>advapi32</library> - <library>comdlg32</library> <library>ole32</library> <library>shell32</library> <library>comctl32</library> Modified: trunk/reactos/base/applications/taskmgr/perfdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -88,7 +88,7 @@ void PerfDataRefresh(void) { - SIZE_T ulSize; + ULONG ulSize; NTSTATUS status; LPBYTE pBuffer; ULONG BufferSize; @@ -393,7 +393,7 @@ for (Index = 0; Index < ProcessCount; Index++) { - if ((DWORD)pPerfData[Index].ProcessId == dwProcessId) + if (PtrToUlong(pPerfData[Index].ProcessId) == dwProcessId) { FoundIndex = Index; break; @@ -412,7 +412,7 @@ EnterCriticalSection(&PerfDataCriticalSection); if (Index < ProcessCount) - ProcessId = (ULONG)pPerfData[Index].ProcessId; + ProcessId = PtrToUlong(pPerfData[Index].ProcessId); else ProcessId = 0; Modified: trunk/reactos/base/applications/winhlp32/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lex.yy.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lex.yy.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -1670,7 +1670,7 @@ void macro_test(void) { WNDPROC lpfnDlg = MakeProcInstance(MACRO_TestDialogProc, Globals.hInstance); - DialogBox(Globals.hInstance, STRING_DIALOG_TEST, Globals.active_win->hMainWnd, (DLGPROC)lpfnDlg); + DialogBox(Globals.hInstance, STRING_DIALOG_TEST, Globals.active_win->hMainWnd, lpfnDlg); FreeProcInstance(lpfnDlg); macro = szTestMacro; } Modified: trunk/reactos/base/applications/winhlp32/macro.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -848,7 +848,7 @@ dll->class = dll->handler ? (dll->handler)(DW_WHATMSG, 0, 0) : DC_NOMSG; WINE_TRACE("Got class %x for DLL %s\n", dll->class, dll_name); if (dll->class & DC_INITTERM) dll->handler(DW_INIT, 0, 0); - if (dll->class & DC_CALLBACKS) dll->handler(DW_CALLBACKS, (DWORD)Callbacks, 0); + if (dll->class & DC_CALLBACKS) dll->handler(DW_CALLBACKS, (DWORD_PTR)Callbacks, 0); } else WINE_WARN("OOM\n"); } Modified: trunk/reactos/base/setup/usetup/cabinet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/cabinet.… ============================================================================== --- trunk/reactos/base/setup/usetup/cabinet.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/cabinet.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -148,7 +148,7 @@ return CS_BADSTREAM; } - ZStream.next_in = (PUCHAR)((ULONG)InputBuffer + 2); + ZStream.next_in = ((PUCHAR)InputBuffer )+ 2; ZStream.avail_in = *InputLength - 2; ZStream.next_out = (PUCHAR)OutputBuffer; ZStream.avail_out = abs(*OutputLength); Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -699,7 +699,7 @@ INFCONTEXT Context; PWCHAR Value; UINT ErrorLine; - SIZE_T ReturnSize; + ULONG ReturnSize; CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -903,7 +903,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; SYSTEM_DEVICE_INFORMATION Sdi; IO_STATUS_BLOCK Iosb; - SIZE_T ReturnSize; + ULONG ReturnSize; NTSTATUS Status; ULONG DiskNumber; WCHAR Buffer[MAX_PATH]; Modified: trunk/reactos/base/setup/vmwinst/vmwinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/vmwinst… ============================================================================== --- trunk/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -504,7 +504,7 @@ } cleanup: - hThread = (HANDLE)InterlockedExchange((LONG*)&hInstallationThread, 0); + hThread = InterlockedExchangePointer((PVOID*)&hInstallationThread, 0); if(hThread != NULL) { CloseHandle(hThread); Modified: trunk/reactos/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -179,7 +179,7 @@ rcRightPanel.left = rcLeftPanel.right; rcRightPanel.right = ulInnerWidth - 1; - if (!LoadString(hInstance, (UINT)MAKEINTRESOURCE(IDS_APPTITLE), szAppTitle, 80)) + if (!LoadString(hInstance, (UINT_PTR)MAKEINTRESOURCE(IDS_APPTITLE), szAppTitle, 80)) _tcscpy(szAppTitle, TEXT("ReactOS Welcome")); /* Create main window */ @@ -386,7 +386,7 @@ rcLeftPanel.right - rcLeftPanel.left, dwHeight, hWnd, - (HMENU)i, + (HMENU)IntToPtr(i), hInstance, NULL); hwndDefaultTopic = hwndTopicButton[i]; Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -307,10 +307,10 @@ ret = (hShExt)(NULL, _T("open"), filename, NULL, NULL, SW_SHOWNORMAL); - TRACE ("RunFile: ShellExecuteA/W returned %d\n", (DWORD)ret); + TRACE ("RunFile: ShellExecuteA/W returned 0x%p\n", ret); FreeLibrary(hShell32); - return (((DWORD)ret) > 32); + return (((DWORD_PTR)ret) > 32); } Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -117,13 +117,13 @@ PSERVICE -ScmGetServiceEntryByClientHandle(ULONG Handle) +ScmGetServiceEntryByClientHandle(HANDLE Handle) { PLIST_ENTRY ServiceEntry; PSERVICE CurrentService; DPRINT("ScmGetServiceEntryByClientHandle() called\n"); - DPRINT("looking for %lu\n", Handle); + DPRINT("looking for %p\n", Handle); ServiceEntry = ServiceListHead.Flink; while (ServiceEntry != &ServiceListHead) Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -1018,7 +1018,7 @@ return ERROR_INVALID_HANDLE; } - lpService = ScmGetServiceEntryByClientHandle(hServiceStatus); + lpService = ScmGetServiceEntryByClientHandle((HANDLE)hServiceStatus); if (lpService == NULL) { DPRINT1("lpService == NULL!\n"); Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.h [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -107,7 +107,7 @@ PSERVICE ScmGetServiceEntryByName(LPWSTR lpServiceName); PSERVICE ScmGetServiceEntryByDisplayName(LPWSTR lpDisplayName); PSERVICE ScmGetServiceEntryByResumeCount(DWORD dwResumeCount); -PSERVICE ScmGetServiceEntryByClientHandle(ULONG ThreadId); +PSERVICE ScmGetServiceEntryByClientHandle(HANDLE Handle); DWORD ScmCreateNewServiceRecord(LPWSTR lpServiceName, PSERVICE *lpServiceRecord); VOID ScmDeleteServiceRecord(PSERVICE lpService); Modified: trunk/reactos/base/system/smss/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/client.c?… ============================================================================== --- trunk/reactos/base/system/smss/client.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/client.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -435,7 +435,7 @@ SmpClientDirectory.CandidateClient->ServerProcess = (HANDLE) ProcessInfo->ProcessHandle; SmpClientDirectory.CandidateClient->ServerProcessId = - (ULONG) ProcessInfo->ClientId.UniqueProcess; + (DWORD_PTR) ProcessInfo->ClientId.UniqueProcess; /* * Copy the program name */ Modified: trunk/reactos/base/system/smss/initss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initss.c?… ============================================================================== --- trunk/reactos/base/system/smss/initss.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/initss.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -41,8 +41,8 @@ RtlZeroMemory (& ProcessInfo, sizeof ProcessInfo); ProcessInfo.Size = sizeof ProcessInfo; - ProcessInfo.ProcessHandle = (HANDLE) SmSsProcessId; - ProcessInfo.ClientId.UniqueProcess = (HANDLE) SmSsProcessId; + ProcessInfo.ProcessHandle = (HANDLE) UlongToPtr(SmSsProcessId); + ProcessInfo.ClientId.UniqueProcess = (HANDLE) UlongToPtr(SmSsProcessId); DPRINT("SM: %s: ProcessInfo.ProcessHandle=%p\n", __FUNCTION__,ProcessInfo.ProcessHandle); Status = SmCreateClient (& ProcessInfo, PgmName); Modified: trunk/reactos/base/system/smss/smapicomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smapicomp… ============================================================================== --- trunk/reactos/base/system/smss/smapicomp.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smapicomp.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -24,7 +24,7 @@ DPRINT("SM: %s: ClientId.UniqueProcess=%p\n", __FUNCTION__, Request->Header.ClientId.UniqueProcess); - Status = SmCompleteClientInitialization ((ULONG) Request->Header.ClientId.UniqueProcess); + Status = SmCompleteClientInitialization (PtrToUlong(Request->Header.ClientId.UniqueProcess)); if (!NT_SUCCESS(Status)) { DPRINT1("SM: %s: SmCompleteClientInitialization failed (Status=0x%08lx)\n", Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -505,7 +505,7 @@ return STATUS_SUCCESS; } -static BOOL CALLBACK +static INT_PTR CALLBACK ShutdownComputerWindowProc( IN HWND hwndDlg, IN UINT uMsg, Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -185,7 +185,7 @@ return Session->Gina.Functions.WlxRemoveStatusMessage(Session->Gina.Context); } -static BOOL CALLBACK +static INT_PTR CALLBACK GinaLoadFailedWindowProc( IN HWND hwndDlg, IN UINT uMsg, Modified: trunk/reactos/base/system/winlogon/wlx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/wlx.c… ============================================================================== --- trunk/reactos/base/system/winlogon/wlx.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/wlx.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -23,7 +23,7 @@ /* FUNCTIONS ****************************************************************/ -static BOOL CALLBACK +static INT_PTR CALLBACK DefaultWlxWindowProc( IN HWND hwndDlg, IN UINT uMsg, Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -403,7 +403,7 @@ NTSTATUS Status; /* don't close null handle or a pseudo handle */ - if ((!hKey) || (((ULONG)hKey & 0xF0000000) == 0x80000000)) + if ((!hKey) || (((ULONG_PTR)hKey & 0xF0000000) == 0x80000000)) { return ERROR_INVALID_HANDLE; } @@ -1031,7 +1031,7 @@ return RtlNtStatusToDosError(Status); } - TRACE("ParentKey %x\n", (ULONG)ParentKey); + TRACE("ParentKey %p\n", ParentKey); if (lpClass != NULL) { @@ -1105,7 +1105,7 @@ return RtlNtStatusToDosError(Status); } - TRACE("ParentKey %x\n", (ULONG)ParentKey); + TRACE("ParentKey %p\n", ParentKey); RtlInitUnicodeString(&ClassString, lpClass); Modified: trunk/reactos/include/psdk/wincrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincrypt.h?re… ============================================================================== --- trunk/reactos/include/psdk/wincrypt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincrypt.h [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -3788,7 +3788,7 @@ WINADVAPI BOOL WINAPI CryptHashData (HCRYPTHASH, CONST BYTE *, DWORD, DWORD); WINADVAPI BOOL WINAPI CryptHashSessionKey (HCRYPTHASH, HCRYPTKEY, DWORD); WINADVAPI BOOL WINAPI CryptImportKey (HCRYPTPROV, CONST BYTE *, DWORD, HCRYPTKEY, DWORD, HCRYPTKEY *); -WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, ULONG_PTR); +WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, DWORD); WINADVAPI BOOL WINAPI CryptSetHashParam (HCRYPTHASH, DWORD, CONST BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetKeyParam (HCRYPTKEY, DWORD, CONST BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetProviderA (LPCSTR, DWORD); Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -2703,7 +2703,7 @@ #define STATE_SYSTEM_VALID 0x1fffffff #ifndef RC_INVOKED -typedef BOOL(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM); +typedef INT_PTR(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM); typedef VOID(CALLBACK *TIMERPROC)(HWND,UINT,UINT,DWORD); typedef BOOL(CALLBACK *GRAYSTRINGPROC)(HDC,LPARAM,int); typedef LRESULT(CALLBACK *HOOKPROC)(int,WPARAM,LPARAM); Modified: trunk/reactos/include/reactos/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/services/s… ============================================================================== --- trunk/reactos/include/reactos/services/services.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/services/services.h [iso-8859-1] Sun Dec 7 06:11:46 2008 @@ -11,7 +11,7 @@ #define SERVICE_CONTROL_START 0 -typedef DWORD CLIENT_HANDLE; +DECLARE_HANDLE(CLIENT_HANDLE); typedef struct _SCM_CONTROL_PACKET {

16 years

[tkreuzer] 37909: don't truncate a handle

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Dec 7 04:56:42 2008 New Revision: 37909 URL: http://svn.reactos.org/svn/reactos?rev=37909&view=rev Log: don't truncate a handle Modified: branches/ros-amd64-bringup/reactos/base/system/services/rpcserver.c Modified: branches/ros-amd64-bringup/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Dec 7 04:56:42 2008 @@ -1018,7 +1018,7 @@ return ERROR_INVALID_HANDLE; } - lpService = ScmGetServiceEntryByClientHandle(LongToPtr(hServiceStatus)); + lpService = ScmGetServiceEntryByClientHandle((HANDLE)hServiceStatus); if (lpService == NULL) { DPRINT1("lpService == NULL!\n");

16 years

[tkreuzer] 37908: fix definition of SOCKET TODO: revert "fixes" to code dealing with broken SOCKET definition

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Dec 7 02:36:06 2008 New Revision: 37908 URL: http://svn.reactos.org/svn/reactos?rev=37908&view=rev Log: fix definition of SOCKET TODO: revert "fixes" to code dealing with broken SOCKET definition Modified: branches/ros-amd64-bringup/reactos/include/psdk/winsock.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/winsock.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winsock.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winsock.h [iso-8859-1] Sun Dec 7 02:36:06 2008 @@ -26,7 +26,7 @@ typedef unsigned long u_long; #define _BSDTYPES_DEFINED #endif /* !defined _BSDTYPES_DEFINED */ -typedef u_int SOCKET; +typedef UINT_PTR SOCKET; #ifndef FD_SETSIZE #define FD_SETSIZE 64 #endif

16 years

[tkreuzer] 37907: clear direction flag on interrupt

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 6 17:37:30 2008 New Revision: 37907 URL: http://svn.reactos.org/svn/reactos?rev=37907&view=rev Log: clear direction flag on interrupt Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Sat Dec 6 17:37:30 2008 @@ -129,6 +129,8 @@ // KTRAP_FRAME_LastExceptionFromRip // KTRAP_FRAME_TrapFrame + /* Make sure the direction flag is cleared */ + cld .endm .macro LEAVE_TRAP_FRAME

16 years

[ekohl] 37906: - Introduce a common header file. - Use Wine-style debug code everywhere.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Dec 6 15:33:49 2008 New Revision: 37906 URL: http://svn.reactos.org/svn/reactos?rev=37906&view=rev Log: - Introduce a common header file. - Use Wine-style debug code everywhere. Added: trunk/reactos/dll/win32/lsasrv/lsasrv.h (with props) Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.c Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sat Dec 6 15:33:49 2008 @@ -6,6 +6,7 @@ #define NTOS_MODE_USER #include <ndk/ntndk.h> +#include "lsasrv.h" #include "lsa_s.h" #include <wine/debug.h> Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] Sat Dec 6 15:33:49 2008 @@ -3,10 +3,11 @@ #define NTOS_MODE_USER #include <ndk/ntndk.h> -#define NDEBUG -#include <debug.h> +#include "lsasrv.h" -VOID LsarStartRpcServer(VOID); +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); NTSTATUS WINAPI @@ -14,7 +15,7 @@ { HANDLE hEvent; - DPRINT("LsapInitLsa() called\n"); + TRACE("LsapInitLsa()\n"); LsarStartRpcServer(); @@ -29,6 +30,7 @@ return STATUS_SUCCESS; } + void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) { return RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, len); @@ -40,5 +42,4 @@ RtlFreeHeap(RtlGetProcessHeap(), 0, ptr); } - /* EOF */ Added: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h (added) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Sat Dec 6 15:33:49 2008 @@ -1,0 +1,12 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Local Security Authority (LSA) Server + * FILE: reactos/dll/win32/lsasrv/lsasrv.h + * PURPOSE: + * + * PROGRAMMERS: Eric Kohl + */ + +/* lsarpc.c */ +VOID LsarStartRpcServer(VOID); + Propchange: trunk/reactos/dll/win32/lsasrv/lsasrv.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/lsasrv/lsasrv.h ------------------------------------------------------------------------------ svn:keywords = author date revision

16 years

[fireball] 37905: - Fix a potential case of non-paged pool memory double freeing. Spotted by Michael Martin.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Dec 6 13:35:54 2008 New Revision: 37905 URL: http://svn.reactos.org/svn/reactos?rev=37905&view=rev Log: - Fix a potential case of non-paged pool memory double freeing. Spotted by Michael Martin. Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=379… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Sat Dec 6 13:35:54 2008 @@ -991,7 +991,6 @@ if (!KeInsertQueueApc(Apc, Apc, NULL, 2)) { /* The APC was already in the queue, fail */ - ExFreePool(Apc); Status = STATUS_UNSUCCESSFUL; } else

16 years

← Newer
1
...
56
57
58
59
60
61
62
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2008