- Ros-dev - ReactOS.org

Re: [ros-svn] [ion] 12740: Fix my previous patch and fix ACCESS_TOKEN being declared as a structure. This is incompatible with DDK/W32API because ACCESS_TOKEN is a PVOID. The real structure is TOKEN. Also, structure has been updated.

by eric.kohl＠t-online.de

ion(a)svn.reactos.com wrote: > Fix my previous patch and fix ACCESS_TOKEN being declared as a structure. This is incompatible with DDK/W32API because ACCESS_TOKEN is a PVOID. The real structure is TOKEN. Also, structure has been updated. > I think Microsoft declared PACCESS_TOKEN as a void pointer in order to hide the internals of ACCESS_TOKEN because the average developer does not need to access it or they don't want to reveal more information than needed. Please don't break what's working and revert this patch! We are using our own set of headers because we need to fix crippled declarations and add missing ones. If you want to build ReactOS using the MS SDK and DDK fix them instead of breaking our headers and code. Regards, Eric

20 years, 10 months

3
2
0 0

Re: [ros-svn] [ion] 12738: Fix KeRaiseUserException and rename Object Information Structure

by eric.kohl＠t-online.de

ion(a)svn.reactos.com schrieb: > Fix KeRaiseUserException and rename Object Information Structure Alex, Please explain why you renamed the DIRECTORY_BASIC_INFORMATION structure to OBJECT_DIRECTORY_INFORMATION? All publicly available sources call it DIRECTORY_BASIC_INFORMATION so I think there is no need to rename it. Please revert that modification because you are replacing a well-known structure by an unknown one. Regards, Eric

20 years, 10 months

2
1
0 0

Re: [ros-dev] Re:[ros-svn] [ion] 12748: Fix incorrect LPC Object export...we export pointers not the object itself! Also remove

by ea＠iol.it

> > I think that Alex's changes are correct. If Alex's changes are wrong, > > all other type object initialisations are also wrong. There is only > > one little bug, the EXPORTED/IMPORTED definition is missing. > > Hmm, you might be right... > > POBJECT_TYPE _LpcPortObjectType; /* <- Debug symbols */ > extern NTOSAPI POBJECT_TYPE LpcPortObjectType; /* <- W32API headers */ > > POBJECT_TYPE _IoFileObjectType; /* <- Debug symbols */ > extern POBJECT_TYPE *IoFileObjectType; /* <- Official DDK headers */ > extern NTOSAPI POBJECT_TYPE IoFileObjectType; /* <- W32API headers */ > DATA symbols are pointers to outside referers. When you lookup IoFileObjectType in the .edata section you get the RVA, that is a (sort of) base address of OBJECT_TYPE, i.e. a POBJECT_TYPE. Emanuele ____________________________________________________________ Libero ADSL: 3 mesi gratis e navighi a 1.2 Mega. E poi hai l'Adsl senza limiti a meno di 1 euro al giorno. Abbonati subito senza costi di attivazione su http://www.libero.it

20 years, 10 months

1
0
0 0

Re: [ros-dev] Re:[ros-svn] [ion] 12748: Fix incorrect LPC Object export...we export pointers not the object itself! Also remove

by ea＠iol.it

> I think that Alex's changes are correct. If Alex's changes are wrong, > all other type object initialisations are also wrong. There is only one > little bug, the EXPORTED/IMPORTED definition is missing. Imho "all other type object initialisations are also wrong". I made the Ob type descriptor for the LPC Port static and exported its addess, because it makes no sense to me dynamically allocating it (first try was tag-allocating it). Ob type objects live for as long as the executive lives: why are they dynamic? Will we support Ob restarting? Anyway, I did not mean starting a religion war. Emanuele ____________________________________________________________ Libero ADSL: 3 mesi gratis e navighi a 1.2 Mega. E poi hai l'Adsl senza limiti a meno di 1 euro al giorno. Abbonati subito senza costi di attivazione su http://www.libero.it

20 years, 10 months

1
0
0 0

Re: [ros-svn] [ion] 12738: Fix KeRaiseUserException and rename Object Information Structure

by Hartmut Birr

ion(a)svn.reactos.com schrieb: >Fix KeRaiseUserException and rename Object Information Structure > > >Updated files: >trunk/reactos/config >trunk/reactos/include/ntos/zwtypes.h >trunk/reactos/ntoskrnl/ke/i386/exp.c >trunk/reactos/ntoskrnl/ob/dirobj.c > >_______________________________________________ > > Hi, this changes does break the compiling of reactos. - Hartmut services: [CC] database.c database.c: In function `ScmCheckDriver': database.c:393: error: `PDIRECTORY_BASIC_INFORMATION' undeclared (first use in this function) database.c:393: error: (Each undeclared identifier is reported only once database.c:393: error: for each function it appears in.) database.c:393: error: syntax error before "DirInfo" database.c:427: error: `DIRECTORY_BASIC_INFORMATION' undeclared (first use in this function) database.c:429: error: `DirInfo' undeclared (first use in this function) _make[1]: *** [database.o] Error 1 _make: *** [services] Error 2

20 years, 10 months

2
1
0 0

[Fwd: Re: [ros-dev] We have a web browser] - Test of ActiveX Control NOK

by Gge

I tested this feature as described in the initial mail ( urlmon+shdocvw dlls are included in the build ) but it fails when I hit the "Web" button with the following debug messages . Any idea about this behavior ? ---------------------------------------------------------------- (shell32_main.c:396:SHGetFileInfoW) set icon to link, stub (shell32_main.c:396:SHGetFileInfoW) set icon to link, stub (compobj.c:1612:CoCreateInstance) no classfactory created for CLSID {8856f961-340a-11d0-a96b-00c04fd705a2}, hres is 0x80040154 (compobj.c:1612:CoCreateInstance) no classfactory created for CLSID {1339b54c-3453-11d2-93b9-000000000000}, hres is 0x80040154 (shell32_main.c:396:SHGetFileInfoW) set icon to link, stub (shell32_main.c:396:SHGetFileInfoW) set icon to link, stub --------------------------------------------------------------- Regards Gerard

20 years, 10 months

1
0
0 0

packet manager

by Maarten Bosma

Hi, Me and some guys on the forum were thinking, about coding a packet manager for ROS. (http://reactos.com/forum/viewtopic.php?t=164) But we would need some kind of script language. We were also thinking about using XML instead of a real lang., but a real one like python would offer much more flexibility. So my question is if you think about the packet manager idea and if you would agree to a lib like python to the tree. Maarten Bosma alias Dr. Fred

20 years, 10 months

4
6
0 0

svn?

by Ryan O'Connor

Can we use SVN yet? I have TortoiseSVN but what are the connection details? --- Outgoing mail is certified Virus Free. Checked by AVG anti-virus system (http://www.grisoft.com). Version: 6.0.808 / Virus Database: 550 - Release Date: 12/8/2004

20 years, 10 months

3
2
0 0

Re: [ros-svn] [ekohl] 12676: Don't start services until the control pipe issues are fixed.

by Hartmut Birr

ekohl(a)svn.reactos.com schrieb: >Don't start services until the control pipe issues are fixed. > > >Updated files: >trunk/reactos/subsys/system/services/database.c > >_______________________________________________ >Ros-svn mailing list >Ros-svn(a)reactos.com >http://reactos.com:8080/mailman/listinfo/ros-svn > > > > Hi, it is more wrong with the pipes. Compiling ros on ros doesn't work. - Hartmut

20 years, 10 months

3
4
0 0

Memory Area Patch

by Filip Navara

Hi! For the past few nights I've been working on a patch to convert MEMORY_AREAs from using lists to use binary search tree. The result of the work is attached. It's not optimized yet, but in the worst case it will be as slow as the list implementation. Since the patch is getting rather big I want to commit it in SVN before further working on it. So I'm hereby asking for review/testing in order to ensure that it will not break anything. Thanks, Filip P.S. Many thanks to Royce Michell III and Mike Nordell for helping me to get this beast working. Index: ps/w32call.c =================================================================== --- ps/w32call.c (revision 12712) +++ ps/w32call.c (working copy) @@ -163,11 +163,10 @@ PsFreeCallbackStack(PVOID StackLimit) { MmLockAddressSpace(MmGetKernelAddressSpace()); - MmFreeMemoryArea(MmGetKernelAddressSpace(), - StackLimit, - MM_STACK_SIZE, - PsFreeCallbackStackPage, - NULL); + MmFreeMemoryAreaByPtr(MmGetKernelAddressSpace(), + StackLimit, + PsFreeCallbackStackPage, + NULL); MmUnlockAddressSpace(MmGetKernelAddressSpace()); } Index: include/internal/mm.h =================================================================== --- include/internal/mm.h (revision 12712) +++ include/internal/mm.h (working copy) @@ -184,15 +184,17 @@ #endif /* __USE_W32API */ -typedef struct +typedef struct _MEMORY_AREA { + PVOID StartingAddress; + PVOID EndingAddress; + struct _MEMORY_AREA *Parent; + struct _MEMORY_AREA *LeftChild; + struct _MEMORY_AREA *RightChild; ULONG Type; - PVOID BaseAddress; - ULONG Length; ULONG Attributes; - LIST_ENTRY Entry; ULONG LockCount; - struct _EPROCESS* Process; + struct _EPROCESS* Process; /* FIXME: We don't need this! */ BOOLEAN DeleteInProgress; ULONG PageOpCount; union @@ -215,7 +217,7 @@ typedef struct _MADDRESS_SPACE { - LIST_ENTRY MAreaListHead; + PMEMORY_AREA MemoryAreaRoot; FAST_MUTEX Lock; PVOID LowestAddress; struct _EPROCESS* Process; @@ -333,6 +335,10 @@ LIST_ENTRY RegionListEntry; } MM_REGION, *PMM_REGION; +typedef VOID (*PMM_FREE_PAGE_FUNC)(PVOID Context, PMEMORY_AREA MemoryArea, + PVOID Address, PFN_TYPE Page, + SWAPENTRY SwapEntry, BOOLEAN Dirty); + /* FUNCTIONS */ /* aspace.c ******************************************************************/ @@ -354,49 +360,68 @@ /* marea.c *******************************************************************/ -NTSTATUS MmCreateMemoryArea(struct _EPROCESS* Process, - PMADDRESS_SPACE AddressSpace, - ULONG Type, - PVOID* BaseAddress, - ULONG Length, - ULONG Attributes, - MEMORY_AREA** Result, - BOOL FixedAddress, - BOOL TopDown, - PHYSICAL_ADDRESS BoundaryAddressMultiple OPTIONAL); +NTSTATUS INIT_FUNCTION +MmInitMemoryAreas(VOID); -MEMORY_AREA* MmOpenMemoryAreaByAddress(PMADDRESS_SPACE AddressSpace, - PVOID Address); +NTSTATUS STDCALL +MmCreateMemoryArea( + struct _EPROCESS* Process, + PMADDRESS_SPACE AddressSpace, + ULONG Type, + PVOID *BaseAddress, + ULONG_PTR Length, + ULONG Attributes, + PMEMORY_AREA *Result, + BOOLEAN FixedAddress, + BOOLEAN TopDown, + PHYSICAL_ADDRESS BoundaryAddressMultiple OPTIONAL); -ULONG MmFindGapAtAddress(PMADDRESS_SPACE AddressSpace, - PVOID Address); +PMEMORY_AREA STDCALL +MmOpenMemoryAreaByAddress( + PMADDRESS_SPACE AddressSpace, + PVOID Address); -NTSTATUS MmInitMemoryAreas(VOID); +ULONG STDCALL +MmFindGapAtAddress( + PMADDRESS_SPACE AddressSpace, + PVOID Address); -NTSTATUS MmFreeMemoryArea(PMADDRESS_SPACE AddressSpace, - PVOID BaseAddress, - ULONG Length, - VOID (*FreePage)(PVOID Context, MEMORY_AREA* MemoryArea, - PVOID Address, PFN_TYPE Page, SWAPENTRY SwapEntry, - BOOLEAN Dirty), - PVOID FreePageContext); +NTSTATUS STDCALL +MmFreeMemoryArea( + PMADDRESS_SPACE AddressSpace, + PMEMORY_AREA MemoryArea, + PMM_FREE_PAGE_FUNC FreePage, + PVOID FreePageContext); -VOID MmDumpMemoryAreas(PLIST_ENTRY ListHead); +NTSTATUS STDCALL +MmFreeMemoryAreaByPtr( + PMADDRESS_SPACE AddressSpace, + PVOID BaseAddress, + PMM_FREE_PAGE_FUNC FreePage, + PVOID FreePageContext); -NTSTATUS MmLockMemoryArea(MEMORY_AREA* MemoryArea); +VOID STDCALL +MmDumpMemoryAreas(PMADDRESS_SPACE AddressSpace); -NTSTATUS MmUnlockMemoryArea(MEMORY_AREA* MemoryArea); +PMEMORY_AREA STDCALL +MmOpenMemoryAreaByRegion( + PMADDRESS_SPACE AddressSpace, + PVOID Address, + ULONG_PTR Length); -MEMORY_AREA* MmOpenMemoryAreaByRegion(PMADDRESS_SPACE AddressSpace, - PVOID Address, - ULONG Length); +PVOID STDCALL +MmFindGap( + PMADDRESS_SPACE AddressSpace, + ULONG_PTR Length, + ULONG_PTR Granularity, + BOOLEAN TopDown); -PVOID MmFindGap(PMADDRESS_SPACE AddressSpace, ULONG Length, ULONG Granularity, BOOL TopDown); +VOID STDCALL +MmReleaseMemoryAreaIfDecommitted( + PEPROCESS Process, + PMADDRESS_SPACE AddressSpace, + PVOID BaseAddress); -void MmReleaseMemoryAreaIfDecommitted(PEPROCESS Process, - PMADDRESS_SPACE AddressSpace, - PVOID BaseAddress); - /* npool.c *******************************************************************/ VOID MiDebugDumpNonPagedPool(BOOLEAN NewOnly); Index: cc/view.c =================================================================== --- cc/view.c (revision 12712) +++ cc/view.c (working copy) @@ -813,8 +813,7 @@ #else MmLockAddressSpace(MmGetKernelAddressSpace()); MmFreeMemoryArea(MmGetKernelAddressSpace(), - CacheSeg->BaseAddress, - CacheSeg->Bcb->CacheSegmentSize, + CacheSeg->MemoryArea, CcFreeCachePage, NULL); MmUnlockAddressSpace(MmGetKernelAddressSpace()); Index: ke/i386/exp.c =================================================================== --- ke/i386/exp.c (revision 12712) +++ ke/i386/exp.c (working copy) @@ -320,7 +320,7 @@ { KeRosPrintAddress((PVOID)Frame[1]); Frame = (PULONG)Frame[0]; - DbgPrint(" "); + DbgPrint("\n"); } #else DbgPrint("Frames: "); @@ -663,7 +663,7 @@ break; StackBase = Frame; Frame = (PULONG)Frame[0]; - DbgPrint(" "); + DbgPrint("\n"); } } _SEH_HANDLE Index: ke/bug.c =================================================================== --- ke/bug.c (revision 12712) +++ ke/bug.c (working copy) @@ -116,6 +116,11 @@ Ke386DisableInterrupts(); DebugLogDumpMessages(); + if (MmGetKernelAddressSpace()->Lock.Owner == KeGetCurrentThread()) + { + MmUnlockAddressSpace(MmGetKernelAddressSpace()); + } + if (KeGetCurrentIrql() < DISPATCH_LEVEL) { KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); Index: ke/kthread.c =================================================================== --- ke/kthread.c (revision 12712) +++ ke/kthread.c (working copy) @@ -90,11 +90,10 @@ if (Thread->StackLimit != (ULONG_PTR)&init_stack) { MmLockAddressSpace(MmGetKernelAddressSpace()); - MmFreeMemoryArea(MmGetKernelAddressSpace(), - (PVOID)Thread->StackLimit, - MM_STACK_SIZE, - KeFreeStackPage, - NULL); + MmFreeMemoryAreaByPtr(MmGetKernelAddressSpace(), + (PVOID)Thread->StackLimit, + KeFreeStackPage, + NULL); MmUnlockAddressSpace(MmGetKernelAddressSpace()); } Thread->StackLimit = 0; Index: mm/section.c =================================================================== --- mm/section.c (revision 12712) +++ mm/section.c (working copy) @@ -611,7 +611,7 @@ ULONG Offset; PFN_TYPE Page; NTSTATUS Status; - ULONG PAddress; + PVOID PAddress; PSECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; ULONG Entry; @@ -635,12 +635,12 @@ return(STATUS_SUCCESS); } - PAddress = (ULONG)PAGE_ROUND_DOWN(((ULONG)Address)); - Offset = PAddress - (ULONG)MemoryArea->BaseAddress; + PAddress = MM_ROUND_DOWN(Address, PAGE_SIZE); + Offset = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress; Segment = MemoryArea->Data.SectionData.Segment; Section = MemoryArea->Data.SectionData.Section; - Region = MmFindRegion(MemoryArea->BaseAddress, + Region = MmFindRegion(MemoryArea->StartingAddress, &MemoryArea->Data.SectionData.RegionListHead, Address, NULL); /* @@ -1129,7 +1129,7 @@ PFN_TYPE NewPage; PVOID NewAddress; NTSTATUS Status; - ULONG PAddress; + PVOID PAddress; ULONG Offset; PMM_PAGEOP PageOp; PMM_REGION Region; @@ -1148,12 +1148,12 @@ /* * Find the offset of the page */ - PAddress = (ULONG)PAGE_ROUND_DOWN(((ULONG)Address)); - Offset = PAddress - (ULONG)MemoryArea->BaseAddress; + PAddress = MM_ROUND_DOWN(Address, PAGE_SIZE); + Offset = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress; Segment = MemoryArea->Data.SectionData.Segment; Section = MemoryArea->Data.SectionData.Section; - Region = MmFindRegion(MemoryArea->BaseAddress, + Region = MmFindRegion(MemoryArea->StartingAddress, &MemoryArea->Data.SectionData.RegionListHead, Address, NULL); /* @@ -1181,7 +1181,7 @@ PFN_FROM_SSE(Entry) != OldPage) { /* This is a private page. We must only change the page protection. */ - MmSetPageProtect(AddressSpace->Process, (PVOID)PAddress, Region->Protect); + MmSetPageProtect(AddressSpace->Process, PAddress, Region->Protect); return(STATUS_SUCCESS); } @@ -1244,7 +1244,7 @@ */ NewAddress = ExAllocatePageWithPhysPage(NewPage); - memcpy(NewAddress, (PVOID)PAddress, PAGE_SIZE); + memcpy(NewAddress, PAddress, PAGE_SIZE); ExUnmapPage(NewAddress); /* @@ -1267,7 +1267,7 @@ KEBUGCHECK(0); return(Status); } - MmInsertRmap(NewPage, AddressSpace->Process, (PVOID)PAddress); + MmInsertRmap(NewPage, AddressSpace->Process, PAddress); if (!NT_SUCCESS(Status)) { DbgPrint("Unable to create virtual mapping\n"); @@ -1282,7 +1282,7 @@ /* * Unshare the old page. */ - MmDeleteRmap(OldPage, AddressSpace->Process, (PVOID)PAddress); + MmDeleteRmap(OldPage, AddressSpace->Process, PAddress); MmLockSectionSegment(Segment); MmUnsharePageEntrySectionSegment(Section, Segment, Offset, FALSE, FALSE); MmUnlockSectionSegment(Segment); @@ -1351,7 +1351,7 @@ Context.Segment = MemoryArea->Data.SectionData.Segment; Context.Section = MemoryArea->Data.SectionData.Section; - Context.Offset = (ULONG)((char*)Address - (ULONG)MemoryArea->BaseAddress); + Context.Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress; FileOffset = Context.Offset + Context.Segment->FileOffset; IsImageSection = Context.Section->AllocationAttributes & SEC_IMAGE ? TRUE : FALSE; @@ -1691,7 +1691,7 @@ Address = (PVOID)PAGE_ROUND_DOWN(Address); - Offset = (ULONG)((char*)Address - (ULONG)MemoryArea->BaseAddress); + Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress; /* * Get the segment and section. @@ -1855,7 +1855,7 @@ ULONG Entry; PFN_TYPE Page; - Offset = (ULONG)Address - (ULONG)MemoryArea->BaseAddress; + Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress; Entry = MmGetPageEntrySectionSegment(Segment, Offset); Page = MmGetPfnForProcess(AddressSpace->Process, Address); @@ -1889,12 +1889,12 @@ NTSTATUS Status; Length = - min(Length, (ULONG) ((char*)MemoryArea->BaseAddress + MemoryArea->Length - (char*)BaseAddress)); - Region = MmFindRegion(MemoryArea->BaseAddress, + min(Length, (ULONG_PTR)MemoryArea->EndingAddress - (ULONG_PTR)BaseAddress); + Region = MmFindRegion(MemoryArea->StartingAddress, &MemoryArea->Data.SectionData.RegionListHead, BaseAddress, NULL); *OldProtect = Region->Protect; - Status = MmAlterRegion(AddressSpace, MemoryArea->BaseAddress, + Status = MmAlterRegion(AddressSpace, MemoryArea->StartingAddress, &MemoryArea->Data.SectionData.RegionListHead, BaseAddress, Length, Region->Type, Protect, MmAlterViewAttributes); @@ -1915,7 +1915,7 @@ PMEMORY_AREA CurrentMArea; KIRQL oldIrql; - Region = MmFindRegion(MemoryArea->BaseAddress, + Region = MmFindRegion((PVOID)MemoryArea->StartingAddress, &MemoryArea->Data.SectionData.RegionListHead, Address, &RegionBaseAddress); if (Region == NULL) @@ -1934,11 +1934,11 @@ CurrentEntry = CurrentEntry->Flink; if (Info->AllocationBase == NULL) { - Info->AllocationBase = CurrentMArea->BaseAddress; + Info->AllocationBase = CurrentMArea->StartingAddress; } - else if (CurrentMArea->BaseAddress < Info->AllocationBase) + else if (CurrentMArea->StartingAddress < Info->AllocationBase) { - Info->AllocationBase = CurrentMArea->BaseAddress; + Info->AllocationBase = CurrentMArea->StartingAddress; } } KeReleaseSpinLock(&Section->ViewListLock, oldIrql); @@ -1949,11 +1949,12 @@ else { Info->BaseAddress = RegionBaseAddress; - Info->AllocationBase = MemoryArea->BaseAddress; + Info->AllocationBase = MemoryArea->StartingAddress; Info->AllocationProtect = MemoryArea->Attributes; Info->Type = MEM_MAPPED; } - Info->RegionSize = PAGE_ROUND_UP(MemoryArea->Length); + Info->RegionSize = PAGE_ROUND_UP((ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress); Info->State = MEM_COMMIT; Info->Protect = Region->Protect; @@ -3583,7 +3584,7 @@ Address = (PVOID)PAGE_ROUND_DOWN(Address); - Offset = ((ULONG_PTR)Address - (ULONG_PTR)MArea->BaseAddress) + + Offset = ((ULONG_PTR)Address - (ULONG_PTR)MArea->StartingAddress) + MemoryArea->Data.SectionData.ViewOffset; Section = MArea->Data.SectionData.Section; @@ -3711,16 +3712,14 @@ if (Section->AllocationAttributes & SEC_PHYSICALMEMORY) { Status = MmFreeMemoryArea(AddressSpace, - BaseAddress, - 0, + MemoryArea, NULL, NULL); } else { Status = MmFreeMemoryArea(AddressSpace, - BaseAddress, - 0, + MemoryArea, MmFreeSectionPage, MemoryArea); } @@ -4087,7 +4086,7 @@ KEBUGCHECK(0); } Status = MmCreateVirtualMapping (NULL, - ((char*)Result + (i * PAGE_SIZE)), + (PVOID)(Result + (i * PAGE_SIZE)), PAGE_READWRITE, &Page, 1); @@ -4178,7 +4177,7 @@ { ULONG i; ULONG NrSegments; - PVOID ImageBase; + ULONG_PTR ImageBase; ULONG ImageSize; PMM_IMAGE_SECTION_OBJECT ImageSectionObject; PMM_SECTION_SEGMENT SectionSegments; @@ -4188,10 +4187,10 @@ NrSegments = ImageSectionObject->NrSegments; - ImageBase = *BaseAddress; - if (ImageBase == NULL) + ImageBase = (ULONG_PTR)*BaseAddress; + if (ImageBase == 0) { - ImageBase = (PVOID)ImageSectionObject->ImageBase; + ImageBase = ImageSectionObject->ImageBase; } ImageSize = 0; @@ -4207,7 +4206,7 @@ } /* Check there is enough space to map the section at that point. */ - if (MmOpenMemoryAreaByRegion(AddressSpace, ImageBase, + if (MmOpenMemoryAreaByRegion(AddressSpace, (PVOID)ImageBase, PAGE_ROUND_UP(ImageSize)) != NULL) { /* Fail if the user requested a fixed base address. */ @@ -4217,8 +4216,8 @@ return(STATUS_UNSUCCESSFUL); } /* Otherwise find a gap to map the image. */ - ImageBase = MmFindGap(AddressSpace, PAGE_ROUND_UP(ImageSize), PAGE_SIZE, FALSE); - if (ImageBase == NULL) + ImageBase = (ULONG_PTR)MmFindGap(AddressSpace, PAGE_ROUND_UP(ImageSize), PAGE_SIZE, FALSE); + if (ImageBase == 0) { MmUnlockAddressSpace(AddressSpace); return(STATUS_UNSUCCESSFUL); @@ -4250,7 +4249,7 @@ } } - *BaseAddress = ImageBase; + *BaseAddress = (PVOID)ImageBase; } else { Index: mm/mm.c =================================================================== --- mm/mm.c (revision 12712) +++ mm/mm.c (working copy) @@ -99,13 +99,13 @@ DPRINT("MmReleaseMemoryArea(Process %x, Marea %x)\n",Process,Marea); DPRINT("Releasing %x between %x %x (type %d)\n", - Marea, Marea->BaseAddress, (char*)Marea->BaseAddress + Marea->Length, + Marea, Marea->StartingAddress, Marea->EndingAddress, Marea->Type); switch (Marea->Type) { case MEMORY_AREA_SECTION_VIEW: - Status = MmUnmapViewOfSection(Process, Marea->BaseAddress); + Status = MmUnmapViewOfSection(Process, (PVOID)Marea->StartingAddress); ASSERT(Status == STATUS_SUCCESS); return(STATUS_SUCCESS); @@ -116,8 +116,7 @@ case MEMORY_AREA_SHARED_DATA: case MEMORY_AREA_NO_ACCESS: Status = MmFreeMemoryArea(&Process->AddressSpace, - Marea->BaseAddress, - 0, + Marea, NULL, NULL); break; @@ -135,20 +134,35 @@ NTSTATUS MmReleaseMmInfo(PEPROCESS Process) { - PLIST_ENTRY CurrentEntry; - PMEMORY_AREA Current; +/* PMEMORY_AREA CurrentNode;*/ +/* PMEMORY_AREA NextNode;*/ DPRINT("MmReleaseMmInfo(Process %x (%s))\n", Process, Process->ImageFileName); MmLockAddressSpace(&Process->AddressSpace); - while(!IsListEmpty(&Process->AddressSpace.MAreaListHead)) +#if 0 + for (CurrentNode = Process->AddressSpace.MemoryAreaRoot; + CurrentNode != NULL; + CurrentNode = NextNode) { - CurrentEntry = Process->AddressSpace.MAreaListHead.Flink; - Current = CONTAINING_RECORD(CurrentEntry, MEMORY_AREA, Entry); - MmReleaseMemoryArea(Process, Current); + if (CurrentNode->LeftChild == NULL) + { + NextNode = CurrentNode->RightChild; + MmReleaseMemoryArea(Process, CurrentNode); + } + else + { + NextNode = CurrentNode->LeftChild; + CurrentNode->LeftChild = NextNode->RightChild; + NextNode->RightChild = CurrentNode; + } } +#else + while (Process->AddressSpace.MemoryAreaRoot != NULL) + MmReleaseMemoryArea(Process, Process->AddressSpace.MemoryAreaRoot); +#endif Mmi386ReleaseMmInfo(Process); @@ -208,7 +222,7 @@ } NTSTATUS MmAccessFault(KPROCESSOR_MODE Mode, - ULONG Address, + ULONG Address, /* FiN TODO: Should be ULONG_PTR! */ BOOLEAN FromMdl) { PMADDRESS_SPACE AddressSpace; @@ -330,7 +344,7 @@ } NTSTATUS MmNotPresentFault(KPROCESSOR_MODE Mode, - ULONG Address, + ULONG Address, /* FiN TODO: Should be ULONG_PTR! */ BOOLEAN FromMdl) { PMADDRESS_SPACE AddressSpace; Index: mm/mdl.c =================================================================== --- mm/mdl.c (revision 12712) +++ mm/mdl.c (working copy) @@ -269,7 +269,7 @@ KEBUGCHECK(0); } - Base = (char*)MiMdlMappingRegionBase + StartingOffset * PAGE_SIZE; + Base = (PVOID)((ULONG_PTR)MiMdlMappingRegionBase + StartingOffset * PAGE_SIZE); if (MiMdlMappingRegionHint == StartingOffset) { @@ -384,7 +384,7 @@ NULL); } - if ((DWORD)BaseAddress >= KERNEL_BASE) + if ((ULONG_PTR)BaseAddress >= KERNEL_BASE) { ASSERT(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA); @@ -416,7 +416,7 @@ KEBUGCHECK(0); } - MmFreeMemoryArea( &Mdl->Process->AddressSpace, Marea->BaseAddress, 0, NULL, NULL ); + MmFreeMemoryArea( &Mdl->Process->AddressSpace, Marea, NULL, NULL ); Mdl->Process = NULL; } Index: mm/ncache.c =================================================================== --- mm/ncache.c (revision 12712) +++ mm/ncache.c (working copy) @@ -129,11 +129,10 @@ IN ULONG NumberOfBytes) { MmLockAddressSpace(MmGetKernelAddressSpace()); - MmFreeMemoryArea (MmGetKernelAddressSpace(), - BaseAddress, - NumberOfBytes, - MmFreeNonCachedPage, - NULL); + MmFreeMemoryAreaByPtr(MmGetKernelAddressSpace(), + BaseAddress, + MmFreeNonCachedPage, + NULL); MmUnlockAddressSpace(MmGetKernelAddressSpace()); } Index: mm/marea.c =================================================================== --- mm/marea.c (revision 12712) +++ mm/marea.c (working copy) @@ -35,331 +35,465 @@ #define TAG_MAREA TAG('M', 'A', 'R', 'E') +/* #define VALIDATE_MEMORY_AREAS */ + /* FUNCTIONS *****************************************************************/ -VOID MmDumpMemoryAreas(PLIST_ENTRY ListHead) +/** + * @name MmIterateFirstNode + * + * @param Head + * Head node of the MEMORY_AREA tree. + * + * @return The leftmost MEMORY_AREA node (ie. the one with lowest + * address) + */ + +static PMEMORY_AREA MmIterateFirstNode(PMEMORY_AREA Head) { - PLIST_ENTRY current_entry; - MEMORY_AREA* current; + PMEMORY_AREA Node = Head; + while (Node->LeftChild != NULL) + Node = Node->LeftChild; + + return Node; +} + +/** + * @name MmIterateNextNode + * + * @param Node + * Current node in the tree. + * + * @return Next node in the tree (sorted by address). + */ + +static PMEMORY_AREA MmIterateNextNode(PMEMORY_AREA Node) +{ + if (Node->RightChild != NULL) + { + Node = Node->RightChild; + while (Node->LeftChild != NULL) + Node = Node->LeftChild; + } + else + { + PMEMORY_AREA TempNode = NULL; + + do + { + /* Check if we're at the end of tree. */ + if (Node->Parent == NULL) + return NULL; + + TempNode = Node; + Node = Node->Parent; + } + while (TempNode == Node->RightChild); + } + return Node; +} + +/** + * @name MmIterateFirstNode + * + * @param Head + * Head node of the MEMORY_AREA tree. + * + * @return The rightmost MEMORY_AREA node (ie. the one with highest + * address) + */ + +static PMEMORY_AREA MmIterateLastNode(PMEMORY_AREA Head) +{ + PMEMORY_AREA Node = Head; + + while (Node->RightChild != NULL) + Node = Node->RightChild; + + return Node; +} + +/** + * @name MmIterateNextNode + * + * @param Node + * Current node in the tree. + * + * @return Previous node in the tree (sorted by address). + */ + +static PMEMORY_AREA MmIteratePrevNode(PMEMORY_AREA Node) +{ + if (Node->LeftChild != NULL) + { + Node = Node->LeftChild; + while (Node->RightChild != NULL) + Node = Node->RightChild; + } + else + { + PMEMORY_AREA TempNode = NULL; + + do + { + /* Check if we're at the end of tree. */ + if (Node->Parent == NULL) + return NULL; + + TempNode = Node; + Node = Node->Parent; + } + while (TempNode == Node->LeftChild); + } + return Node; +} + +#ifdef VALIDATE_MEMORY_AREAS +static VOID MmVerifyMemoryAreas(PMADDRESS_SPACE AddressSpace) +{ + PMEMORY_AREA Node; + + ASSERT(AddressSpace != NULL); + + /* Special case for empty tree. */ + if (AddressSpace->MemoryAreaRoot == NULL) + return; + + /* Traverse the tree from left to right. */ + for (Node = MmIterateFirstNode(AddressSpace->MemoryAreaRoot); + Node != NULL; + Node = MmIterateNextNode(Node)) + { + /* FiN: The starting address can be NULL if someone explicitely asks + * for NULL address. */ + ASSERT(Node->StartingAddress >= AddressSpace->LowestAddress || + Node->StartingAddress == NULL); + ASSERT(Node->EndingAddress >= Node->StartingAddress); + } +} +#else +#define MmVerifyMemoryAreas(x) +#endif + +VOID STDCALL +MmDumpMemoryAreas(PMADDRESS_SPACE AddressSpace) +{ + PMEMORY_AREA Node; + DbgPrint("MmDumpMemoryAreas()\n"); + + /* Special case for empty tree. */ + if (AddressSpace->MemoryAreaRoot == NULL) + return; - current_entry = ListHead->Flink; - while (current_entry!=ListHead) + /* Traverse the tree from left to right. */ + for (Node = MmIterateFirstNode(AddressSpace->MemoryAreaRoot); + Node != NULL; + Node = MmIterateNextNode(Node)) { - current = CONTAINING_RECORD(current_entry,MEMORY_AREA,Entry); - DbgPrint("Base %x Length %x End %x Attributes %x Flink %x\n", - current->BaseAddress,current->Length, - (char*)current->BaseAddress+current->Length,current->Attributes, - current->Entry.Flink); - current_entry = current_entry->Flink; + DbgPrint("Start %x End %x Attributes %x\n", + Node->StartingAddress, Node->EndingAddress, + Node->Attributes); } + DbgPrint("Finished MmDumpMemoryAreas()\n"); } -MEMORY_AREA* MmOpenMemoryAreaByAddress(PMADDRESS_SPACE AddressSpace, - PVOID Address) +PMEMORY_AREA STDCALL +MmOpenMemoryAreaByAddress( + PMADDRESS_SPACE AddressSpace, + PVOID Address) { - PLIST_ENTRY current_entry; - MEMORY_AREA* current; - PLIST_ENTRY previous_entry; + PMEMORY_AREA Node = AddressSpace->MemoryAreaRoot; DPRINT("MmOpenMemoryAreaByAddress(AddressSpace %x, Address %x)\n", - AddressSpace, Address); + AddressSpace, Address); - previous_entry = &AddressSpace->MAreaListHead; - current_entry = AddressSpace->MAreaListHead.Flink; - while (current_entry != &AddressSpace->MAreaListHead) + if (!(KdDebugState & KD_DEBUG_SCREEN)) + MmVerifyMemoryAreas(AddressSpace); + + while (Node != NULL) { - current = CONTAINING_RECORD(current_entry, - MEMORY_AREA, - Entry); - ASSERT(current_entry->Blink->Flink == current_entry); - ASSERT(current_entry->Flink->Blink == current_entry); - ASSERT(previous_entry->Flink == current_entry); - if (current->BaseAddress <= Address && - (PVOID)((char*)current->BaseAddress + current->Length) > Address) + if (Address < Node->StartingAddress) + Node = Node->LeftChild; + else if (Address >= Node->EndingAddress) + Node = Node->RightChild; + else { - DPRINT("%s() = %x\n",__FUNCTION__,current); - return(current); + DPRINT("MmOpenMemoryAreaByAddress(%x): %x [%x - %x]\n", + Address, Node, Node->StartingAddress, Node->EndingAddress); + return Node; } - if (current->BaseAddress > Address) - { - DPRINT("%s() = NULL\n",__FUNCTION__); - return(NULL); - } - previous_entry = current_entry; - current_entry = current_entry->Flink; } - DPRINT("%s() = NULL\n",__FUNCTION__); - return(NULL); + + DPRINT("MmOpenMemoryAreaByAddress(%x): 0\n", Address); + return NULL; } -MEMORY_AREA* MmOpenMemoryAreaByRegion(PMADDRESS_SPACE AddressSpace, - PVOID Address, - ULONG Length) +PMEMORY_AREA STDCALL +MmOpenMemoryAreaByRegion( + PMADDRESS_SPACE AddressSpace, + PVOID Address, + ULONG_PTR Length) { - PLIST_ENTRY current_entry; - MEMORY_AREA* current; - ULONG Extent; + PMEMORY_AREA Node; + PVOID Extent = (PVOID)((ULONG_PTR)Address + Length); - DPRINT("MmOpenMemoryByRegion(AddressSpace %x, Address %x, Length %x)\n", - AddressSpace, Address, Length); + MmVerifyMemoryAreas(AddressSpace); - current_entry = AddressSpace->MAreaListHead.Flink; - while (current_entry != &AddressSpace->MAreaListHead) + /* Special case for empty tree. */ + if (AddressSpace->MemoryAreaRoot == NULL) + return NULL; + + /* Traverse the tree from left to right. */ + for (Node = MmIterateFirstNode(AddressSpace->MemoryAreaRoot); + Node != NULL; + Node = MmIterateNextNode(Node)) { - current = CONTAINING_RECORD(current_entry, - MEMORY_AREA, - Entry); - DPRINT("current->BaseAddress %x current->Length %x\n", - current->BaseAddress,current->Length); - if (current->BaseAddress >= Address && - current->BaseAddress < (PVOID)((char*)Address+Length)) + if (Node->StartingAddress >= Address && + Node->StartingAddress < Extent) { - DPRINT("Finished MmOpenMemoryAreaByRegion() = %x\n", - current); - return(current); + DPRINT("MmOpenMemoryAreaByRegion(%x - %x): %x - %x\n", + Address, Address + Length, Node->StartingAddress, + Node->EndingAddress); + return Node; } - Extent = (ULONG)current->BaseAddress + current->Length; - if (Extent > (ULONG)Address && - Extent < (ULONG)((char*)Address+Length)) + if (Node->EndingAddress > Address && + Node->EndingAddress < Extent) { - DPRINT("Finished MmOpenMemoryAreaByRegion() = %x\n", - current); - return(current); + DPRINT("MmOpenMemoryAreaByRegion(%x - %x): %x - %x\n", + Address, Address + Length, Node->StartingAddress, + Node->EndingAddress); + return Node; } - if (current->BaseAddress <= Address && - Extent >= (ULONG)((char*)Address+Length)) + if (Node->StartingAddress <= Address && + Node->EndingAddress >= Extent) { - DPRINT("Finished MmOpenMemoryAreaByRegion() = %x\n", - current); - return(current); + DPRINT("MmOpenMemoryAreaByRegion(%x - %x): %x - %x\n", + Address, Address + Length, Node->StartingAddress, + Node->EndingAddress); + return Node; } - if (current->BaseAddress >= (PVOID)((char*)Address+Length)) + if (Node->StartingAddress >= Extent) { - DPRINT("Finished MmOpenMemoryAreaByRegion()= NULL\n",0); - return(NULL); + DPRINT("Finished MmOpenMemoryAreaByRegion() = NULL\n"); + return NULL; } - current_entry = current_entry->Flink; } - DPRINT("Finished MmOpenMemoryAreaByRegion() = NULL\n",0); - return(NULL); + + return NULL; } -static VOID MmInsertMemoryArea(PMADDRESS_SPACE AddressSpace, - MEMORY_AREA* marea) +static VOID +MmInsertMemoryArea( + PMADDRESS_SPACE AddressSpace, + PMEMORY_AREA marea) { - PLIST_ENTRY ListHead; - PLIST_ENTRY current_entry; - PLIST_ENTRY inserted_entry = &marea->Entry; - MEMORY_AREA* current; - MEMORY_AREA* next; + PMEMORY_AREA Node; + PMEMORY_AREA PreviousNode; - DPRINT("MmInsertMemoryArea(marea %x)\n", marea); - DPRINT("marea->BaseAddress %x\n", marea->BaseAddress); - DPRINT("marea->Length %x\n", marea->Length); + MmVerifyMemoryAreas(AddressSpace); - ListHead = &AddressSpace->MAreaListHead; - - current_entry = ListHead->Flink; - if (IsListEmpty(ListHead)) + if (AddressSpace->MemoryAreaRoot == NULL) { - InsertHeadList(ListHead,&marea->Entry); + AddressSpace->MemoryAreaRoot = marea; + marea->LeftChild = marea->RightChild = marea->Parent = NULL; return; } - current = CONTAINING_RECORD(current_entry,MEMORY_AREA,Entry); - if (current->BaseAddress > marea->BaseAddress) + + Node = AddressSpace->MemoryAreaRoot; + do { - InsertHeadList(ListHead,&marea->Entry); - return; + DPRINT("marea->EndingAddress: %x Node->StartingAddress: %x\n", + marea->EndingAddress, Node->StartingAddress); + DPRINT("marea->StartingAddress: %x Node->EndingAddress: %x\n", + marea->StartingAddress, Node->EndingAddress); + ASSERT(marea->EndingAddress <= Node->StartingAddress || + marea->StartingAddress >= Node->EndingAddress); + PreviousNode = Node; + if (marea->StartingAddress < Node->StartingAddress) + Node = Node->LeftChild; + else + Node = Node->RightChild; } - while (current_entry->Flink!=ListHead) - { - current = CONTAINING_RECORD(current_entry,MEMORY_AREA,Entry); - next = CONTAINING_RECORD(current_entry->Flink,MEMORY_AREA,Entry); - if (current->BaseAddress < marea->BaseAddress && - current->Entry.Flink==ListHead) - { - current_entry->Flink = inserted_entry; - inserted_entry->Flink=ListHead; - inserted_entry->Blink=current_entry; - ListHead->Blink = inserted_entry; - return; - } - if (current->BaseAddress < marea->BaseAddress && - next->BaseAddress > marea->BaseAddress) - { - inserted_entry->Flink = current_entry->Flink; - inserted_entry->Blink = current_entry; - inserted_entry->Flink->Blink = inserted_entry; - current_entry->Flink=inserted_entry; - return; - } - current_entry = current_entry->Flink; - } - InsertTailList(ListHead,inserted_entry); + while (Node != NULL); + + marea->LeftChild = marea->RightChild = NULL; + marea->Parent = PreviousNode; + if (marea->StartingAddress < PreviousNode->StartingAddress) + PreviousNode->LeftChild = marea; + else + PreviousNode->RightChild = marea; } -static PVOID MmFindGapBottomUp(PMADDRESS_SPACE AddressSpace, ULONG Length, ULONG Granularity) +static PVOID +MmFindGapBottomUp( + PMADDRESS_SPACE AddressSpace, + ULONG_PTR Length, + ULONG_PTR Granularity) { - PLIST_ENTRY ListHead; - PLIST_ENTRY current_entry; - MEMORY_AREA* current; - MEMORY_AREA* next; - ULONG Gap; - PVOID Address; + PVOID HighestAddress = AddressSpace->LowestAddress < (PVOID)KERNEL_BASE ? + (PVOID)KERNEL_BASE : (PVOID)MAXULONG_PTR; + PVOID AlignedAddress; + PMEMORY_AREA Node; + PMEMORY_AREA FirstNode; + PMEMORY_AREA PreviousNode; - DPRINT("MmFindGapBottomUp(Length %x)\n",Length); + MmVerifyMemoryAreas(AddressSpace); -#ifdef DBG - Length += PAGE_SIZE; /* For a guard page following the area */ -#endif + DPRINT("LowestAddress: %x HighestAddress: %x\n", + AddressSpace->LowestAddress, HighestAddress); - ListHead = &AddressSpace->MAreaListHead; + AlignedAddress = MM_ROUND_UP(AddressSpace->LowestAddress, Granularity); - current_entry = ListHead->Flink; - while (current_entry->Flink!=ListHead) + /* Special case for empty tree. */ + if (AddressSpace->MemoryAreaRoot == NULL) { - current = CONTAINING_RECORD(current_entry,MEMORY_AREA,Entry); - next = CONTAINING_RECORD(current_entry->Flink,MEMORY_AREA,Entry); - Address = (PVOID) ((char*)current->BaseAddress + PAGE_ROUND_UP(current->Length)); -#ifdef DBG - Address = (PVOID) ((char *) Address + PAGE_SIZE); /* For a guard page preceding the area */ -#endif - Address = (PVOID) MM_ROUND_UP(Address, Granularity); - if (Address < next->BaseAddress) + if (HighestAddress - AlignedAddress >= Length) { - Gap = (char*)next->BaseAddress - ((char*)current->BaseAddress + PAGE_ROUND_UP(current->Length)); - if (Gap >= Length) - { - return Address; - } + DPRINT("MmFindGapBottomUp: %x\n", AlignedAddress); + return AlignedAddress; } - current_entry = current_entry->Flink; + DPRINT("MmFindGapBottomUp: 0\n"); + return 0; } - if (current_entry == ListHead) + /* Go to the node with lowest address in the tree. */ + FirstNode = Node = MmIterateFirstNode(AddressSpace->MemoryAreaRoot); + + /* Traverse the tree from left to right. */ + PreviousNode = Node; + for (;;) { - Address = (PVOID) MM_ROUND_UP(AddressSpace->LowestAddress, Granularity); + Node = MmIterateNextNode(Node); + if (Node == NULL) + break; + + AlignedAddress = MM_ROUND_UP(PreviousNode->EndingAddress, Granularity); + if (Node->StartingAddress > AlignedAddress && + Node->StartingAddress - AlignedAddress >= Length) + { + DPRINT("MmFindGapBottomUp: %x\n", AlignedAddress); + return AlignedAddress; + } + + PreviousNode = Node; } - else + + /* Check if there is enough space after the last memory area. */ + AlignedAddress = MM_ROUND_UP(PreviousNode->EndingAddress, Granularity); + if (HighestAddress - AlignedAddress >= Length) { - current = CONTAINING_RECORD(current_entry,MEMORY_AREA,Entry); - Address = (char*)current->BaseAddress + PAGE_ROUND_UP(current->Length); -#ifdef DBG - Address = (PVOID) ((char *) Address + PAGE_SIZE); /* For a guard page preceding the area */ -#endif - Address = (PVOID) MM_ROUND_UP(Address, Granularity); + DPRINT("MmFindGapBottomUp: %x\n", AlignedAddress); + return AlignedAddress; } - /* Check if enough space for the block */ - if (AddressSpace->LowestAddress < (PVOID)KERNEL_BASE) + + /* Check if there is enough space before the first memory area. */ + AlignedAddress = MM_ROUND_UP(AddressSpace->LowestAddress, Granularity); + if (FirstNode->StartingAddress > AlignedAddress && + FirstNode->StartingAddress - AlignedAddress >= Length) { - if ((ULONG_PTR) Address >= KERNEL_BASE || Length > KERNEL_BASE - (ULONG_PTR) Address) - { - DPRINT1("Failed to find gap\n"); - return NULL; - } + DPRINT("MmFindGapBottomUp: %x\n", AlignedAddress); + return AlignedAddress; } - else - { - if (Length >= ~ ((ULONG_PTR) 0) - (ULONG_PTR) Address) - { - DPRINT1("Failed to find gap\n"); - return NULL; - } - } - return Address; + + DPRINT("MmFindGapBottomUp: 0\n"); + return 0; } -static PVOID MmFindGapTopDown(PMADDRESS_SPACE AddressSpace, ULONG Length, ULONG Granularity) +static PVOID +MmFindGapTopDown( + PMADDRESS_SPACE AddressSpace, + ULONG_PTR Length, + ULONG_PTR Granularity) { - PLIST_ENTRY ListHead; - PLIST_ENTRY current_entry; - MEMORY_AREA* current; - ULONG Gap; - PVOID Address; - PVOID TopAddress; - PVOID BottomAddress; - PVOID HighestAddress; + PVOID HighestAddress = AddressSpace->LowestAddress < (PVOID)KERNEL_BASE ? + (PVOID)KERNEL_BASE : (PVOID)MAXULONG_PTR; + PVOID AlignedAddress; + PMEMORY_AREA Node; + PMEMORY_AREA PreviousNode; - DPRINT("MmFindGapTopDown(Length %lx)\n",Length); + MmVerifyMemoryAreas(AddressSpace); -#ifdef DBG - Length += PAGE_SIZE; /* For a guard page following the area */ -#endif + DPRINT("LowestAddress: %x HighestAddress: %x\n", + AddressSpace->LowestAddress, HighestAddress); - if (AddressSpace->LowestAddress < (PVOID)KERNEL_BASE) //(ULONG_PTR)MmSystemRangeStart) - { - HighestAddress = MmHighestUserAddress; - } - else - { - HighestAddress = (PVOID)0xFFFFFFFF; - } + AlignedAddress = MM_ROUND_DOWN(HighestAddress - Length + 1, Granularity); - TopAddress = HighestAddress; + /* Check for overflow. */ + if (AlignedAddress > HighestAddress) + return NULL; - ListHead = &AddressSpace->MAreaListHead; - current_entry = ListHead->Blink; - while (current_entry->Blink != ListHead) + /* Special case for empty tree. */ + if (AddressSpace->MemoryAreaRoot == NULL) { - current = CONTAINING_RECORD(current_entry,MEMORY_AREA,Entry); - BottomAddress = (char*)current->BaseAddress + PAGE_ROUND_UP(current->Length); -#ifdef DBG - BottomAddress = (PVOID) ((char *) BottomAddress + PAGE_SIZE); /* For a guard page preceding the area */ -#endif - BottomAddress = (PVOID) MM_ROUND_UP(BottomAddress, Granularity); - DPRINT("Base %p Length %lx\n", current->BaseAddress, PAGE_ROUND_UP(current->Length)); - - if (BottomAddress < TopAddress && BottomAddress < HighestAddress) + if (AlignedAddress >= (PVOID)AddressSpace->LowestAddress) { - Gap = (char*)TopAddress - (char*) BottomAddress + 1; - DPRINT("Bottom %p Top %p Gap %lx\n", BottomAddress, TopAddress, Gap); - if (Gap >= Length) - { - DPRINT("Found gap at %p\n", (char*) TopAddress - Length); - return (PVOID) MM_ROUND_DOWN((char*) TopAddress - Length + 1, Granularity); - } + DPRINT("MmFindGapTopDown: %x\n", AlignedAddress); + return AlignedAddress; } - TopAddress = (char*)current->BaseAddress - 1; - current_entry = current_entry->Blink; + DPRINT("MmFindGapTopDown: 0\n"); + return 0; } - if (current_entry == ListHead) + /* Go to the node with lowest address in the tree. */ + Node = MmIterateLastNode(AddressSpace->MemoryAreaRoot); + + /* Check if there is enough space after the last memory area. */ + if (Node->EndingAddress <= AlignedAddress) { - Address = (PVOID) MM_ROUND_DOWN((char*) HighestAddress - Length + 1, Granularity); + DPRINT("MmFindGapTopDown: %x\n", AlignedAddress); + return AlignedAddress; } - else + + /* Traverse the tree from left to right. */ + PreviousNode = Node; + for (;;) { - Address = (PVOID) MM_ROUND_DOWN((char*)TopAddress - Length + 1, Granularity); - } + Node = MmIteratePrevNode(Node); + if (Node == NULL) + break; - /* Check if enough space for the block */ - if (AddressSpace->LowestAddress < (PVOID)KERNEL_BASE) - { - if ((ULONG_PTR) Address >= KERNEL_BASE || Length > KERNEL_BASE - (ULONG_PTR) Address) + AlignedAddress = MM_ROUND_DOWN(PreviousNode->StartingAddress - Length + 1, Granularity); + + /* Check for overflow. */ + if (AlignedAddress > PreviousNode->StartingAddress) + return NULL; + + if (Node->EndingAddress <= AlignedAddress) { - DPRINT1("Failed to find gap\n"); - return NULL; + DPRINT("MmFindGapTopDown: %x\n", AlignedAddress); + return AlignedAddress; } + + PreviousNode = Node; } - else + + AlignedAddress = MM_ROUND_DOWN(PreviousNode->StartingAddress - Length + 1, Granularity); + + /* Check for overflow. */ + if (AlignedAddress > PreviousNode->StartingAddress) + return NULL; + + if (AlignedAddress >= (PVOID)AddressSpace->LowestAddress) { - if (Length >= ~ ((ULONG_PTR) 0) - (ULONG_PTR) Address) - { - DPRINT1("Failed to find gap\n"); - return NULL; - } + DPRINT("MmFindGapTopDown: %x\n", AlignedAddress); + return AlignedAddress; } - DPRINT("Found gap at %p\n", Address); - return Address; + DPRINT("MmFindGapTopDown: 0\n"); + return 0; } -PVOID MmFindGap(PMADDRESS_SPACE AddressSpace, ULONG Length, ULONG Granularity, BOOL TopDown) +PVOID STDCALL +MmFindGap( + PMADDRESS_SPACE AddressSpace, + ULONG_PTR Length, + ULONG_PTR Granularity, + BOOLEAN TopDown) { if (TopDown) return MmFindGapTopDown(AddressSpace, Length, Granularity); @@ -367,13 +501,20 @@ return MmFindGapBottomUp(AddressSpace, Length, Granularity); } -ULONG MmFindGapAtAddress(PMADDRESS_SPACE AddressSpace, PVOID Address) +ULONG_PTR STDCALL +MmFindGapAtAddress( + PMADDRESS_SPACE AddressSpace, + PVOID Address) { - PLIST_ENTRY current_entry, ListHead; - PMEMORY_AREA current; + PMEMORY_AREA Node = AddressSpace->MemoryAreaRoot; + PMEMORY_AREA RightNeighbour = NULL; + PVOID HighestAddress = AddressSpace->LowestAddress < (PVOID)KERNEL_BASE ? + (PVOID)KERNEL_BASE : (PVOID)MAXULONG_PTR; - Address = (PVOID)PAGE_ROUND_DOWN(Address); + MmVerifyMemoryAreas(AddressSpace); + Address = MM_ROUND_DOWN(Address, PAGE_SIZE); + if (AddressSpace->LowestAddress < (PVOID)KERNEL_BASE) { if (Address >= (PVOID)KERNEL_BASE) @@ -383,159 +524,255 @@ } else { - if ((ULONG_PTR)Address < (ULONG_PTR)AddressSpace->LowestAddress) + if (Address < AddressSpace->LowestAddress) { return 0; } } - ListHead = &AddressSpace->MAreaListHead; - - current_entry = ListHead->Flink; - while (current_entry != ListHead) + while (Node != NULL) { - current = CONTAINING_RECORD(current_entry,MEMORY_AREA,Entry); - if (current->BaseAddress <= Address && (char*)Address < (char*)current->BaseAddress + current->Length) + if (Address < Node->StartingAddress) { - return 0; + RightNeighbour = Node; + Node = Node->LeftChild; } - else if (current->BaseAddress > Address) + else if (Address >= Node->EndingAddress) { - return (ULONG_PTR)current->BaseAddress - (ULONG_PTR)Address; + Node = Node->RightChild; } - current_entry = current_entry->Flink; + else + { + DPRINT("MmFindGapAtAddress: 0\n"); + return 0; + } } - if (AddressSpace->LowestAddress < (PVOID)KERNEL_BASE) + + if (RightNeighbour) { - return KERNEL_BASE - (ULONG_PTR)Address; + DPRINT("MmFindGapAtAddress: %x [%x]\n", Address, RightNeighbour->StartingAddress - Address); + return RightNeighbour->StartingAddress - Address; } else { - return 0 - (ULONG_PTR)Address; + DPRINT("MmFindGapAtAddress: %x [%x]\n", Address, HighestAddress - Address); + return HighestAddress - Address; } } +/** + * @name MmInitMemoryAreas + * + * Initialize the memory area list implementation. + */ + NTSTATUS INIT_FUNCTION MmInitMemoryAreas(VOID) -/* - * FUNCTION: Initialize the memory area list - */ { DPRINT("MmInitMemoryAreas()\n",0); return(STATUS_SUCCESS); } -NTSTATUS -MmFreeMemoryArea(PMADDRESS_SPACE AddressSpace, - PVOID BaseAddress, - ULONG Length, - VOID (*FreePage)(PVOID Context, MEMORY_AREA* MemoryArea, - PVOID Address, PFN_TYPE Page, - SWAPENTRY SwapEntry, BOOLEAN Dirty), - PVOID FreePageContext) + +NTSTATUS STDCALL +MmFreeMemoryArea( + PMADDRESS_SPACE AddressSpace, + PMEMORY_AREA MemoryArea, + PMM_FREE_PAGE_FUNC FreePage, + PVOID FreePageContext) { - MEMORY_AREA* MemoryArea; - char* Address; - char* EndAddress; + PMEMORY_AREA *ParentReplace; + PVOID Address; + PVOID EndAddress; PEPROCESS CurrentProcess = PsGetCurrentProcess(); - DPRINT("MmFreeMemoryArea(AddressSpace %x, BaseAddress %x, Length %x," - "FreePageContext %d)\n",AddressSpace,BaseAddress,Length, - FreePageContext); - - MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, - BaseAddress); - if (MemoryArea == NULL) - { - KEBUGCHECK(0); - return(STATUS_UNSUCCESSFUL); - } if (AddressSpace->Process != NULL && - AddressSpace->Process != CurrentProcess) + AddressSpace->Process != CurrentProcess) { KeAttachProcess(&AddressSpace->Process->Pcb); } - EndAddress = (char*)MemoryArea->BaseAddress + PAGE_ROUND_UP(MemoryArea->Length); - for (Address = MemoryArea->BaseAddress; Address < EndAddress; Address += PAGE_SIZE) + + EndAddress = MM_ROUND_UP(MemoryArea->EndingAddress, PAGE_SIZE); + for (Address = MemoryArea->StartingAddress; Address < EndAddress; Address += PAGE_SIZE) { - if (MemoryArea->Type == MEMORY_AREA_IO_MAPPING) { - MmRawDeleteVirtualMapping(Address); + MmRawDeleteVirtualMapping((PVOID)Address); } else { - BOOL Dirty = FALSE; + BOOL Dirty = FALSE; SWAPENTRY SwapEntry = 0; - PFN_TYPE Page = 0; + PFN_TYPE Page = 0; - - if (MmIsPageSwapEntry(AddressSpace->Process, Address)) + if (MmIsPageSwapEntry(AddressSpace->Process, (PVOID)Address)) { - MmDeletePageFileMapping(AddressSpace->Process, Address, &SwapEntry); + MmDeletePageFileMapping(AddressSpace->Process, (PVOID)Address, &SwapEntry); } else { - MmDeleteVirtualMapping(AddressSpace->Process, Address, FALSE, &Dirty, &Page); + MmDeleteVirtualMapping(AddressSpace->Process, (PVOID)Address, FALSE, &Dirty, &Page); } if (FreePage != NULL) { - FreePage(FreePageContext, MemoryArea, Address, - Page, SwapEntry, (BOOLEAN)Dirty); + FreePage(FreePageContext, MemoryArea, (PVOID)Address, + Page, SwapEntry, (BOOLEAN)Dirty); } } } + if (AddressSpace->Process != NULL && - AddressSpace->Process != CurrentProcess) + AddressSpace->Process != CurrentProcess) { KeDetachProcess(); } - RemoveEntryList(&MemoryArea->Entry); + + /* Remove the tree item. */ + { + if (MemoryArea->Parent != NULL) + { + if (MemoryArea->Parent->LeftChild == MemoryArea) + ParentReplace = &MemoryArea->Parent->LeftChild; + else + ParentReplace = &MemoryArea->Parent->RightChild; + } + else + ParentReplace = &AddressSpace->MemoryAreaRoot; + + if (MemoryArea->RightChild == NULL) + { + *ParentReplace = MemoryArea->LeftChild; + if (MemoryArea->LeftChild) + MemoryArea->LeftChild->Parent = MemoryArea->Parent; + } + else + { + if (MemoryArea->RightChild->LeftChild == NULL) + { + MemoryArea->RightChild->LeftChild = MemoryArea->LeftChild; + if (MemoryArea->LeftChild) + MemoryArea->LeftChild->Parent = MemoryArea->RightChild; + + *ParentReplace = MemoryArea->RightChild; + MemoryArea->RightChild->Parent = MemoryArea->Parent; + } + else + { + PMEMORY_AREA LowestNode; + + LowestNode = MemoryArea->RightChild->LeftChild; + while (LowestNode->LeftChild != NULL) + LowestNode = LowestNode->LeftChild; + + LowestNode->Parent->LeftChild = LowestNode->RightChild; + if (LowestNode->RightChild) + LowestNode->RightChild->Parent = LowestNode->Parent; + + LowestNode->LeftChild = MemoryArea->LeftChild; + if (MemoryArea->LeftChild) + MemoryArea->LeftChild->Parent = LowestNode; + + LowestNode->RightChild = MemoryArea->RightChild; + MemoryArea->RightChild->Parent = LowestNode; + + *ParentReplace = LowestNode; + LowestNode->Parent = MemoryArea->Parent; + } + } + } + ExFreePool(MemoryArea); - DPRINT("MmFreeMemoryArea() succeeded\n"); + DPRINT("MmFreeMemoryAreaByNode() succeeded\n"); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } -NTSTATUS MmCreateMemoryArea(PEPROCESS Process, - PMADDRESS_SPACE AddressSpace, - ULONG Type, - PVOID* BaseAddress, - ULONG Length, - ULONG Attributes, - MEMORY_AREA** Result, - BOOL FixedAddress, - BOOL TopDown, - PHYSICAL_ADDRESS BoundaryAddressMultiple) + +NTSTATUS STDCALL +MmFreeMemoryAreaByPtr( + PMADDRESS_SPACE AddressSpace, + PVOID BaseAddress, + PMM_FREE_PAGE_FUNC FreePage, + PVOID FreePageContext) +{ + PMEMORY_AREA MemoryArea; + + DPRINT("MmFreeMemoryArea(AddressSpace %x, BaseAddress %x, Length %x," + "FreePageContext %d)\n",AddressSpace,BaseAddress,Length, + FreePageContext); + + MmVerifyMemoryAreas(AddressSpace); + + MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, + BaseAddress); + if (MemoryArea == NULL) + { + KEBUGCHECK(0); + return(STATUS_UNSUCCESSFUL); + } + + return MmFreeMemoryArea(AddressSpace, MemoryArea, FreePage, FreePageContext); +} + /* - * FUNCTION: Create a memory area - * ARGUMENTS: - * AddressSpace = Address space to create the area in - * Type = Type of the address space - * BaseAddress = - * Length = Length to allocate - * Attributes = Protection attributes for the memory area - * Result = Receives a pointer to the memory area on exit - * RETURNS: Status - * NOTES: Lock the address space before calling this function + * @name MmCreateMemoryArea + * + * Create a memory area. + * + * @param AddressSpace + * Address space to create the area in. + * @param Type + * Type of the memory area. + * @param BaseAddress + * Base address for the memory area we're about the create. On + * input it contains either 0 (auto-assign address) or preferred + * address. On output it contains the starting address of the + * newly created area. + * @param Length + * Length of the area to allocate. + * @param Attributes + * Protection attributes for the memory area. + * @param Result + * Receives a pointer to the memory area on successful exit. + * + * @return Status + * + * @remarks Lock the address space before calling this function. */ + +NTSTATUS STDCALL +MmCreateMemoryArea(PEPROCESS Process, + PMADDRESS_SPACE AddressSpace, + ULONG Type, + PVOID *BaseAddress, + ULONG_PTR Length, + ULONG Attributes, + PMEMORY_AREA *Result, + BOOLEAN FixedAddress, + BOOLEAN TopDown, + PHYSICAL_ADDRESS BoundaryAddressMultiple) { PVOID EndAddress; ULONG Granularity; ULONG tmpLength; - DPRINT("MmCreateMemoryArea(Type %d, BaseAddress %x," - "*BaseAddress %x, Length %x, Attributes %x, Result %x)\n", - Type,BaseAddress,*BaseAddress,Length,Attributes,Result); + DPRINT("MmCreateMemoryArea(Type %d, BaseAddress %x, " + "*BaseAddress %x, Length %x, Attributes %x, TopDown: %x, " + "FixedAddress %x, Result %x)\n", + Type, BaseAddress, *BaseAddress, Length, Attributes, TopDown, + FixedAddress, Result); + + MmVerifyMemoryAreas(AddressSpace); + Granularity = (MEMORY_AREA_VIRTUAL_MEMORY == Type ? MM_VIRTMEM_GRANULARITY : PAGE_SIZE); if ((*BaseAddress) == 0 && !FixedAddress) { tmpLength = PAGE_ROUND_UP(Length); *BaseAddress = MmFindGap(AddressSpace, - PAGE_ROUND_UP(Length), + tmpLength, Granularity, - TopDown); + TopDown != 0); if ((*BaseAddress) == 0) { DPRINT("No suitable gap\n"); @@ -544,26 +781,28 @@ } else { - tmpLength = Length + ((ULONG_PTR) *BaseAddress - - (ULONG_PTR) MM_ROUND_DOWN(*BaseAddress, Granularity)); + tmpLength = Length + ((ULONG_PTR) *BaseAddress + - (ULONG_PTR) MM_ROUND_DOWN(*BaseAddress, Granularity)); *BaseAddress = MM_ROUND_DOWN(*BaseAddress, Granularity); if (AddressSpace->LowestAddress == (PVOID)KERNEL_BASE && - (*BaseAddress) < (PVOID)KERNEL_BASE) + *BaseAddress < (PVOID)KERNEL_BASE) { + CHECKPOINT; return STATUS_ACCESS_VIOLATION; } if (AddressSpace->LowestAddress < (PVOID)KERNEL_BASE && - (PVOID)((char*)(*BaseAddress) + tmpLength) > (PVOID)KERNEL_BASE) + (ULONG_PTR)(*BaseAddress) + tmpLength > KERNEL_BASE) { + CHECKPOINT; return STATUS_ACCESS_VIOLATION; } if (BoundaryAddressMultiple.QuadPart != 0) { EndAddress = ((char*)(*BaseAddress)) + tmpLength-1; - ASSERT(((DWORD_PTR)*BaseAddress/BoundaryAddressMultiple.QuadPart) == ((DWORD_PTR)EndAddress/BoundaryAddressMultiple.QuadPart)); + ASSERT(((ULONG_PTR)*BaseAddress/BoundaryAddressMultiple.QuadPart) == ((DWORD_PTR)EndAddress/BoundaryAddressMultiple.QuadPart)); } if (MmOpenMemoryAreaByRegion(AddressSpace, @@ -579,8 +818,8 @@ TAG_MAREA); RtlZeroMemory(*Result,sizeof(MEMORY_AREA)); (*Result)->Type = Type; - (*Result)->BaseAddress = *BaseAddress; - (*Result)->Length = tmpLength; + (*Result)->StartingAddress = *BaseAddress; + (*Result)->EndingAddress = *BaseAddress + tmpLength; (*Result)->Attributes = Attributes; (*Result)->LockCount = 0; (*Result)->Process = Process; @@ -589,38 +828,40 @@ MmInsertMemoryArea(AddressSpace, *Result); - DPRINT("MmCreateMemoryArea() succeeded\n"); + DPRINT("MmCreateMemoryArea() succeeded (%x)\n", *BaseAddress); return STATUS_SUCCESS; } -void +VOID STDCALL MmReleaseMemoryAreaIfDecommitted(PEPROCESS Process, PMADDRESS_SPACE AddressSpace, PVOID BaseAddress) { - PMEMORY_AREA MemoryArea; - PLIST_ENTRY Entry; - PMM_REGION Region; - BOOLEAN Reserved; + PMEMORY_AREA MemoryArea; + PLIST_ENTRY Entry; + PMM_REGION Region; + BOOLEAN Reserved; - MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, BaseAddress); - if (NULL != MemoryArea) - { + MmVerifyMemoryAreas(AddressSpace); + + MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, BaseAddress); + if (MemoryArea != NULL) + { Entry = MemoryArea->Data.VirtualMemoryData.RegionListHead.Flink; Reserved = TRUE; while (Reserved && Entry != &MemoryArea->Data.VirtualMemoryData.RegionListHead) - { - Region = CONTAINING_RECORD(Entry, MM_REGION, RegionListEntry); - Reserved = (MEM_RESERVE == Region->Type); - Entry = Entry->Flink; - } + { + Region = CONTAINING_RECORD(Entry, MM_REGION, RegionListEntry); + Reserved = (MEM_RESERVE == Region->Type); + Entry = Entry->Flink; + } if (Reserved) - { - MmFreeVirtualMemory(Process, MemoryArea); - } - } + { + MmFreeVirtualMemory(Process, MemoryArea); + } + } } /* EOF */ Index: mm/virtual.c =================================================================== --- mm/virtual.c (revision 12712) +++ mm/virtual.c (working copy) @@ -204,9 +204,10 @@ Info->State = MEM_FREE; Info->Protect = MemoryArea->Attributes; Info->AllocationProtect = MemoryArea->Attributes; - Info->BaseAddress = MemoryArea->BaseAddress; - Info->AllocationBase = MemoryArea->BaseAddress; - Info->RegionSize = MemoryArea->Length; + Info->BaseAddress = MemoryArea->StartingAddress; + Info->AllocationBase = MemoryArea->StartingAddress; + Info->RegionSize = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; Status = STATUS_SUCCESS; *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); break; @@ -215,9 +216,10 @@ Info->State = MEM_COMMIT; Info->Protect = MemoryArea->Attributes; Info->AllocationProtect = MemoryArea->Attributes; - Info->BaseAddress = MemoryArea->BaseAddress; - Info->AllocationBase = MemoryArea->BaseAddress; - Info->RegionSize = MemoryArea->Length; + Info->BaseAddress = MemoryArea->StartingAddress; + Info->AllocationBase = MemoryArea->StartingAddress; + Info->RegionSize = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; Status = STATUS_SUCCESS; *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); break; @@ -235,9 +237,10 @@ Info->State = MEM_COMMIT; Info->Protect = MemoryArea->Attributes; Info->AllocationProtect = MemoryArea->Attributes; - Info->BaseAddress = MemoryArea->BaseAddress; - Info->AllocationBase = MemoryArea->BaseAddress; - Info->RegionSize = MemoryArea->Length; + Info->BaseAddress = MemoryArea->StartingAddress; + Info->AllocationBase = MemoryArea->StartingAddress; + Info->RegionSize = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; Status = STATUS_SUCCESS; *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); break; @@ -255,9 +258,10 @@ Info->State = MEM_COMMIT; Info->Protect = MemoryArea->Attributes; Info->AllocationProtect = MemoryArea->Attributes; - Info->BaseAddress = MemoryArea->BaseAddress; - Info->AllocationBase = MemoryArea->BaseAddress; - Info->RegionSize = MemoryArea->Length; + Info->BaseAddress = MemoryArea->StartingAddress; + Info->AllocationBase = MemoryArea->StartingAddress; + Info->RegionSize = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; Status = STATUS_SUCCESS; *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); break; Index: mm/anonmem.c =================================================================== --- mm/anonmem.c (revision 12712) +++ mm/anonmem.c (working copy) @@ -261,7 +261,7 @@ /* * Get the segment corresponding to the virtual address */ - Region = MmFindRegion(MemoryArea->BaseAddress, + Region = MmFindRegion(MemoryArea->StartingAddress, &MemoryArea->Data.VirtualMemoryData.RegionListHead, Address, NULL); if (Region->Type == MEM_RESERVE || Region->Protect == PAGE_NOACCESS) @@ -525,6 +525,7 @@ { PEPROCESS Process; MEMORY_AREA* MemoryArea; + ULONG_PTR MemoryAreaLength; ULONG Type; NTSTATUS Status; PMADDRESS_SPACE AddressSpace; @@ -582,40 +583,44 @@ MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, BaseAddress); - if (MemoryArea != NULL && - MemoryArea->Type == MEMORY_AREA_VIRTUAL_MEMORY && - MemoryArea->Length >= RegionSize) + if (MemoryArea != NULL) { - Status = - MmAlterRegion(AddressSpace, - MemoryArea->BaseAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - BaseAddress, RegionSize, - Type, Protect, MmModifyAttributes); - MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); - DPRINT("NtAllocateVirtualMemory() = %x\n",Status); - return(Status); + MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; + if (MemoryArea->Type == MEMORY_AREA_VIRTUAL_MEMORY && + MemoryAreaLength >= RegionSize) + { + Status = + MmAlterRegion(AddressSpace, + MemoryArea->StartingAddress, + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + BaseAddress, RegionSize, + Type, Protect, MmModifyAttributes); + MmUnlockAddressSpace(AddressSpace); + ObDereferenceObject(Process); + DPRINT("NtAllocateVirtualMemory() = %x\n",Status); + return(Status); + } + else if (MemoryAreaLength >= RegionSize) + { + Status = + MmAlterRegion(AddressSpace, + MemoryArea->StartingAddress, + &MemoryArea->Data.SectionData.RegionListHead, + BaseAddress, RegionSize, + Type, Protect, MmModifyAttributes); + MmUnlockAddressSpace(AddressSpace); + ObDereferenceObject(Process); + DPRINT("NtAllocateVirtualMemory() = %x\n",Status); + return(Status); + } + else + { + MmUnlockAddressSpace(AddressSpace); + ObDereferenceObject(Process); + return(STATUS_UNSUCCESSFUL); + } } - else if (MemoryArea != NULL && MemoryArea->Length >= RegionSize) - { - Status = - MmAlterRegion(AddressSpace, - MemoryArea->BaseAddress, - &MemoryArea->Data.SectionData.RegionListHead, - BaseAddress, RegionSize, - Type, Protect, MmModifyAttributes); - MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); - DPRINT("NtAllocateVirtualMemory() = %x\n",Status); - return(Status); - } - else if (MemoryArea != NULL) - { - MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); - return(STATUS_UNSUCCESSFUL); - } } Status = MmCreateMemoryArea(Process, @@ -626,7 +631,7 @@ Protect, &MemoryArea, PBaseAddress != 0, - (AllocationType & MEM_TOP_DOWN), + (AllocationType & MEM_TOP_DOWN) == MEM_TOP_DOWN, BoundaryAddressMultiple); if (!NT_SUCCESS(Status)) { @@ -635,18 +640,22 @@ DPRINT("NtAllocateVirtualMemory() = %x\n",Status); return(Status); } + + MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; + MmInitialiseRegion(&MemoryArea->Data.VirtualMemoryData.RegionListHead, - MemoryArea->Length, Type, Protect); + MemoryAreaLength, Type, Protect); if ((AllocationType & MEM_COMMIT) && ((Protect & PAGE_READWRITE) || (Protect & PAGE_EXECUTE_READWRITE))) { - MmReserveSwapPages(MemoryArea->Length); + MmReserveSwapPages(MemoryAreaLength); } *UBaseAddress = BaseAddress; - *URegionSize = MemoryArea->Length; + *URegionSize = MemoryAreaLength; DPRINT("*UBaseAddress %x *URegionSize %x\n", BaseAddress, RegionSize); MmUnlockAddressSpace(AddressSpace); @@ -702,7 +711,11 @@ */ if (MemoryArea->PageOpCount > 0) { - for (i = 0; i < PAGE_ROUND_UP(MemoryArea->Length) / PAGE_SIZE; i++) + ULONG_PTR MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; + + /* FiN TODO: Optimize loop counter! */ + for (i = 0; i < PAGE_ROUND_UP(MemoryAreaLength) / PAGE_SIZE; i++) { PMM_PAGEOP PageOp; @@ -712,7 +725,7 @@ } PageOp = MmCheckForPageOp(MemoryArea, Process->UniqueProcessId, - (char*)MemoryArea->BaseAddress + (i * PAGE_SIZE), + (PVOID)((ULONG_PTR)MemoryArea->StartingAddress + (i * PAGE_SIZE)), NULL, 0); if (PageOp != NULL) { @@ -745,8 +758,7 @@ /* Actually free the memory area. */ MmFreeMemoryArea(&Process->AddressSpace, - MemoryArea->BaseAddress, - 0, + MemoryArea, MmFreeVirtualMemoryPage, (PVOID)Process); } @@ -814,7 +826,7 @@ { case MEM_RELEASE: /* We can only free a memory area in one step. */ - if (MemoryArea->BaseAddress != BaseAddress || + if (MemoryArea->StartingAddress != BaseAddress || MemoryArea->Type != MEMORY_AREA_VIRTUAL_MEMORY) { MmUnlockAddressSpace(AddressSpace); @@ -829,7 +841,7 @@ case MEM_DECOMMIT: Status = MmAlterRegion(AddressSpace, - MemoryArea->BaseAddress, + MemoryArea->StartingAddress, &MemoryArea->Data.VirtualMemoryData.RegionListHead, BaseAddress, RegionSize, @@ -856,11 +868,11 @@ PMM_REGION Region; NTSTATUS Status; - Region = MmFindRegion(MemoryArea->BaseAddress, + Region = MmFindRegion(MemoryArea->StartingAddress, &MemoryArea->Data.VirtualMemoryData.RegionListHead, BaseAddress, NULL); *OldProtect = Region->Protect; - Status = MmAlterRegion(AddressSpace, MemoryArea->BaseAddress, + Status = MmAlterRegion(AddressSpace, MemoryArea->StartingAddress, &MemoryArea->Data.VirtualMemoryData.RegionListHead, BaseAddress, Length, Region->Type, Protect, MmModifyAttributes); @@ -878,11 +890,11 @@ Info->BaseAddress = (PVOID)PAGE_ROUND_DOWN(Address); - Region = MmFindRegion(MemoryArea->BaseAddress, + Region = MmFindRegion(MemoryArea->StartingAddress, &MemoryArea->Data.VirtualMemoryData.RegionListHead, Address, &RegionBase); Info->BaseAddress = RegionBase; - Info->AllocationBase = MemoryArea->BaseAddress; + Info->AllocationBase = MemoryArea->StartingAddress; Info->AllocationProtect = MemoryArea->Attributes; Info->RegionSize = (char*)RegionBase + Region->Length - (char*)Info->BaseAddress; Info->State = Region->Type; Index: mm/rmap.c =================================================================== --- mm/rmap.c (revision 12712) +++ mm/rmap.c (working copy) @@ -91,7 +91,7 @@ } Process = entry->Process; Address = entry->Address; - if ((((ULONG)Address) & 0xFFF) != 0) + if ((((ULONG_PTR)Address) & 0xFFF) != 0) { KEBUGCHECK(0); } @@ -131,7 +131,7 @@ Type = MemoryArea->Type; if (Type == MEMORY_AREA_SECTION_VIEW) { - Offset = (ULONG)((char*)Address - (ULONG)MemoryArea->BaseAddress); + Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress; /* * Get or create a pageop @@ -220,7 +220,7 @@ } Process = entry->Process; Address = entry->Address; - if ((((ULONG)Address) & 0xFFF) != 0) + if ((((ULONG_PTR)Address) & 0xFFF) != 0) { KEBUGCHECK(0); } @@ -255,7 +255,7 @@ Type = MemoryArea->Type; if (Type == MEMORY_AREA_SECTION_VIEW) { - Offset = (ULONG)((char*)Address - (ULONG)MemoryArea->BaseAddress); + Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress; /* * Get or create a pageop Index: mm/cont.c =================================================================== --- mm/cont.c (revision 12712) +++ mm/cont.c (working copy) @@ -42,7 +42,7 @@ { PMEMORY_AREA MArea; NTSTATUS Status; - PVOID BaseAddress = 0; + PVOID BaseAddress = NULL; PFN_TYPE PBase; ULONG Attributes; ULONG i; @@ -83,8 +83,7 @@ { MmLockAddressSpace(MmGetKernelAddressSpace()); MmFreeMemoryArea(MmGetKernelAddressSpace(), - BaseAddress, - 0, + MArea, NULL, NULL); MmUnlockAddressSpace(MmGetKernelAddressSpace()); @@ -174,11 +173,10 @@ MmFreeContiguousMemory(IN PVOID BaseAddress) { MmLockAddressSpace(MmGetKernelAddressSpace()); - MmFreeMemoryArea(MmGetKernelAddressSpace(), - BaseAddress, - 0, - MmFreeContinuousPage, - NULL); + MmFreeMemoryAreaByPtr(MmGetKernelAddressSpace(), + BaseAddress, + MmFreeContinuousPage, + NULL); MmUnlockAddressSpace(MmGetKernelAddressSpace()); } @@ -260,11 +258,10 @@ IN MEMORY_CACHING_TYPE CacheType) { MmLockAddressSpace(MmGetKernelAddressSpace()); - MmFreeMemoryArea(MmGetKernelAddressSpace(), - BaseAddress, - NumberOfBytes, - MmFreeContinuousPage, - NULL); + MmFreeMemoryAreaByPtr(MmGetKernelAddressSpace(), + BaseAddress, + MmFreeContinuousPage, + NULL); MmUnlockAddressSpace(MmGetKernelAddressSpace()); } Index: mm/iospace.c =================================================================== --- mm/iospace.c (revision 12712) +++ mm/iospace.c (working copy) @@ -127,7 +127,7 @@ KEBUGCHECK(0); } } - return ((PVOID)((char*)Result + Offset)); + return (PVOID)((ULONG_PTR)Result + Offset); } @@ -160,16 +160,17 @@ IN ULONG NumberOfBytes) { ULONG Offset; - Offset = (ULONG_PTR)BaseAddress % PAGE_SIZE; - BaseAddress = (PVOID)((PUCHAR)BaseAddress - Offset); + PVOID Address = BaseAddress; + + Offset = (ULONG_PTR)Address % PAGE_SIZE; + Address -= Offset; NumberOfBytes += Offset; MmLockAddressSpace(MmGetKernelAddressSpace()); - MmFreeMemoryArea(MmGetKernelAddressSpace(), - BaseAddress, - NumberOfBytes, - NULL, - NULL); + MmFreeMemoryAreaByPtr(MmGetKernelAddressSpace(), + Address, + NULL, + NULL); MmUnlockAddressSpace(MmGetKernelAddressSpace()); } Index: mm/drvlck.c =================================================================== --- mm/drvlck.c (revision 12712) +++ mm/drvlck.c (working copy) @@ -64,7 +64,7 @@ MmLockPagableDataSection(IN PVOID AddressWithinSection) { PVOID Handle; - Handle = MmOpenMemoryAreaByAddress(NULL,AddressWithinSection); + Handle = MmOpenMemoryAreaByAddress(NULL, AddressWithinSection); MmLockPagableSectionByHandle(Handle); return(Handle); } Index: mm/aspace.c =================================================================== --- mm/aspace.c (revision 12712) +++ mm/aspace.c (working copy) @@ -68,7 +68,7 @@ MmInitializeAddressSpace(PEPROCESS Process, PMADDRESS_SPACE AddressSpace) { - InitializeListHead(&AddressSpace->MAreaListHead); + AddressSpace->MemoryAreaRoot = NULL; ExInitializeFastMutex(&AddressSpace->Lock); if (Process != NULL) { Index: mm/mminit.c =================================================================== --- mm/mminit.c (revision 12712) +++ mm/mminit.c (working copy) @@ -480,10 +480,9 @@ MiFreeInitMemory(VOID) { MmLockAddressSpace(MmGetKernelAddressSpace()); - MmFreeMemoryArea(MmGetKernelAddressSpace(), - (PVOID)&_init_start__, - PAGE_ROUND_UP((ULONG)&_init_end__) - (ULONG)&_init_start__, - MiFreeInitMemoryPage, - NULL); + MmFreeMemoryAreaByPtr(MmGetKernelAddressSpace(), + (PVOID)&_init_start__, + MiFreeInitMemoryPage, + NULL); MmUnlockAddressSpace(MmGetKernelAddressSpace()); }

20 years, 10 months

1
0
0 0

Re: [ros-svn] [hbirr] 12690: - Implemented KeAcquireInterruptSpinLock and KeReleaseInterruptSpinLock.

by Alex Ionescu

hbirr(a)svn.reactos.com wrote: >- Implemented KeAcquireInterruptSpinLock and KeReleaseInterruptSpinLock. >- Implemented the interrupt handling for smp machines. > > > >Updated files: >trunk/reactos/include/ddk/kefuncs.h >trunk/reactos/include/ntos/zwtypes.h >trunk/reactos/ntoskrnl/io/irq.c >trunk/reactos/ntoskrnl/ke/i386/irq.c >trunk/reactos/ntoskrnl/ke/spinlock.c > >_______________________________________________ >Ros-svn mailing list >Ros-svn(a)reactos.com >http://reactos.com:8080/mailman/listinfo/ros-svn > > > Hi, Thanks for adding this feature to the kernel, I only have one problem with it... Would it be possible to modify the code to use the documented KINTERRUPT structure? This would (already does) wreck havoc on the new header system, which uses documented Windows structures (except in extreme cases where our code is very old, and those structures were unavailable, ie the Ob Manager structures... although enventually that code will have to be updated). The correct KINTERRUPT structure is: typedef struct _KINTERRUPT { CSHORT Type; CSHORT Size; LIST_ENTRY InterruptListEntry; PKSERVICE_ROUTINE ServiceRoutine; PVOID ServiceContext; KSPIN_LOCK SpinLock; ULONG TickCount; PKSPIN_LOCK ActualLock; PVOID DispatchAddress; ULONG Vector; KIRQL Irql; KIRQL SynchronizeIrql; BOOLEAN FloatingSave; BOOLEAN Connected; CHAR Number; UCHAR ShareVector; KINTERRUPT_MODE Mode; ULONG ServiceCount; ULONG DispatchCount; ULONG DispatchCode[106]; } *KINTERRUPT*, *PKINTERRUPT; vs ours: typedef struct _KINTERRUPT { ULONG Vector; KAFFINITY ProcessorEnableMask; KSPIN_LOCK SpinLock; PKSPIN_LOCK ActualLock; BOOLEAN Shareable; BOOLEAN FloatingSave; CHAR ProcessorNumber; PKSERVICE_ROUTINE ServiceRoutine; PVOID ServiceContext; LIST_ENTRY Entry; KIRQL Irql; KIRQL SynchLevel; KINTERRUPT_MODE InterruptMode; } KINTERRUPT; Type/Size are Windows Ob Manager headers for each Object...if you look in KOBJECTS you'll find the right value...but we don't check for this yet, so it's not important yet. I don't know what "Shareable" is however. But we only need to rename/reposition some of the items. ProcessorEnableMask also seems to be missing in the real defintion. If you'd be kind enough to do these changes, I would really appreciate it. If you have any comments, let me know. Best regards, and happy new year, Alex Ionescu

20 years, 10 months

2
3
0 0

KeConnectInterrupt & ListHeads

by David Kredba

Hello, I got this with current svn tree : make[1]: Entering directory `/home/dave2/ros/reactos/ntoskrnl' ../tools/regtests ./tests/tests ./tests/_regtests.c ./tests/Makefile.tests -e ./tests/_rtstub.c ../tools/regtests -s ./tests/stubs.tst ./tests/_stubs.S ./tests/_hooks.c mingw32-windres --include-dir ../include --include-dir ../w32api/include ntoskrnl.rc -o ntoskrnl.coff mingw32-gcc -c -x assembler-with-cpp -I./include -g -I../include -I../w32api/include -D__ASM__ -D_M_IX86 -D__3GB__ -c ke/i386/multiboot.S -o ke/i386/multiboot.o mingw32-gcc -I./include -I../lib/kjs/include -Wall -Werror -D_DISABLE_TIDENTS -D__3GB__ -D__NTOSKRNL__ -I. -D_SEH_NO_NATIVE_NLG -I../include -I../w32api/include -pipe -march=i486 -D_M_IX86 -g include/ntoskrnl.h mingw32-gcc -I./include -I../lib/kjs/include -Wall -Werror -D_DISABLE_TIDENTS -D__3GB__ -D__NTOSKRNL__ -I. -D_SEH_NO_NATIVE_NLG -I../include -I../w32api/include -pipe -march=i486 -D_M_IX86 -g -c ex/i386/interlck.c -o ex/i386/interlck.o mingw32-gcc -I./include -I../lib/kjs/include -Wall -Werror -D_DISABLE_TIDENTS -D__3GB__ -D__NTOSKRNL__ -I. -D_SEH_NO_NATIVE_NLG -I../include -I../w32api/include -pipe -march=i486 -D_M_IX86 -g -c ke/i386/exp.c -o ke/i386/exp.o mingw32-gcc -I./include -I../lib/kjs/include -Wall -Werror -D_DISABLE_TIDENTS -D__3GB__ -D__NTOSKRNL__ -I. -D_SEH_NO_NATIVE_NLG -I../include -I../w32api/include -pipe -march=i486 -D_M_IX86 -g -c ke/i386/irq.c -o ke/i386/irq.o ke/i386/irq.c: In function `KeConnectInterrupt': ke/i386/irq.c:496: error: structure has no member named `ListHeads' make[1]: *** [ke/i386/irq.o] Error 1 make[1]: Leaving directory `/home/dave2/ros/reactos/ntoskrnl' make: *** [ntoskrnl] Error 2 Thanks, David

20 years, 10 months

3
3
0 0

¿Serious Bug with ReactOS liveCD RC-2?

by Lucio Diaz

I tested the live cd in a: -Intel 1.6 GHZ -Mainboard Intel 82801BA and CD drives -TEAC CD-540E -Yamaha CRW8424E The liveCD was in the Yamaha drive, all worked normally till i log off, the computer resets as normally and sudenly when the computer loads again it does not detect the yamaha CD, i tried reseting several times to try to put back online but not even the light of the yamaha turned on. I finaly turned down the power and swiched on again, the both CD drives where detected. Never something similar have happened to me, it is too much casual it happens on testing the liveCD just in THAT CD, but still i can not say if it is a bug of reactos or not. Another less important isue: I get the following error when accessing to the HDD E_ACCESSDENIED_WIN32 ACCESS DENIED ERROR Context:Shellfolder::Shellfolder(IShellfolder*,LPCITEMIDLST) Location: Utility/Shellclasses CPP:280 Still i can access the HDD (this happened two with the RC-1) Best Regards and Happy New Year, Lucio Diaz. ______________________________________________ Renovamos el Correo Yahoo!: ¡250 MB GRATIS! Nuevos servicios, más seguridad http://correo.yahoo.es

20 years, 10 months

8
13
0 0

Re: [ros-diffs] [ion] 12682: Fix DMA_OPERATIONS to use stdcall.

by Filip Navara

ion(a)svn.reactos.com wrote: >Fix DMA_OPERATIONS to use stdcall. > >Modified: trunk/reactos/include/ddk/iotypes.h >Modified: trunk/reactos/ntoskrnl/io/pnpdma.c > > > ------------------------------------------------------------------------ > *Modified: trunk/reactos/include/ddk/iotypes.h* > >--- trunk/reactos/include/ddk/iotypes.h 2005-01-01 08:20:47 UTC (rev 12681) >+++ trunk/reactos/include/ddk/iotypes.h 2005-01-01 08:43:02 UTC (rev 12682) >@@ -1196,18 +1196,18 @@ > > SCATTER_GATHER_ELEMENT Elements[1]; > } SCATTER_GATHER_LIST, *PSCATTER_GATHER_LIST; > > > >-typedef VOID (*PPUT_DMA_ADAPTER)( > > >+typedef VOID STDCALL (*PPUT_DMA_ADAPTER)( > > This should be written as "typedef VOID (STDCALL *PPUT_DMA_ADAPTER)" Same for the other changes you made. - Filip

20 years, 10 months

1
0
0 0

(no subject)

by Stephen Hodges

Will the CVS server sync up with SVN? It would keep the cvsweb app running. Why not also sync the sourceforge project cvs with SVN? As an extra mirror How often will it sync up? Stephen Hodges HYPERLINK "http://www.thespoke.net/MyBlog/stevo/MyBlog.aspx"http://www.thespoke.net/My Blog/stevo/MyBlog.aspx -- No virus found in this outgoing message. Checked by AVG Anti-Virus. Version: 7.0.296 / Virus Database: 265.6.7 - Release Date: 12/30/2004

20 years, 10 months

3
2
0 0

Generated file in repo

by Mike Lerwill

The file "wine_unicode.map" in "\lib\unicode" appears to be a file generated at build time and as such needs to be deleted from the repository Mike

20 years, 10 months

1
0
0 0

CVS has been converted to Subversion

by Casper Hornstrup

See subject. Casper

20 years, 10 months

5
7
0 0

Re: [ros-cvs] CVS Update: reactos

by Filip Navara

ekohl(a)cvs.reactos.com wrote: >CVSROOT: /CVS/ReactOS >Module name: reactos >Repository: reactos/drivers/fs/np/ >Changes by: ekohl(a)mok.osexperts.com 04/12/30 04:34:27 > >Modified files: > reactos/drivers/fs/np/: create.c fsctrl.c > >Log message: > Use a new passive pipe state (0) to ensure that client ends don't connect to server ends in calls to WaitNamed Pipe(). > > This change breaks services.exe. Now it stops loading auto-start drivers because it ends up waiting in ConnectNamedPipe call. Trace w/ old version (CVS 29/12): (database.c:729) Group 'Event log' (database.c:532) ScmStartService() called (database.c:535) Service->Type: 16 (database.c:568) ImagePath: 'C:\ReactOS\system32\eventlog.exe' (database.c:569) Type: 10 (create.c:224) NpfsCreateNamedPipe(DeviceObject c03ac950 Irp c04cb228) (create.c:229) FileObject c04cb038 (create.c:230) Pipe name \net\NtControlPipe (database.c:580) CreateNamedPipeW() done (database.c:621) Process Id: 7 Handle 8c (database.c:624) Thread Id: 44 Handle 90 database.c:633 (fsctrl.c:391) NpfsFileSystemContol(DeviceObject c03ac950 Irp c04cf870) (fsctrl.c:395) IoStack: c04cf8e0 (fsctrl.c:397) FileObject: c04cb038 (fsctrl.c:399) Fcb: c04cbe70 (fsctrl.c:401) Pipe: c04cbef0 (fsctrl.c:402) PipeName: \net\NtControlPipe (fsctrl.c:417) Connecting pipe \net\NtControlPipe (fsctrl.c:29) NpfsConnectPipe() (fsctrl.c:40) Waiting for connection... (fsctrl.c:84) No listening client fcb found -- waiting for client (create.c:81) NpfsCreate(DeviceObject c03ac950 Irp c05e3528) (create.c:87) FileObject c05e3440 (create.c:88) FileName \net\NtControlPipe (create.c:36) <\net\NtControlPipe> = <\net\NtControlPipe> (create.c:59) Server found! Fcb c04cbe70 (create.c:195) Setting the ConnectEvent for c04cbe70 (create.c:206) Success! (fsctrl.c:391) NpfsFileSystemContol(DeviceObject c03ac950 Irp c05e3528) (fsctrl.c:395) IoStack: c05e3598 (fsctrl.c:397) FileObject: c05e3440 (fsctrl.c:399) Fcb: c05dc788 (fsctrl.c:401) Pipe: c04cbef0 (fsctrl.c:402) PipeName: \net\NtControlPipe (fsctrl.c:437) Waitin(fsctrl.c:101) Client Fcb: c05dc788 (database.c:638) Control pipe connected! Trace w/ new version (CVS frozen): (database.c:729) Group 'Event log' (database.c:532) ScmStartService() called (database.c:535) Service->Type: 16 (database.c:568) ImagePath: 'C:\ReactOS\system32\eventlog.exe' (database.c:569) Type: 10 (create.c:237) NpfsCreateNamedPipe(DeviceObject c03aa9b0 Irp c04cb098) (create.c:242) FileObject c04caef8 (create.c:243) Pipe name \net\NtControlPipe (database.c:580) CreateNamedPipeW() done (database.c:621) Process Id: 7 Handle 8c (database.c:624) Thread Id: 44 Handle 90 database.c:633 (fsctrl.c:406) NpfsFileSystemContol(DeviceObject c03aa9b0 Irp c04cf870) (fsctrl.c:410) IoStack: c04cf8e0 (fsctrl.c:412) FileObject: c04caef8 (fsctrl.c:414) Fcb: c04cb158 (fsctrl.c:416) Pipe: c04cbe38 (fsctrl.c:417) PipeName: \net\NtControlPipe (fsctrl.c:432) Connecting pipe \net\NtControlPipe (fsctrl.c:29) NpfsConnectPipe() (fsctrl.c:40) Waiting for connection... (fsctrl.c:95) No listening client fcb found -- waiting for client (create.c:81) NpfsCreate(DeviceObject c03aa9b0 Irp c05e3728) (create.c:86) FileObject c05e3640 (create.c:87) FileName \net\NtControlPipe (create.c:94) NpfsCreate() open client end for special use! (create.c:36) <\net\NtControlPipe> = <\net\NtControlPipe> <<-- Here is doesn't connect because the server pipe is not in listening state. (create.c:219) Success! (fsctrl.c:406) NpfsFileSystemContol(DeviceObject c03aa9b0 Irp c05e3728) (fsctrl.c:410) IoStack: c05e3798 (fsctrl.c:412) FileObject: c05e3640 (fsctrl.c:414) Fcb: c05e77a0 (fsctrl.c:416) Pipe: c04cbe38 (fsctrl.c:417) PipeName: \net\NtControlPipe (fsctrl.c:452) Waiting for pipe \net\NtControlPipe (fsctrl.c:166) NpfsWaitPipe (fsctrl.c:188) Listening server fcb found -- connecting (create.c:451) NpfsClose(DeviceObject c03aa9b0 Irp c05e3728) (create.c:466) Fcb c05e77a0 (create.c:469) Closing pipe \net\NtControlPipe (create.c:483) Client (create.c:81) NpfsCreate(DeviceObject c03aa9b0 Irp c05e3618) (create.c:86) FileObject c05e7ef0 (create.c:87) FileName \net\NtControlPipe (create.c:94) NpfsCreate() open client end for special use! (create.c:36) <\net\NtControlPipe> = <\net\NtControlPipe> (create.c:219) Success! (fsctrl.c:406) NpfsFileSystemContol(DeviceObject c03aa9b0 Irp c05e3618) (fsctrl.c:410) IoStack: c05e3688 (fsctrl.c:412) FileObject: c05e7ef0 (fsctrl.c:414) Fcb: c05e9070 (fsctrl.c:416) Pipe: c04cbe38 (fsctrl.c:417) PipeName: \net\NtControlPipe (fsctrl.c:472) Get state (fsctrl.c:276) Status (0x0). (fsctrl.c:406) NpfsFileSystemContol(DeviceObject c03aa9b0 Irp c05e3618) (fsctrl.c:410) IoStack: c05e3688 (fsctrl.c:412) FileObject: c05e7ef0 (fsctrl.c:414) Fcb: c05e9070 (fsctrl.c:416) Pipe: c04cbe38 (fsctrl.c:417) PipeName: \net\NtControlPipe (fsctrl.c:477) Set state (fsctrl.c:349) Status (0x0). (rw.c:278) NpfsWrite() (rw.c:282) FileObject c05e7ef0 (rw.c:283) Pipe name \net\NtControlPipe (rw.c:302) Pipe is NOT connected! (rw.c:432) NpfsWrite done (Status c0000001)

20 years, 10 months

2
1
0 0

CVS being converted to SVN

by Casper Hornstrup

The conversion process has begun. I expect it to take about 30 hours to complete. I have tagged CVS HEAD with the tag "SVN". Casper

20 years, 10 months

3
4
0 0

RE: [ros-cvs] I can't find some head files

by Ge van Geldorp

> From: yang > > I got the source from cvs,but I can't find some head files > like roscfg.h. Why? And where can I get it? roscfg.h (and a few others) should be generated during build. Generated files are normally not stored in CVS. Gé van Geldorp.

20 years, 10 months

1
0
0 0

Re: [ros-cvs] CVS Update: CVSROOT

by Filip Navara

Rex Jolliff wrote: >CVSROOT: /CVS/ReactOS >Module name: CVSROOT >Repository: ./ >Changes by: rex(a)mok.osexperts.com 04/12/30 10:57:07 > >Added files: > ./: writers > >Log message: > made repo read-only > > The CVS build is currently broken (blame Alex)! The attached patch fixes it. - Filip Index: lib/dbghelp/Makefile =================================================================== RCS file: /CVS/ReactOS/reactos/lib/dbghelp/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- lib/dbghelp/Makefile 16 Dec 2004 17:42:10 -0000 1.1 +++ lib/dbghelp/Makefile 2 Jan 2004 21:49:46 -0000 @@ -1,409 +1,9 @@ -TOPSRCDIR = ../.. -TOPOBJDIR = ../.. -SRCDIR = . +# $Id: makefile,v 1.6 2004/01/02 19:49:45 gvg Exp $ -MODULE = dbghelp.dll -IMPORTS = psapi kernel32 ntdll +PATH_TO_TOP = ../.. -C_SRCS = \ - coff.c \ - dbghelp.c \ - elf_module.c \ - image.c \ - memory.c \ - minidump.c \ - module.c \ - msc.c \ - path.c \ - pe_module.c \ - source.c \ - stabs.c \ - stack.c \ - storage.c \ - symbol.c \ - type.c +TARGET_TYPE = winedll +include $(PATH_TO_TOP)/rules.mak -# Global rules for building dlls -*-Makefile-*- -# -# Each individual makefile should define the following variables: -# MODULE : name of the main module being built -# EXTRALIBS : extra libraries to link in (optional) -# SPEC_SRCS16 : interface definition files for 16-bit dlls (optional) -# SUBSYSTEM : (optional) subsystem (for native dlls) -# -# plus all variables required by the global Make.rules.in -# - -DLLDEFS = -DLLFLAGS = -D_REENTRANT -fPIC -DLLEXT = .so -DEFS = -D__WINESRC__ $(DLLDEFS) $(EXTRADEFS) -MAINSPEC = $(MODULE:%.dll=%).spec -SPEC_DEF = $(MAINSPEC).def -WIN16_FILES = $(SPEC_SRCS16:.spec=.spec.o) $(C_SRCS16:.c=.o) $(EXTRA_OBJS16) -ALL_OBJS = $(WIN16_FILES) $(OBJS) $(MODULE).dbg.o -ALL_LIBS = $(LIBWINE) $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS) -IMPORTLIBS = $(DELAYIMPORTS:%=$(DLLDIR)/lib%.$(IMPLIBEXT)) $(IMPORTS:%=$(DLLDIR)/lib%.$(IMPLIBEXT)) - -all: $(MODULE)$(DLLEXT) $(SUBDIRS) - - -# Global rules shared by all makefiles -*-Makefile-*- -# -# Each individual makefile must define the following variables: -# TOPSRCDIR : top-level source directory -# TOPOBJDIR : top-level object directory -# SRCDIR : source directory for this module -# MODULE : name of the module being built -# -# Each individual makefile may define the following additional variables: -# C_SRCS : C sources for the module -# C_SRCS16 : 16-bit C sources for the module -# RC_SRCS : resource source files -# EXTRA_SRCS : extra source files for make depend -# EXTRA_OBJS : extra object files -# IMPORTS : dlls to import -# DELAYIMPORTS : dlls to import in delayed mode -# SUBDIRS : subdirectories that contain a Makefile -# EXTRASUBDIRS : subdirectories that do not contain a Makefile -# INSTALLSUBDIRS : subdirectories to run make install/uninstall into - -# First some useful definitions - -SHELL = /bin/sh -CC = gcc -CFLAGS = -g -O2 -CPPFLAGS = -LIBS = -BISON = bison -YACC = $(BISON) -y -LEX = flex -LEXLIB = -lfl -EXEEXT = -OBJEXT = o -LIBEXT = so -DLLEXT = .so -IMPLIBEXT = def -LDSHARED = $(CC) -shared $(SONAME:%=-Wl,-soname,%) $(VERSCRIPT:%=-Wl,--version-script=%) -DLLTOOL = false -DLLWRAP = -AR = ar rc -RANLIB = ranlib -STRIP = strip -WINDRES = false -LN = ln -LN_S = ln -s -TOOLSDIR = $(TOPOBJDIR) -AS = as -LD = ld -LDFLAGS = -RM = rm -f -MV = mv -LINT = -LINTFLAGS = -FONTFORGE = false -INCLUDES = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include $(EXTRAINCL) -EXTRACFLAGS = -Wall -pipe -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) -ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS) -IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS) -MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755 -WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi_check/winapi_check -WINEWRAPPER = $(TOPSRCDIR)/tools/winewrapper -C2MAN = $(TOPSRCDIR)/tools/c2man.pl -RUNTEST = $(TOPSRCDIR)/tools/runtest -WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild -MAKEDEP = $(TOOLSDIR)/tools/makedep -WRC = $(TOOLSDIR)/tools/wrc/wrc -BIN2RES = $(TOOLSDIR)/tools/bin2res -WMC = $(TOOLSDIR)/tools/wmc/wmc -WIDL = $(TOOLSDIR)/tools/widl/widl -WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc -SFNT2FNT = $(TOOLSDIR)/tools/sfnt2fnt -FNT2FON = $(TOOLSDIR)/tools/fnt2fon -RC = $(WRC) -RC16 = $(WRC) -RCFLAGS = --nostdinc $(INCLUDES) $(DEFS) $(EXTRARCFLAGS) -RC16FLAGS = -O res16 $(RCFLAGS) -LDPATH = LD_LIBRARY_PATH="$(TOOLSDIR)/libs/unicode:$$LD_LIBRARY_PATH" -DLLDIR = $(TOPOBJDIR)/dlls -LIBDIR = $(TOPOBJDIR)/libs -LIBPORT = -L$(TOPOBJDIR)/libs/port -lwine_port -LIBUNICODE = -L$(TOPOBJDIR)/libs/unicode -lwine_unicode -LIBWINE = -L$(TOPOBJDIR)/libs/wine -lwine - - - -# Installation infos - -INSTALL = /usr/bin/ginstall -c $(INSTALL_FLAGS) -INSTALL_PROGRAM = ${INSTALL} $(INSTALL_PROGRAM_FLAGS) -INSTALL_SCRIPT = ${INSTALL} $(INSTALL_SCRIPT_FLAGS) -INSTALL_DATA = ${INSTALL} -m 644 $(INSTALL_DATA_FLAGS) -prefix = /usr/local -exec_prefix = ${prefix} -bindir = ${exec_prefix}/bin -libdir = ${exec_prefix}/lib -datadir = ${prefix}/share -infodir = ${prefix}/info -mandir = ${prefix}/man -sysconfdir = ${prefix}/etc -includedir = ${prefix}/include/wine -dlldir = ${exec_prefix}/lib/wine -prog_manext = 1 -api_manext = 3w -conf_manext = 5 -CLEAN_FILES = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \ - *.flc *.spec.c *.spec.def *.dbg.c *.tab.c *.tab.h lex.yy.c core - -OBJS = $(C_SRCS:.c=.o) $(EXTRA_OBJS) - -RCOBJS = $(RC_SRCS:.rc=.res.o) -LINTS = $(C_SRCS:.c=.ln) - -# Implicit rules - -.SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.c .spec.def .idl .h .ok .sfd .ttf - -.c.o: - $(CC) -c $(ALLCFLAGS) -o $@ $< - -.s.o: - $(AS) -o $@ $< - -.mc.mc.rc: - $(LDPATH) $(WMC) -i -U -H /dev/null -o $@ $< - -.rc.res: - $(LDPATH) $(RC) $(RCFLAGS) -fo$@ $< - -.res.res.o: - $(WINDRES) -i $< -o $@ - -.spec.spec.c: - $(WINEBUILD) $(DEFS) -o $@ --main-module $(MODULE) --dll $< - -.spec.spec.def: - $(WINEBUILD) -w $(DEFS) -o $@ --def $< - -.idl.h: - $(WIDL) $(IDLFLAGS) -h -H $@ $< - -.c.ln: - $(LINT) -c $(ALLLINTFLAGS) $< || ( $(RM) $@ && exit 1 ) - -.c.ok: - $(RUNTEST) $(RUNTESTFLAGS) $< && touch $@ - -.sfd.ttf: - $(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $< - -# 'all' target first in case the enclosing Makefile didn't define any target - -all: Makefile - -filter: - @$(TOPSRCDIR)/tools/winapi/make_filter --make $(MAKE) all - -.PHONY: all filter - -# Rules for resources - -$(RC_BINARIES): $(BIN2RES) $(RC_BINSRC) - $(BIN2RES) -f -o $@ $(SRCDIR)/$(RC_BINSRC) - -$(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(WRC) $(RC_BINARIES) - -# Rule for main module debug channels - -$(MODULE).dbg.c: $(C_SRCS) $(C_SRCS16) $(WINEBUILD) - $(WINEBUILD) $(DEFS) -o $@ --debug -C$(SRCDIR) $(C_SRCS) $(C_SRCS16) - -# Rules for makefile - -Makefile: Makefile.in $(TOPSRCDIR)/configure - @echo Makefile is older than $?, please rerun $(TOPSRCDIR)/configure - @exit 1 - -# Rule for linting - -$(MODULE).ln : $(LINTS) - if test "$(LINTS)" ; \ - then \ - $(LINT) $(ALLLINTFLAGS) -o$(MODULE) $(LINTS) ; \ - $(MV) llib-l$(MODULE).ln $(MODULE).ln ; \ - else \ - $(LINT) $(ALLLINTFLAGS) -C$(MODULE) /dev/null ; \ - fi - -lint:: $(MODULE).ln - -# Rules for Windows API checking - -winapi_check:: dummy - $(WINAPI_CHECK) $(WINAPI_CHECK_FLAGS) $(WINAPI_CHECK_EXTRA_FLAGS) . - -.PHONY: winapi_check - -# Rules for dependencies - -$(SUBDIRS:%=%/__depend__): dummy - cd `dirname $@` && $(MAKE) depend - -depend: $(IDL_SRCS:.idl=.h) $(SUBDIRS:%=%/__depend__) - $(MAKEDEP) $(INCLUDES) -C$(SRCDIR) $(C_SRCS) $(C_SRCS16) $(RC_SRCS) $(RC_SRCS16) $(MC_SRCS) $(IDL_SRCS) $(EXTRA_SRCS) - -.PHONY: depend $(SUBDIRS:%=%/__depend__) - -# Rules for cleaning - -$(SUBDIRS:%=%/__clean__): dummy - cd `dirname $@` && $(MAKE) clean - -$(SUBDIRS:%=%/__testclean__): dummy - cd `dirname $@` && $(MAKE) testclean - -$(EXTRASUBDIRS:%=%/__clean__): dummy - -cd `dirname $@` && $(RM) $(CLEAN_FILES) - -testclean:: $(SUBDIRS:%=%/__testclean__) - -clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__) - $(RM) $(CLEAN_FILES) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res) $(MC_SRCS:.mc=.mc.rc) $(IDL_SRCS:.idl=.h) $(PROGRAMS) $(RC_BINARIES) - -.PHONY: clean testclean $(SUBDIRS:%=%/__clean__) $(SUBDIRS:%=%/__testclean__) $(EXTRASUBDIRS:%=%/__clean__) - -# Rules for installing - -$(SUBDIRS:%=%/__install__): dummy - cd `dirname $@` && $(MAKE) install - -$(SUBDIRS:%=%/__install-lib__): dummy - cd `dirname $@` && $(MAKE) install-lib - -$(SUBDIRS:%=%/__install-dev__): dummy - cd `dirname $@` && $(MAKE) install-dev - -$(SUBDIRS:%=%/__uninstall__): dummy - cd `dirname $@` && $(MAKE) uninstall - -install:: $(INSTALLSUBDIRS:%=%/__install__) - -uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__) - -.PHONY: install install-lib install-dev uninstall \ - $(SUBDIRS:%=%/__install__) $(SUBDIRS:%=%/__uninstall__) \ - $(SUBDIRS:%=%/__install-lib__) $(SUBDIRS:%=%/__install-dev__) - -# Rules for checking that no imports are missing - -$(SUBDIRS:%=%/__checklink__): dummy - @cd `dirname $@` && $(MAKE) checklink - -.PHONY: checklink $(SUBDIRS:%=%/__checklink__) - -# Rules for testing - -$(SUBDIRS:%=%/__test__): dummy - @cd `dirname $@` && $(MAKE) test - -$(SUBDIRS:%=%/__crosstest__): dummy - @cd `dirname $@` && $(MAKE) crosstest - -.PHONY: check test crosstest $(SUBDIRS:%=%/__test__) $(SUBDIRS:%=%/__crosstest__) - -# Misc. rules - -$(MC_SRCS:.mc=.mc.rc): $(WMC) - -$(IDL_SRCS:.idl=.h): $(WIDL) - -$(SUBDIRS): dummy - @cd $@ && $(MAKE) - -dummy: - -.PHONY: dummy $(SUBDIRS) - -# End of global rules - -# Rules for .so files - -$(MODULE).so: $(MAINSPEC) $(RC_SRCS:.rc=.res) $(ALL_OBJS) $(IMPORTLIBS) Makefile.in - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(RC_SRCS:.rc=.res) $(SUBSYSTEM:%=-Wb,--subsystem,%) -o $@ -L$(DLLDIR) $(DELAYIMPORTS:%=-Wb,-d%) $(IMPORTS:%=-l%) $(ALL_LIBS) - -# Rules for .dll files - -$(MODULE): $(RCOBJS) $(OBJS) $(MODULE).dbg.o $(SPEC_DEF) $(IMPORTLIBS) Makefile.in - $(DLLWRAP) -k --def $(SPEC_DEF) -o $@ $(RCOBJS) $(OBJS) $(MODULE).dbg.o -L$(DLLDIR) $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(ALL_LIBS) - -$(SPEC_DEF): $(WINEBUILD) - -# Rules for checking that no imports are missing - -.PHONY: checklink16 $(WIN16_FILES:%=__checklink16__%) - -$(WIN16_FILES:%=__checklink16__%): checklink16 - -checklink16:: $(MAINSPEC).o $(OBJS) $(MODULE).dbg.o dummy - $(CC) -o checklink -Wl,-rpath,$(TOPOBJDIR)/libs $(TOPSRCDIR)/dlls/checklink.c $(MAINSPEC).o $(OBJS) $(MODULE).dbg.o -L$(DLLDIR) $(ALL_LIBS) -lm && $(RM) checklink $(MAINSPEC).c $(MAINSPEC).o - -checklink:: $(WIN16_FILES:%=__checklink16__%) - -# Rules for testing - -check test:: $(SUBDIRS:%=%/__test__) - -crosstest:: $(SUBDIRS:%=%/__crosstest__) - -# Rule to explicitly generate the .spec.c for debugging - -$(MAINSPEC).c: $(MAINSPEC) $(RC_SRCS:.rc=.res) $(ALL_OBJS) $(IMPORTLIBS) $(WINEBUILD) - $(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --dll $(SRCDIR)/$(MAINSPEC) $(SUBSYSTEM:%=--subsystem %) $(RC_SRCS:.rc=.res) $(ALL_OBJS) -L$(DLLDIR) $(DELAYIMPORTS:%=-d%) $(IMPORTS:%=-l%) - -# Rules for auto documentation - -man: $(C_SRCS) - $(C2MAN) -o $(TOPOBJDIR)/documentation/man$(api_manext) -R$(TOPOBJDIR) -S$(api_manext) $(INCLUDES) $(MAINSPEC:%=-w %) $(SPEC_SRCS16:%=-w %) $(C_SRCS) $(C_SRCS16) - -doc-html: $(C_SRCS) - $(C2MAN) -o $(TOPOBJDIR)/documentation/html -R$(TOPOBJDIR) $(INCLUDES) -Th $(MAINSPEC:%=-w %) $(SPEC_SRCS16:%=-w %) $(C_SRCS) $(C_SRCS16) - -doc-sgml: $(C_SRCS) - $(C2MAN) -o $(TOPOBJDIR)/documentation/api-guide -R$(TOPOBJDIR) $(INCLUDES) -Ts $(MAINSPEC:%=-w %) $(SPEC_SRCS16:%=-w %) $(C_SRCS) $(C_SRCS16) - -.PHONY: man doc-html doc-sgml - -# Rules for installation - -EXE_SPECS16 = $(SPEC_SRCS16:.exe.spec=.exe) -DRV_SPECS16 = $(EXE_SPECS16:.drv.spec=.drv) -ALL_SPECS16 = $(DRV_SPECS16:.spec=.dll) - -WIN16_INSTALL = $(ALL_SPECS16:%=_install_/%) - -.PHONY: install_lib $(ALL_SPECS16:%=_install_/%) $(ALL_SPECS16:%=_uninstall_/%) - -$(ALL_SPECS16:%=_install_/%): install_lib - cd $(dlldir) && $(RM) `basename $@`$(DLLEXT) && $(LN_S) $(MODULE)$(DLLEXT) `basename $@`$(DLLEXT) - -$(ALL_SPECS16:%=_uninstall_/%): dummy - $(RM) $(dlldir)/`basename $@`$(DLLEXT) - -install_lib: $(MODULE)$(DLLEXT) - $(MKINSTALLDIRS) $(dlldir) - $(INSTALL_PROGRAM) $(MODULE)$(DLLEXT) $(dlldir)/$(MODULE)$(DLLEXT) - -install:: install_lib $(WIN16_INSTALL) - -uninstall:: $(ALL_SPECS16:%=_uninstall_/%) - $(RM) $(dlldir)/$(MODULE)$(DLLEXT) - -# Misc. rules - -$(SPEC_SRCS16:.spec=.spec.c): $(WINEBUILD) - -# End of global dll rules - -### Dependencies: +include $(TOOLS_PATH)/helper.mk Index: lib/dbghelp/dbghelp.c =================================================================== RCS file: /CVS/ReactOS/reactos/lib/dbghelp/dbghelp.c,v retrieving revision 1.2 diff -u -r1.2 dbghelp.c --- lib/dbghelp/dbghelp.c 30 Dec 2004 18:24:19 -0000 1.2 +++ lib/dbghelp/dbghelp.c 30 Dec 2004 18:49:34 -0000 @@ -26,8 +26,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); -#define YDEBUG -#define DBG /* TODO * - support for symbols' types is still partly missing Index: lib/dbghelp/stack.c =================================================================== RCS file: /CVS/ReactOS/reactos/lib/dbghelp/stack.c,v retrieving revision 1.2 diff -u -r1.2 stack.c --- lib/dbghelp/stack.c 30 Dec 2004 18:24:19 -0000 1.2 +++ lib/dbghelp/stack.c 30 Dec 2004 18:57:42 -0000 @@ -33,6 +33,9 @@ #include "thread.h" /* FIXME: must be included before winternl.h */ #include "winternl.h" #include "wine/debug.h" +#ifndef __REACTOS__ +#include "stackframe.h" +#endif WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); @@ -75,7 +78,7 @@ PGET_MODULE_BASE_ROUTINE GetModuleBaseRoutine, PTRANSLATE_ADDRESS_ROUTINE f_xlat_adr) { -#if 0 +#ifndef __REACTOS__ STACK32FRAME frame32; STACK16FRAME frame16; char ch; @@ -385,5 +388,8 @@ done_err: curr_mode = stm_done; return FALSE; +#else + /* FIXME */ + return FALSE; #endif } Index: lib/dbghelp/type.c =================================================================== RCS file: /CVS/ReactOS/reactos/lib/dbghelp/type.c,v retrieving revision 1.2 diff -u -r1.2 type.c --- lib/dbghelp/type.c 30 Dec 2004 18:24:19 -0000 1.2 +++ lib/dbghelp/type.c 30 Dec 2004 18:58:56 -0000 @@ -371,10 +371,10 @@ struct symt* type; void* pos = NULL; - /* TRACE("(%p %s %p %p)\n", + TRACE("(%p %s %p %p)\n", hProcess, wine_dbgstr_longlong(BaseOfDll), EnumSymbolsCallback, UserContext); -*/ + if (!(pcs = process_find_by_handle(hProcess))) return FALSE; module = module_find_by_addr(pcs, BaseOfDll, DMT_UNKNOWN); if (!(module = module_get_debug(pcs, module))) return FALSE; @@ -755,7 +755,9 @@ module = module_find_by_addr(pcs, ModBase, DMT_UNKNOWN); if (!(module = module_get_debug(pcs, module))) { - // FIXME("Someone didn't properly set ModBase (%s)\n", wine_dbgstr_longlong(ModBase)); +#ifndef __REACTOS__ + FIXME("Someone didn't properly set ModBase (%s)\n", wine_dbgstr_longlong(ModBase)); +#endif return FALSE; }

20 years, 10 months

2
3
0 0

RE: [ros-cvs] CVS Update: reactos

by Casper Hornstrup

It should be on the bootable CD too. > -----Original Message----- > From: ros-cvs-bounces(a)reactos.com > [mailto:ros-cvs-bounces@reactos.com] On Behalf Of ion(a)cvs.reactos.com > Sent: 30. december 2004 10:32 > To: ros-cvs(a)reactos.com > Subject: [ros-cvs] CVS Update: reactos > > CVSROOT: /CVS/ReactOS > Module name: reactos > Repository: ./ > Changes by: ion(a)mok.osexperts.com 04/12/30 10:31:43 > > Modified files: > ./: Makefile > > Log message: > Added dbghelp to build because it builds for now. > > _______________________________________________ > Ros-cvs mailing list > Ros-cvs(a)reactos.com > http://reactos.com/mailman/listinfo/ros-cvs >

20 years, 10 months

1
0
0 0

[Patch] oskilttcp warnings

by Quandary

I've attached a patch that eliminates an irritating/verbose set of warnings generated in the vicinity of drivers/lib/oskittcp. Please check for sanity :). I added the -fno-builtin-log flag to the CFLAGS in the makefile in oskittcp; this kind of assumes GCC. I'm not sure what hooks are in place to switch between GCC/VC compiler settings, and I'm fairly certain this won't play too nice with CL.EXE. So... if there's anyone who knows the make system better than I who would resolve this loose end, that would be great :). -- Travis __________________________________ Do you Yahoo!? Meet the all-new My Yahoo! - Try it today! http://my.yahoo.com

20 years, 10 months

1
0
0 0

Image downloads...

by Andrew Smith

Hi, It's my first time posting here, but I've been reading it for a little while now and I've just looked at the download section of the website again and noticed that there are premade images for Qemu and Bochs yet none for VMware or Virtual PC. Is this just because no one has created one? or are there other reasons (like licencing reasons)? If it's because no one makes one then I'd be happy to make a ZIP of the files needed that you can host. With the 0.2.4 release the ZIP is 6,232,010 bytes which includes ROS VMware driver 6.0 GB sparse virtual hard drive split into 2 GB files (setup as IDE 0:0) Auto-detect CD-ROM (setup as IDE1:0) Floppy drive Bridged NIC1 USB Controller Audio 256MB virtual RAM If you're interested then let me know. I know having a 0.2.4 ZIP is kind of pointless now with 0.2.5's release date set for the 31st. But I could get a ZIP of that release if you'd like one. -- Andy Smith - Def since birth

20 years, 10 months

4
5
0 0

Crash in win32k.sys

by Maarten Bosma

After calling "NtGdiDdCreateDirectDrawObject" (ntddraw/ddraw.c) I get a bsod. The problem seams to be this line: > HANDLE hDirectDraw = GDIOBJ_AllocObj(GDI_OBJECT_TYPE_DIRECTDRAW); The debug output says: > (objects/gdiobj.c:179) Can't find lookaside list for object type 0x00600000

20 years, 10 months

2
4
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev