Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 43241: - KeBugCheckEx expects BugCheckParameter2 to point to an array when the bug code is FATAL_UNHANDLED_HARD_ERROR -- properly stub out ExpSystemErrorHandler so we don't crash in KeBugCheckEx.
by sginsberg＠svn.reactos.org 30 Sep '09

30 Sep '09

Author: sginsberg Date: Wed Sep 30 20:31:26 2009 New Revision: 43241 URL: http://svn.reactos.org/svn/reactos?rev=43241&view=rev Log: - KeBugCheckEx expects BugCheckParameter2 to point to an array when the bug code is FATAL_UNHANDLED_HARD_ERROR -- properly stub out ExpSystemErrorHandler so we don't crash in KeBugCheckEx. Modified: trunk/reactos/ntoskrnl/ex/harderr.c Modified: trunk/reactos/ntoskrnl/ex/harderr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/harderr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/harderr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/harderr.c [iso-8859-1] Wed Sep 30 20:31:26 2009 @@ -58,10 +58,12 @@ IN PULONG_PTR Parameters, IN BOOLEAN Shutdown) { + ULONG_PTR Dummy[4] = {0, 0, 0, 0}; + /* FIXME: STUB */ KeBugCheckEx(FATAL_UNHANDLED_HARD_ERROR, ErrorStatus, - 0, + (ULONG_PTR)Dummy, 0, 0); return STATUS_SUCCESS;

1 0

[sginsberg] 43240: - Fix recursive spinlock acquisition in Mm caused by locking inconsistency between ARM3 and the old ReactOS Mm. The old Mm calls certain routines to modify PFN entries (lock, unlock, reference, dereference, etc) and acquires/releases the PFN lock inside those functions (which is extremely inefficient as you can't, for example, have to acquire/release the PFN lock twice to reference and lock the same page), while ARM3 synchronizes differently and holds the lock while calling th
by sginsberg＠svn.reactos.org 30 Sep '09

30 Sep '09

Author: sginsberg Date: Wed Sep 30 20:24:00 2009 New Revision: 43240 URL: http://svn.reactos.org/svn/reactos?rev=43240&view=rev Log: - Fix recursive spinlock acquisition in Mm caused by locking inconsistency between ARM3 and the old ReactOS Mm. The old Mm calls certain routines to modify PFN entries (lock, unlock, reference, dereference, etc) and acquires/releases the PFN lock inside those functions (which is extremely inefficient as you can't, for example, have to acquire/release the PFN lock twice to reference and lock the same page), while ARM3 synchronizes differently and holds the lock while calling those routines, resulting in a recursive lock attempt on MP (which works on UP because spinlocks are just IRQL raise/lower there). Move out locking from MmAllocPage, MmReference/DereferencePage and MmLock/UnlockPage to the callers to be consistent with ARM3. - Add missing PFN locking to MmFreePagesFromMdl and MiAllocatePoolPages. - Get rid of MmLockPageUnsafe and MmReferencePageUnsafe. The "safe" routines just forwarded to the unsafe versions -- call them directly instead. Remove unused MmAcquirePageListLock/MmReleasePageListLock. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c trunk/reactos/ntoskrnl/mm/ARM3/pool.c trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/balance.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/mmfault.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Wed Sep 30 20:24:00 2009 @@ -1095,32 +1095,11 @@ VOID NTAPI -MmLockPageUnsafe(PFN_TYPE Page); - -VOID -NTAPI MmUnlockPage(PFN_TYPE Page); ULONG NTAPI MmGetLockCountPage(PFN_TYPE Page); - -static -__inline -KIRQL -NTAPI -MmAcquirePageListLock() -{ - return KeAcquireQueuedSpinLock(LockQueuePfnLock); -} - -FORCEINLINE -VOID -NTAPI -MmReleasePageListLock(KIRQL oldIrql) -{ - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); -} VOID NTAPI @@ -1342,10 +1321,6 @@ VOID NTAPI MmReferencePage(PFN_TYPE Page); - -VOID -NTAPI -MmReferencePageUnsafe(PFN_TYPE Page); ULONG NTAPI Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Wed Sep 30 20:24:00 2009 @@ -215,6 +215,7 @@ PPFN_NUMBER Pages; LONG NumberOfPages; PMMPFN Pfn1; + KIRQL OldIrql; DPRINT("Freeing MDL: %p\n", Mdl); // @@ -229,7 +230,12 @@ // Base = (PVOID)((ULONG_PTR)Mdl->StartVa + Mdl->ByteOffset); NumberOfPages = ADDRESS_AND_SIZE_TO_SPAN_PAGES(Base, Mdl->ByteCount); - + + // + // Acquire PFN lock + // + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + // // Loop all the MDL pages // @@ -268,7 +274,12 @@ // *Pages++ = -1; } while (--NumberOfPages != 0); - + + // + // Release the lock + // + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + // // Remove the pages locked flag // Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Wed Sep 30 20:24:00 2009 @@ -141,6 +141,7 @@ PMMPFN Pfn1; PVOID BaseVa; PMMFREE_POOL_ENTRY FreeEntry; + PKSPIN_LOCK_QUEUE LockQueue; // // Figure out how big the allocation is in pages @@ -285,7 +286,8 @@ // // Lock the PFN database too // - //KeAcquireQueuedSpinLockAtDpcLevel(LockQueuePfnLock); + LockQueue = &KeGetCurrentPrcb()->LockQueue[LockQueuePfnLock]; + KeAcquireQueuedSpinLockAtDpcLevel(LockQueue); // // Loop the pages @@ -326,7 +328,7 @@ // // Release the PFN and nonpaged pool lock // - //KeReleaseQueuedSpinLockFromDpcLevel(LockQueuePfnLock); + KeReleaseQueuedSpinLockFromDpcLevel(LockQueue); KeReleaseQueuedSpinLock(LockQueueMmNonPagedPoolLock, OldIrql); // Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Wed Sep 30 20:24:00 2009 @@ -258,6 +258,7 @@ PMM_REGION Region; PMM_PAGEOP PageOp; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); + KIRQL OldIrql; /* * There is a window between taking the page fault and locking the @@ -268,7 +269,9 @@ { if (Locked) { + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MmLockPage(MmGetPfnForProcess(NULL, Address)); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } return(STATUS_SUCCESS); } @@ -362,7 +365,9 @@ MmLockAddressSpace(AddressSpace); if (Locked) { + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MmLockPage(MmGetPfnForProcess(NULL, Address)); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); MmReleasePageOp(PageOp); @@ -437,7 +442,9 @@ */ if (Locked) { + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MmLockPage(Page); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } PageOp->Status = STATUS_SUCCESS; KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Wed Sep 30 20:24:00 2009 @@ -105,7 +105,7 @@ { PMM_ALLOCATION_REQUEST Request; PLIST_ENTRY Entry; - KIRQL oldIrql; + KIRQL OldIrql; if (Page == 0) { @@ -113,20 +113,22 @@ KeBugCheck(MEMORY_MANAGEMENT); } - KeAcquireSpinLock(&AllocationListLock, &oldIrql); + KeAcquireSpinLock(&AllocationListLock, &OldIrql); if (MmGetReferenceCountPage(Page) == 1) { (void)InterlockedDecrementUL(&MiMemoryConsumers[Consumer].PagesUsed); if (IsListEmpty(&AllocationListHead) || MmStats.NrFreePages < MiMinimumAvailablePages) { - KeReleaseSpinLock(&AllocationListLock, oldIrql); + KeReleaseSpinLock(&AllocationListLock, OldIrql); + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MmDereferencePage(Page); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } else { Entry = RemoveHeadList(&AllocationListHead); Request = CONTAINING_RECORD(Entry, MM_ALLOCATION_REQUEST, ListEntry); - KeReleaseSpinLock(&AllocationListLock, oldIrql); + KeReleaseSpinLock(&AllocationListLock, OldIrql); if(Consumer == MC_USER) MmRemoveLRUUserPage(Page); MiZeroPage(Page); Request->Page = Page; @@ -135,9 +137,11 @@ } else { - KeReleaseSpinLock(&AllocationListLock, oldIrql); + KeReleaseSpinLock(&AllocationListLock, OldIrql); if(Consumer == MC_USER) MmRemoveLRUUserPage(Page); + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MmDereferencePage(Page); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } return(STATUS_SUCCESS); @@ -235,7 +239,7 @@ { ULONG OldUsed; PFN_TYPE Page; - KIRQL oldIrql; + KIRQL OldIrql; /* * Make sure we don't exceed our individual target. @@ -257,7 +261,9 @@ */ if ((Consumer == MC_NPPOOL) || (Consumer == MC_SYSTEM) || MiIsBalancerThread()) { + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MmAllocPage(Consumer, 0); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); if (Page == 0) { KeBugCheck(NO_PAGES_AVAILABLE); @@ -290,14 +296,14 @@ KeInitializeEvent(&Request.Event, NotificationEvent, FALSE); (void)InterlockedIncrementUL(&MiPagesRequired); - KeAcquireSpinLock(&AllocationListLock, &oldIrql); + KeAcquireSpinLock(&AllocationListLock, &OldIrql); if (MiBalancerThreadHandle != NULL) { KeSetEvent(&MiBalancerEvent, IO_NO_INCREMENT, FALSE); } InsertTailList(&AllocationListHead, &Request.ListEntry); - KeReleaseSpinLock(&AllocationListLock, oldIrql); + KeReleaseSpinLock(&AllocationListLock, OldIrql); KeWaitForSingleObject(&Request.Event, 0, @@ -321,7 +327,9 @@ /* * Actually allocate the page. */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MmAllocPage(Consumer, 0); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); if (Page == 0) { KeBugCheck(NO_PAGES_AVAILABLE); Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Wed Sep 30 20:24:00 2009 @@ -830,19 +830,16 @@ VOID NTAPI -MmReferencePageUnsafe(PFN_TYPE Pfn) -{ - KIRQL oldIrql; +MmReferencePage(PFN_TYPE Pfn) +{ PPHYSICAL_PAGE Page; - DPRINT("MmReferencePageUnsafe(PysicalAddress %x)\n", Pfn << PAGE_SHIFT); + DPRINT("MmReferencePage(PysicalAddress %x)\n", Pfn << PAGE_SHIFT); if (Pfn == 0 || Pfn > MmHighestPhysicalPage) { return; } - - oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); ASSERT(Page); @@ -853,16 +850,6 @@ } Page->ReferenceCount++; - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); -} - -VOID -NTAPI -MmReferencePage(PFN_TYPE Pfn) -{ - DPRINT("MmReferencePage(PysicalAddress %x)\n", Pfn << PAGE_SHIFT); - - MmReferencePageUnsafe(Pfn); } ULONG @@ -904,13 +891,10 @@ NTAPI MmDereferencePage(PFN_TYPE Pfn) { - KIRQL oldIrql; PPHYSICAL_PAGE Page; DPRINT("MmDereferencePage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - Page = MiGetPfnEntry(Pfn); ASSERT(Page); @@ -962,7 +946,6 @@ KeSetEvent(&ZeroPageThreadEvent, IO_NO_INCREMENT, FALSE); } } - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } ULONG @@ -993,14 +976,11 @@ VOID NTAPI -MmLockPageUnsafe(PFN_TYPE Pfn) -{ - KIRQL oldIrql; +MmLockPage(PFN_TYPE Pfn) +{ PPHYSICAL_PAGE Page; - DPRINT("MmLockPageUnsafe(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - - oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + DPRINT("MmLockPage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); Page = MiGetPfnEntry(Pfn); ASSERT(Page); @@ -1011,28 +991,15 @@ } Page->LockCount++; - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } VOID NTAPI -MmLockPage(PFN_TYPE Pfn) -{ - DPRINT("MmLockPage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - - MmLockPageUnsafe(Pfn); -} - -VOID -NTAPI MmUnlockPage(PFN_TYPE Pfn) { - KIRQL oldIrql; PPHYSICAL_PAGE Page; DPRINT("MmUnlockPage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - - oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); ASSERT(Page); @@ -1043,7 +1010,6 @@ } Page->LockCount--; - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } PFN_TYPE @@ -1053,12 +1019,10 @@ PFN_TYPE PfnOffset; PLIST_ENTRY ListEntry; PPHYSICAL_PAGE PageDescriptor; - KIRQL oldIrql; BOOLEAN NeedClear = FALSE; DPRINT("MmAllocPage()\n"); - oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); if (IsListEmpty(&FreeZeroedPageListHead)) { if (IsListEmpty(&FreeUnzeroedPageListHead)) @@ -1070,7 +1034,6 @@ } DPRINT1("MmAllocPage(): Out of memory\n"); - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); return 0; } ListEntry = RemoveTailList(&FreeUnzeroedPageListHead); @@ -1105,8 +1068,6 @@ MmStats.NrSystemPages++; MmStats.NrFreePages--; - - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); PfnOffset = PageDescriptor - MmPfnDatabase; if ((NeedClear) && (Consumer != MC_SYSTEM)) Modified: trunk/reactos/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmfault.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] Wed Sep 30 20:24:00 2009 @@ -288,6 +288,8 @@ { NTSTATUS Status; PFN_TYPE AllocatedPage; + KIRQL OldIrql; + Status = MmRequestPageMemoryConsumer(MC_PPOOL, FALSE, &AllocatedPage); if (!NT_SUCCESS(Status)) { @@ -303,7 +305,9 @@ 1); if (Locked) { + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MmLockPage(AllocatedPage); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } return(Status); } Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Sep 30 20:24:00 2009 @@ -771,6 +771,7 @@ PMM_REGION Region; BOOLEAN HasSwapEntry; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); + KIRQL OldIrql; /* * There is a window between taking the page fault and locking the @@ -781,7 +782,9 @@ { if (Locked) { + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MmLockPage(MmGetPfnForProcess(Process, Address)); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } return(STATUS_SUCCESS); } @@ -908,7 +911,9 @@ } if (Locked) { + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MmLockPage(Page); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } MmUnlockSectionSegment(Segment); PageOp->Status = STATUS_SUCCESS; @@ -978,7 +983,9 @@ */ if (Locked) { + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MmLockPage(Page); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } PageOp->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp); @@ -1013,7 +1020,9 @@ */ if (Locked) { - MmLockPageUnsafe(Page); + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + MmLockPage(Page); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } /* @@ -1056,7 +1065,9 @@ MmInsertRmap(Page, Process, (PVOID)PAddress); if (Locked) { + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MmLockPage(Page); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } /* @@ -1156,7 +1167,9 @@ if (Locked) { + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MmLockPage(Page); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } PageOp->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp); @@ -1230,7 +1243,9 @@ MmInsertRmap(Page, Process, (PVOID)PAddress); if (Locked) { + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MmLockPage(Page); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } PageOp->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp); @@ -1262,7 +1277,9 @@ MmInsertRmap(Page, Process, (PVOID)PAddress); if (Locked) { + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MmLockPage(Page); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } PageOp->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp); @@ -1289,6 +1306,7 @@ PMM_REGION Region; ULONG Entry; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); + KIRQL OldIrql; DPRINT("MmAccessFaultSectionView(%x, %x, %x, %x)\n", AddressSpace, MemoryArea, Address, Locked); @@ -1429,8 +1447,10 @@ } if (Locked) { + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MmLockPage(NewPage); MmUnlockPage(OldPage); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } /* @@ -1511,6 +1531,7 @@ BOOLEAN DirectMapped; BOOLEAN IsImageSection; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); + KIRQL OldIrql; Address = (PVOID)PAGE_ROUND_DOWN(Address); @@ -1599,7 +1620,9 @@ } else { + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MmReferencePage(Page); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } MmDeleteAllRmaps(Page, (PVOID)&Context, MmPageOutDeleteMapping);

1 0

[fireball] 43239: [fastfat_new] - Partially implement a codepath for opening an existing file. - Implement simple FCB and CCB creation. - Correctly set FILE_OBJECT fields. - Allocate space for SECTION_POINTERS. - Implement some misc in FatQueryInformation. - The driver goes up to getting a read request for ntdll.dll.
by fireball＠svn.reactos.org 30 Sep '09

30 Sep '09

Author: fireball Date: Wed Sep 30 18:16:18 2009 New Revision: 43239 URL: http://svn.reactos.org/svn/reactos?rev=43239&view=rev Log: [fastfat_new] - Partially implement a codepath for opening an existing file. - Implement simple FCB and CCB creation. - Correctly set FILE_OBJECT fields. - Allocate space for SECTION_POINTERS. - Implement some misc in FatQueryInformation. - The driver goes up to getting a read request for ntdll.dll. Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h trunk/reactos/drivers/filesystems/fastfat_new/fcb.c trunk/reactos/drivers/filesystems/fastfat_new/finfo.c trunk/reactos/drivers/filesystems/fastfat_new/rw.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Wed Sep 30 18:16:18 2009 @@ -37,6 +37,54 @@ DPRINT1("Opening root directory\n"); Iosb.Status = STATUS_NOT_IMPLEMENTED; + + return Iosb; +} + +IO_STATUS_BLOCK +NTAPI +FatiOpenExistingFile(IN PFAT_IRP_CONTEXT IrpContext, + IN PFILE_OBJECT FileObject, + IN PVCB Vcb, + IN PFCB ParentDcb, + IN PACCESS_MASK DesiredAccess, + IN USHORT ShareAccess, + IN ULONG AllocationSize, + IN PFILE_FULL_EA_INFORMATION EaBuffer, + IN ULONG EaLength, + IN UCHAR FileAttributes, + IN ULONG CreateDisposition, + IN BOOLEAN IsPagingFile, + IN BOOLEAN DeleteOnClose, + IN BOOLEAN IsDosName) +{ + IO_STATUS_BLOCK Iosb = {{0}}; + PFCB Fcb; + + /* Check for create file option and fail */ + if (CreateDisposition == FILE_CREATE) + { + Iosb.Status = STATUS_OBJECT_NAME_COLLISION; + return Iosb; + } + + // TODO: Check more params + + /* Create a new FCB for this file */ + Fcb = FatCreateFcb(IrpContext, Vcb, ParentDcb); + + // TODO: Check if overwrite is needed + + // This is usual file open branch, without overwriting! + /* Set context and section object pointers */ + FatSetFileObject(FileObject, + UserFileOpen, + Fcb, + FatCreateCcb()); + FileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; + + Iosb.Status = STATUS_SUCCESS; + Iosb.Information = FILE_OPENED; return Iosb; } @@ -443,10 +491,35 @@ // TODO: Create a DCB for this entry } - // Simulate that we opened the file - //Iosb.Information = FILE_OPENED; - Irp->IoStatus.Information = FILE_OPENED; - FileObject->SectionObjectPointer = (PSECTION_OBJECT_POINTERS)0x1; + // TODO: Try to open directory + + /* If end backslash here, then it's definately not permitted, + since we're opening files here */ + if (EndBackslash) + { + /* Complete the request */ + Iosb.Status = STATUS_OBJECT_NAME_INVALID; + FatCompleteRequest(IrpContext, Irp, Iosb.Status); + return Iosb.Status; + } + + /* Try to open the file */ + Iosb = FatiOpenExistingFile(IrpContext, + FileObject, + Vcb, + ParentDcb, + DesiredAccess, + ShareAccess, + AllocationSize, + EaBuffer, + EaLength, + FileAttributes, + CreateDisposition, + FALSE, + DeleteOnClose, + OpenedAsDos); + + Irp->IoStatus.Information = Iosb.Information; } /* Complete the request */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] Wed Sep 30 18:16:18 2009 @@ -137,6 +137,7 @@ /* Save IRP, MJ and MN */ IrpContext->Irp = Irp; + IrpContext->Stack = IrpSp; IrpContext->MajorFunction = IrpSp->MajorFunction; IrpContext->MinorFunction = IrpSp->MinorFunction; @@ -338,6 +339,34 @@ return TypeOfOpen; } +VOID +NTAPI +FatSetFileObject(PFILE_OBJECT FileObject, + TYPE_OF_OPEN TypeOfOpen, + PVOID Fcb, + PCCB Ccb) +{ + if (Fcb) + { + /* Check Fcb's type */ + if (FatNodeType(Fcb) == FAT_NTC_VCB) + { + FileObject->Vpb = ((PVCB)Fcb)->Vpb; + } + else + { + FileObject->Vpb = ((PFCB)Fcb)->Vcb->Vpb; + } + } + + /* Set FsContext */ + if (FileObject) + { + FileObject->FsContext = Fcb; + FileObject->FsContext2 = Ccb; + } +} + BOOLEAN NTAPI Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Wed Sep 30 18:16:18 2009 @@ -153,13 +153,11 @@ OUT PFCB *FcbOrDcb, OUT PCCB *Ccb); -/* --------------------------------------------------------- fcb.c */ - -PFCB NTAPI -FatFindFcb(PFAT_IRP_CONTEXT IrpContext, - PRTL_SPLAY_LINKS *RootNode, - PSTRING AnsiName, - PBOOLEAN IsDosName); +VOID NTAPI +FatSetFileObject(PFILE_OBJECT FileObject, + TYPE_OF_OPEN TypeOfOpen, + PVOID Fcb, + PCCB Ccb); /* --------------------------------------------------------- fullfat.c */ @@ -263,14 +261,11 @@ IN PFCB ParentFcb, IN PFCB Fcb); -NTSTATUS +PFCB NTAPI FatCreateFcb( - OUT PFCB* CreatedFcb, - IN PFAT_IRP_CONTEXT IrpContext, - IN PFCB ParentFcb, - IN PDIR_ENTRY Dirent, - IN PUNICODE_STRING FileName, - IN PUNICODE_STRING LongFileName OPTIONAL); + IN PFAT_IRP_CONTEXT IrpContext, + IN PVCB Vcb, + IN PFCB ParentDcb); NTSTATUS FatOpenFcb( @@ -279,6 +274,15 @@ IN PFCB ParentFcb, IN PUNICODE_STRING FileName); +PFCB NTAPI +FatFindFcb(PFAT_IRP_CONTEXT IrpContext, + PRTL_SPLAY_LINKS *RootNode, + PSTRING AnsiName, + PBOOLEAN IsDosName); + +PCCB NTAPI +FatCreateCcb(); + /* ------------------------------------------------------------ rw.c */ NTSTATUS NTAPI Modified: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] Wed Sep 30 18:16:18 2009 @@ -19,6 +19,7 @@ #define FAT_NTC_FCB (CSHORT) 'CF' #define FAT_NTC_DCB (CSHORT) 'DF' #define FAT_NTC_ROOT_DCB (CSHORT) 'RFD' +#define FAT_NTC_CCB (CSHORT) 'BCC' typedef struct _FAT_GLOBAL_DATA { @@ -334,6 +335,9 @@ typedef struct _CCB { + CSHORT NodeTypeCode; + CSHORT NodeByteSize; + LARGE_INTEGER CurrentByteOffset; ULONG Entry; UNICODE_STRING SearchPattern; Modified: trunk/reactos/drivers/filesystems/fastfat_new/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] Wed Sep 30 18:16:18 2009 @@ -105,5 +105,60 @@ return NULL; } +PFCB +NTAPI +FatCreateFcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PVCB Vcb, + IN PFCB ParentDcb) +{ + PFCB Fcb; + + /* Allocate it and zero it */ + Fcb = ExAllocatePoolWithTag(NonPagedPool, sizeof(FCB), TAG_FCB); + RtlZeroMemory(Fcb, sizeof(FCB)); + + /* Set node types */ + Fcb->Header.NodeTypeCode = FAT_NTC_FCB; + Fcb->Header.NodeByteSize = sizeof(FCB); + Fcb->Condition = FcbGood; + + /* Initialize resources */ + Fcb->Header.Resource = &Fcb->Resource; + ExInitializeResourceLite(Fcb->Header.Resource); + + Fcb->Header.PagingIoResource = &Fcb->PagingIoResource; + ExInitializeResourceLite(Fcb->Header.PagingIoResource); + + /* Initialize mutexes */ + Fcb->Header.FastMutex = &Fcb->HeaderMutex; + ExInitializeFastMutex(&Fcb->HeaderMutex); + FsRtlSetupAdvancedHeader(&Fcb->Header, &Fcb->HeaderMutex); + + /* Insert into parent's DCB list */ + InsertTailList(&ParentDcb->Dcb.ParentDcbList, &Fcb->ParentDcbLinks); + + /* Set backlinks */ + Fcb->ParentFcb = ParentDcb; + Fcb->Vcb = Vcb; + + return Fcb; +} + +PCCB +NTAPI +FatCreateCcb() +{ + PCCB Ccb; + + /* Allocate the CCB and zero it */ + Ccb = ExAllocatePoolWithTag(NonPagedPool, sizeof(CCB), TAG_CCB); + RtlZeroMemory(Ccb, sizeof(CCB)); + + /* Set mandatory header */ + Ccb->NodeTypeCode = FAT_NTC_FCB; + Ccb->NodeByteSize = sizeof(CCB); + + return Ccb; +} /* EOF */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/finfo.c [iso-8859-1] Wed Sep 30 18:16:18 2009 @@ -15,10 +15,77 @@ NTSTATUS NTAPI +FatiQueryInformation(IN PFAT_IRP_CONTEXT IrpContext, + IN PIRP Irp) +{ + PFILE_OBJECT FileObject; + PIO_STACK_LOCATION IrpSp; + FILE_INFORMATION_CLASS InfoClass; + TYPE_OF_OPEN FileType; + PVCB Vcb; + PFCB Fcb; + PCCB Ccb; + + /* Get IRP stack location */ + IrpSp = IoGetCurrentIrpStackLocation(Irp); + + /* Get the file object */ + FileObject = IrpSp->FileObject; + + InfoClass = IrpSp->Parameters.QueryFile.FileInformationClass; + + DPRINT1("FatCommonQueryInformation\n", 0); + DPRINT1("\tIrp = %08lx\n", Irp); + DPRINT1("\tLength = %08lx\n", IrpSp->Parameters.QueryFile.Length); + DPRINT1("\tFileInformationClass = %08lx\n", InfoClass); + DPRINT1("\tBuffer = %08lx\n", Irp->AssociatedIrp.SystemBuffer); + + FileType = FatDecodeFileObject(FileObject, &Vcb, &Fcb, &Ccb); + + DPRINT1("Vcb %p, Fcb %p, Ccb %p, open type %d\n", Vcb, Fcb, Ccb, FileType); + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI FatQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - DPRINT1("FatQueryInformation()\n"); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + BOOLEAN TopLevel, CanWait; + PFAT_IRP_CONTEXT IrpContext; + + CanWait = TRUE; + TopLevel = FALSE; + Status = STATUS_INVALID_DEVICE_REQUEST; + + /* Get CanWait flag */ + if (IoGetCurrentIrpStackLocation(Irp)->FileObject != NULL) + CanWait = IoIsOperationSynchronous(Irp); + + /* Enter FsRtl critical region */ + FsRtlEnterFileSystem(); + + /* Set Top Level IRP if not set */ + if (IoGetTopLevelIrp() == NULL) + { + IoSetTopLevelIrp(Irp); + TopLevel = TRUE; + } + + /* Build an irp context */ + IrpContext = FatBuildIrpContext(Irp, CanWait); + + /* Perform the actual read */ + Status = FatiQueryInformation(IrpContext, Irp); + + /* Restore top level Irp */ + if (TopLevel) IoSetTopLevelIrp(NULL); + + /* Leave FsRtl critical region */ + FsRtlExitFileSystem(); + + return Status; } NTSTATUS Modified: trunk/reactos/drivers/filesystems/fastfat_new/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/rw.c [iso-8859-1] Wed Sep 30 18:16:18 2009 @@ -18,19 +18,28 @@ NTAPI FatiRead(PFAT_IRP_CONTEXT IrpContext) { - CSHORT FcbType; ULONG NumberOfBytes; + LARGE_INTEGER ByteOffset; + PFILE_OBJECT FileObject; + TYPE_OF_OPEN OpenType; + PIO_STACK_LOCATION IrpSp = IrpContext->Stack; + PFCB Fcb; + PVCB Vcb; + PCCB Ccb; - FcbType = *((PCSHORT) IrpContext->FileObject->FsContext); - NumberOfBytes = IrpContext->Stack->Parameters.Read.Length; + FileObject = IrpSp->FileObject; + NumberOfBytes = IrpSp->Parameters.Read.Length; + ByteOffset = IrpSp->Parameters.Read.ByteOffset; if (NumberOfBytes == 0) { FatCompleteRequest(IrpContext, IrpContext->Irp, STATUS_SUCCESS); return STATUS_SUCCESS; } - //if (FcbType == FAT_NTC_VCB) + + OpenType = FatDecodeFileObject(FileObject, &Vcb, &Fcb, &Ccb); - DPRINT1("FatiRead()\n"); + DPRINT1("FatiRead() Fcb %p, Name %wZ, Offset %d, Length %d\n", + Fcb, &FileObject->FileName, ByteOffset.LowPart, NumberOfBytes); return STATUS_NOT_IMPLEMENTED; }

1 0

[sginsberg] 43238: - ...and this one.
by sginsberg＠svn.reactos.org 30 Sep '09

30 Sep '09

Author: sginsberg Date: Wed Sep 30 15:43:55 2009 New Revision: 43238 URL: http://svn.reactos.org/svn/reactos?rev=43238&view=rev Log: - ...and this one. Modified: trunk/reactos/lib/inflib/inflib.rbuild Modified: trunk/reactos/lib/inflib/inflib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/inflib.rbuild?r… ============================================================================== --- trunk/reactos/lib/inflib/inflib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/inflib.rbuild [iso-8859-1] Wed Sep 30 15:43:55 2009 @@ -3,7 +3,6 @@ <group> <module name="inflib" type="staticlibrary"> <include base="inflib">.</include> - <define name="__NO_CTYPE_INLINES" /> <file>infcore.c</file> <file>infget.c</file> <file>infput.c</file>

1 0

[sginsberg] 43237: - Missed this one
by sginsberg＠svn.reactos.org 30 Sep '09

30 Sep '09

Author: sginsberg Date: Wed Sep 30 15:33:48 2009 New Revision: 43237 URL: http://svn.reactos.org/svn/reactos?rev=43237&view=rev Log: - Missed this one Modified: trunk/reactos/dll/win32/crtdll/crtdll.rbuild Modified: trunk/reactos/dll/win32/crtdll/crtdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/crtdll.rb… ============================================================================== --- trunk/reactos/dll/win32/crtdll/crtdll.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crtdll/crtdll.rbuild [iso-8859-1] Wed Sep 30 15:33:48 2009 @@ -5,7 +5,6 @@ <define name="USE_MSVCRT_PREFIX" /> <define name="_MSVCRT_LIB_" /> <define name="_MSVCRT_" /> - <define name="__NO_CTYPE_INLINES" /> <define name="_CTYPE_DISABLE_MACROS" /> <define name="_NO_INLINING" />

1 0

[sginsberg] 43236: - Goodbye __USE_W32API
by sginsberg＠svn.reactos.org 30 Sep '09

30 Sep '09

Author: sginsberg Date: Wed Sep 30 15:32:05 2009 New Revision: 43236 URL: http://svn.reactos.org/svn/reactos?rev=43236&view=rev Log: - Goodbye __USE_W32API Modified: trunk/rosapps/demos/maze/Makefile Modified: trunk/rosapps/demos/maze/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/demos/maze/Makefile?rev=43… ============================================================================== --- trunk/rosapps/demos/maze/Makefile [iso-8859-1] (original) +++ trunk/rosapps/demos/maze/Makefile [iso-8859-1] Wed Sep 30 15:32:05 2009 @@ -12,7 +12,7 @@ TARGET_OBJECTS = maze.o -TARGET_CFLAGS = -D__USE_W32API -Wall -Werror +TARGET_CFLAGS = -Wall -Werror include $(PATH_TO_TOP)/rules.mak

1 0

[sginsberg] 43235: - Good bye __USE_W32API, _DISABLE_TIDENTS
by sginsberg＠svn.reactos.org 30 Sep '09

30 Sep '09

Author: sginsberg Date: Wed Sep 30 15:31:50 2009 New Revision: 43235 URL: http://svn.reactos.org/svn/reactos?rev=43235&view=rev Log: - Good bye __USE_W32API, _DISABLE_TIDENTS Modified: trunk/rostests/drivers/kmtest/kmtestassist.rbuild trunk/rostests/tests/regqueryvalue/regqueryvalue.c Modified: trunk/rostests/drivers/kmtest/kmtestassist.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/kmtestassi… ============================================================================== --- trunk/rostests/drivers/kmtest/kmtestassist.rbuild [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/kmtestassist.rbuild [iso-8859-1] Wed Sep 30 15:31:50 2009 @@ -1,6 +1,5 @@ <module name="kmtestassist" type="kernelmodedriver" installbase="system32/drivers" installname="kmtestassist.sys"> <bootstrap base="$(CDOUTPUT)" /> - <define name="__USE_W32API" /> <include base="ReactOS">include/reactos/drivers</include> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/rostests/tests/regqueryvalue/regqueryvalue.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/regqueryvalue/regqu… ============================================================================== --- trunk/rostests/tests/regqueryvalue/regqueryvalue.c [iso-8859-1] (original) +++ trunk/rostests/tests/regqueryvalue/regqueryvalue.c [iso-8859-1] Wed Sep 30 15:31:50 2009 @@ -1,4 +1,3 @@ -#define _DISABLE_TIDENTS #include <stdio.h> #include <string.h> #include <stdlib.h>

1 0

[sginsberg] 43234: - Remove the remaining __USE_W32API, deprecated for ages. - Remove _SEH_NO_NATIVE_NLG from msvcrt.rbuild, deprecated long ago. - Get rid of __NO_CTYPE_INLINES for everything but host tools, deprecated since revision 38052. - Deprecate and remove _DISABLE_TIDENTS.
by sginsberg＠svn.reactos.org 30 Sep '09

30 Sep '09

Author: sginsberg Date: Wed Sep 30 15:28:51 2009 New Revision: 43234 URL: http://svn.reactos.org/svn/reactos?rev=43234&view=rev Log: - Remove the remaining __USE_W32API, deprecated for ages. - Remove _SEH_NO_NATIVE_NLG from msvcrt.rbuild, deprecated long ago. - Get rid of __NO_CTYPE_INLINES for everything but host tools, deprecated since revision 38052. - Deprecate and remove _DISABLE_TIDENTS. Modified: trunk/reactos/base/setup/usetup/usetup.rbuild trunk/reactos/base/shell/explorer/Make-rosshell.mak trunk/reactos/dll/ntdll/ntdll.rbuild trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild trunk/reactos/dll/win32/snmpapi/snmpapi.rbuild trunk/reactos/dll/win32/ws2_32/misc/ns.c trunk/reactos/drivers/filesystems/npfs/npfs.rbuild trunk/reactos/hal/halamd64/generic/generic.rbuild trunk/reactos/hal/halamd64/hal_generic.rbuild trunk/reactos/hal/halamd64/up/halup.rbuild trunk/reactos/hal/halx86/hal_generic_amd64.rbuild trunk/reactos/include/psdk/winfax.h trunk/reactos/lib/3rdparty/freetype/freetype.rbuild trunk/reactos/lib/3rdparty/fullfat/fullfat.rbuild trunk/reactos/lib/cmlib/cmlib.rbuild trunk/reactos/lib/drivers/oskittcp/oskittcp.rbuild trunk/reactos/lib/fslib/vfatlib/check/file.c trunk/reactos/lib/ppcmmu/ppcmmu.rbuild trunk/reactos/lib/rtl/rtl.rbuild trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/libcntpr.rbuild trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/base/setup/usetup/usetup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.r… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/usetup.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -6,7 +6,6 @@ <include base="zlib">.</include> <include base="inflib">.</include> <include base="ReactOS">include/reactos/drivers</include> - <define name="__NO_CTYPE_INLINES" /> <library>zlib</library> <library>inflib</library> <library>ext2lib</library> Modified: trunk/reactos/base/shell/explorer/Make-rosshell.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/Make-r… ============================================================================== --- trunk/reactos/base/shell/explorer/Make-rosshell.mak [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/Make-rosshell.mak [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -15,7 +15,7 @@ TARGET_INSTALLDIR := . TARGET_CFLAGS := \ - -D__USE_W32API -DWIN32 -D_ROS_ \ + -DWIN32 -D_ROS_ \ -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 \ -DUNICODE -fexceptions -Wall -g Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -12,7 +12,6 @@ <include base="ReactOS">include/reactos/subsys</include> <define name="__NTDLL__" /> <define name="_NTOSKRNL_" /> - <define name="__NO_CTYPE_INLINES" /> <library>rtl</library> <library>ntdllsys</library> <library>libcntpr</library> Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -12,7 +12,6 @@ <library>ntdll</library> <define name="_KERNEL32_" /> <redefine name="_WIN32_WINNT">0x0600</redefine> - <define name="__NO_CTYPE_INLINES" /> <dependency>errcodes</dependency> <!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38269 <pch>k32.h</pch> Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.rb… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -6,7 +6,6 @@ <define name="_MSVCRT_" /> <define name="_MSVCRT_LIB_" /> <define name="_MT" /> - <define name="__NO_CTYPE_INLINES" /> <define name="_CTYPE_DISABLE_MACROS" /> <define name="_NO_INLINING" /> <linkerflag linkerset="ld">-enable-stdcall-fixup</linkerflag> Modified: trunk/reactos/dll/win32/snmpapi/snmpapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/snmpapi.… ============================================================================== --- trunk/reactos/dll/win32/snmpapi/snmpapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/snmpapi/snmpapi.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -3,7 +3,6 @@ <include base="snmpapi">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> - <define name="_DISABLE_TIDENTS" /> <library>ntdll</library> <library>kernel32</library> <library>wine</library> Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/ns.c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -7,7 +7,6 @@ * REVISIONS: * CSH 01/09-2000 Created */ -#define __NO_CTYPE_INLINES #include <ctype.h> #include <ws2_32.h> #include <winbase.h> Modified: trunk/reactos/drivers/filesystems/npfs/npfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/npfs.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/npfs.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="npfs" type="kernelmodedriver" installbase="system32/drivers" installname="npfs.sys"> <include base="npfs">.</include> - <define name="__NO_CTYPE_INLINES" /> <library>ntoskrnl</library> <library>hal</library> <file>create.c</file> Modified: trunk/reactos/hal/halamd64/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halamd64/generic/gener… ============================================================================== --- trunk/reactos/hal/halamd64/generic/generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halamd64/generic/generic.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -4,7 +4,6 @@ <module name="hal_generic" type="objectlibrary"> <include base="hal_generic">../include</include> <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> <define name="_NTHAL_" /> <file>halinit.c</file> <file>irq.S</file> Modified: trunk/reactos/hal/halamd64/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halamd64/hal_generic.r… ============================================================================== --- trunk/reactos/hal/halamd64/hal_generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halamd64/hal_generic.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -4,7 +4,6 @@ <module name="hal_generic" type="objectlibrary"> <include>include</include> <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> <define name="_NTHAL_" /> <file>hal_generic.c</file> </module> Modified: trunk/reactos/hal/halamd64/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halamd64/up/halup.rbui… ============================================================================== --- trunk/reactos/hal/halamd64/up/halup.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halamd64/up/halup.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -5,7 +5,6 @@ <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> <include base="halup">../include</include> <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> <define name="_NTHAL_" /> <library>hal_generic_amd64</library> <library>hal_generic</library> Modified: trunk/reactos/hal/halx86/hal_generic_amd64.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_amd… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic_amd64.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic_amd64.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -4,7 +4,6 @@ <module name="hal_generic_amd64" type="objectlibrary"> <include>include</include> <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> <define name="_NTHAL_" /> <directory name="generic"> <file>beep.c</file> Modified: trunk/reactos/include/psdk/winfax.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winfax.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winfax.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winfax.h [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -492,8 +492,6 @@ typedef BOOL (CALLBACK *PFAX_RECIPIENT_CALLBACKA)(HANDLE FaxHandle, DWORD RecipientNumber, LPVOID Context, PFAX_JOB_PARAMA JobParams, PFAX_COVERAGE_INFOA CoverpageInfo); typedef BOOL (CALLBACK *PFAX_RECIPIENT_CALLBACKW)(HANDLE FaxHandle, DWORD RecipientNumber, LPVOID Context, PFAX_JOB_PARAMW JobParams, PFAX_COVERAGE_INFOW CoverpageInfo); - -#ifndef _DISABLE_TIDENTS #ifdef UNICODE typedef FAX_JOB_PARAMW FAX_JOB_PARAM; @@ -589,8 +587,6 @@ #define FaxStartPrintJob FaxStartPrintJobA #endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - typedef BOOL (CALLBACK *PFAX_ROUTING_INSTALLATION_CALLBACKW)(HANDLE FaxHandle, LPVOID Context, LPWSTR MethodName, LPWSTR FriendlyName, LPWSTR FunctionName, LPWSTR Guid); #define PFAX_ROUTING_INSTALLATION_CALLBACK PFAX_ROUTING_INSTALLATION_CALLBACKW #define FaxRegisterRoutingExtension FaxRegisterRoutingExtensionW Modified: trunk/reactos/lib/3rdparty/freetype/freetype.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/free… ============================================================================== --- trunk/reactos/lib/3rdparty/freetype/freetype.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/freetype/freetype.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -2,9 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="freetype" type="staticlibrary" allowwarnings="true"> <include base="freetype">include</include> - <define name="_DISABLE_TIDENTS" /> <define name="__NTDRIVER__" /> - <define name="__NO_CTYPE_INLINES" /> <define name="FT2_BUILD_LIBRARY" /> <if property="NSWPAT" value="0"> <define name="TT_CONFIG_OPTION_UNPATENTED_HINTING" /> Modified: trunk/reactos/lib/3rdparty/fullfat/fullfat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/fullf… ============================================================================== --- trunk/reactos/lib/3rdparty/fullfat/fullfat.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/fullfat/fullfat.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -3,7 +3,6 @@ <module name="fullfat" type="staticlibrary"> <include base="ReactOS">include/reactos/libs/fullfat</include> <define name="__NTDRIVER__" /> - <define name="__NO_CTYPE_INLINES" /> <file>ff_blk.c</file> <file>ff_crc.c</file> Modified: trunk/reactos/lib/cmlib/cmlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.rbuild?rev… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -3,7 +3,6 @@ <group> <module name="cmlib" type="staticlibrary"> <include base="cmlib">.</include> - <define name="__NO_CTYPE_INLINES" /> <define name="_NTOSKRNL_" /> <define name="_NTSYSTEM_" /> <define name="NASSERT" /> Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -3,7 +3,6 @@ <module name="oskittcp" type="staticlibrary"> <define name="__NTDRIVER__"/> <define name="KERNEL"/> - <define name="__NO_CTYPE_INLINES" /> <include base="oskittcp">include/freebsd</include> <include base="oskittcp">include/freebsd/sys/include</include> <include base="oskittcp">include/freebsd/src/sys</include> Modified: trunk/reactos/lib/fslib/vfatlib/check/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/fi… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/file.c [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -4,10 +4,6 @@ /* FAT32, VFAT, Atari format support, and various fixes additions May 1998 * by Roman Hodek <Roman.Hodek(a)informatik.uni-erlangen.de> */ - -/* Need to define this so that islower isn't inlined - (ntdll doesn't export isctype) */ -#define __NO_CTYPE_INLINES #include "vfatlib.h" Modified: trunk/reactos/lib/ppcmmu/ppcmmu.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/ppcmmu.rbuild?r… ============================================================================== --- trunk/reactos/lib/ppcmmu/ppcmmu.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/ppcmmu/ppcmmu.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="ppcmmu" type="staticlibrary"> <include base="ppcmmu">.</include> - <define name="__NO_CTYPE_INLINES" /> <if property="ARCH" value="powerpc"> <file>mmuutil.c</file> </if> Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=432… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="rtl" type="staticlibrary"> <define name="_NTOSKRNL_" /> - <define name="__NO_CTYPE_INLINES" /> <define name="NO_RTL_INLINES" /> <define name="_NTSYSTEM_" /> <define name="_NTDLLBUILD_" /> Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -24,7 +24,6 @@ <define name="_MSVCRT_LIB_" /> <define name="_MSVCRT_" /> <define name="_MT" /> - <define name="__NO_CTYPE_INLINES" /> <directory name="conio"> <file>cgets.c</file> <file>cprintf.c</file> Modified: trunk/reactos/lib/sdk/crt/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.rbuil… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -3,11 +3,9 @@ <module name="libcntpr" type="staticlibrary"> <include base="crt">.</include> <include base="crt">include</include> - <define name="__NO_CTYPE_INLINES" /> <define name="NO_RTL_INLINES" /> <define name="_NTSYSTEM_" /> <define name="_NTDLLBUILD_" /> - <define name="_SEH_NO_NATIVE_NLG" /> <define name="_LIBCNT_" /> <if property="ARCH" value="i386"> <define name="__MINGW_IMPORT">"extern __attribute__ ((dllexport))"</define> Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -6,7 +6,6 @@ <define name="__NTOSKRNL__" /> <define name="_NTOSKRNL_" /> <define name="_NTSYSTEM_" /> - <define name="__NO_CTYPE_INLINES" /> <define name="_IN_KERNEL_" /> <if property="_WINKD_" value="1"> <define name="_WINKD_" />

1 0

[khornicek] 43233: - simplify the code a bit
by khornicek＠svn.reactos.org 30 Sep '09

30 Sep '09

Author: khornicek Date: Wed Sep 30 14:59:06 2009 New Revision: 43233 URL: http://svn.reactos.org/svn/reactos?rev=43233&view=rev Log: - simplify the code a bit Modified: trunk/reactos/dll/win32/opengl32/font.c Modified: trunk/reactos/dll/win32/opengl32/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/font.c?… ============================================================================== --- trunk/reactos/dll/win32/opengl32/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/font.c [iso-8859-1] Wed Sep 30 14:59:06 2009 @@ -36,39 +36,6 @@ static DWORD VertBufIndex; static GLenum TessErrorOccurred; - -/***************************************************************************** -* InitLineBuf -* -* Initializes the global LineBuf and its associated size and current-element -* counters. -*****************************************************************************/ - -INT InitLineBuf(VOID) -{ - if (!(LineBuf = (FLOAT*) - HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (LineBufSize = LINE_BUF_QUANT) * sizeof(FLOAT)))) - return 0; - LineBufIndex = 0; - return 1; -} - -/***************************************************************************** -* InitVertBuf -* -* Initializes the global VertBuf and its associated size and current-element -* counters. -*****************************************************************************/ - -INT InitVertBuf(VOID) -{ - if (!(VertBuf = (FLOAT*) - HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (VertBufSize = VERT_BUF_QUANT) * sizeof(FLOAT)))) - return 0; - VertBufIndex = 0; - return 1; -} - /***************************************************************************** * AppendToLineBuf * @@ -81,8 +48,9 @@ if (LineBufIndex >= LineBufSize) { FLOAT* f; - - f = (FLOAT*) HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, LineBuf, (LineBufSize += LINE_BUF_QUANT) * sizeof(FLOAT)); + LineBufSize += LINE_BUF_QUANT; + + f = (FLOAT*) HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, LineBuf, (LineBufSize) * sizeof(FLOAT)); if (!f) return 0; LineBuf = f; @@ -107,36 +75,6 @@ return 0; VertBuf[VertBufIndex++] = value; return 1; -} - -/***************************************************************************** -* FreeLineBuf -* -* Cleans up vertex buffer structure. -*****************************************************************************/ - -VOID FreeLineBuf(VOID) -{ - if (LineBuf) - { - HeapFree(GetProcessHeap(), 0, LineBuf); - LineBuf = NULL; - } -} - -/***************************************************************************** -* FreeVertBuf -* -* Cleans up vertex buffer structure. -*****************************************************************************/ - -VOID FreeVertBuf(VOID) -{ - if (VertBuf) - { - HeapFree(GetProcessHeap(), 0, VertBuf); - VertBuf = NULL; - } } /***************************************************************************** @@ -634,8 +572,13 @@ /* * Initialize the global buffer into which we place the outlines: */ - if (!InitLineBuf()) + LineBuf = (FLOAT*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (LINE_BUF_QUANT) * sizeof(FLOAT)); + + if(!LineBuf) goto exit; + + LineBufSize = LINE_BUF_QUANT; + LineBufIndex = 0; /* * Convert the glyph outlines to a set of polyline loops. @@ -681,8 +624,14 @@ * auxiliary routines for drawing. */ - if (!InitVertBuf()) + VertBuf = (FLOAT*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (VERT_BUF_QUANT) * sizeof(FLOAT)); + + if (!VertBuf) goto exit; + + VertBufSize = VERT_BUF_QUANT; + VertBufIndex = 0; + if (!(tess = gluNewTess())) goto exit; @@ -799,11 +748,16 @@ exit: - FreeLineBuf(); + + if(LineBuf) + HeapFree(GetProcessHeap(), 0, LineBuf); + + if(VertBuf) + HeapFree(GetProcessHeap(), 0, VertBuf); + if (tess) gluDeleteTess(tess); - FreeVertBuf(); return status; }

1 0

[khornicek] 43232: - add wglUseFontOutlines, wglUseFontBitmaps - code ported (rearranged, simplified, fixed memory leaks, removed unneeded variables) from Mesa3D glDirect driver (c) SciTech Software, Inc - more work needed but 3D text screen saver finally renders at least something
by khornicek＠svn.reactos.org 30 Sep '09

30 Sep '09

Author: khornicek Date: Wed Sep 30 14:12:56 2009 New Revision: 43232 URL: http://svn.reactos.org/svn/reactos?rev=43232&view=rev Log: - add wglUseFontOutlines, wglUseFontBitmaps - code ported (rearranged, simplified, fixed memory leaks, removed unneeded variables) from Mesa3D glDirect driver (c) SciTech Software, Inc - more work needed but 3D text screen saver finally renders at least something Added: trunk/reactos/dll/win32/opengl32/font.c (with props) Modified: trunk/reactos/dll/win32/opengl32/opengl32.h trunk/reactos/dll/win32/opengl32/opengl32.rbuild trunk/reactos/dll/win32/opengl32/wgl.c Added: trunk/reactos/dll/win32/opengl32/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/font.c?… ============================================================================== --- trunk/reactos/dll/win32/opengl32/font.c (added) +++ trunk/reactos/dll/win32/opengl32/font.c [iso-8859-1] Wed Sep 30 14:12:56 2009 @@ -1,0 +1,1201 @@ +/**************************************************************************** +* Copyright (C) 1991-2004 SciTech Software, Inc. All rights reserved. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included +* in all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* SCITECH SOFTWARE INC BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +* OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +* SOFTWARE. +****************************************************************************/ + +#include "opengl32.h" +#include <math.h> + +#define LINE_BUF_QUANT 4000 +#define VERT_BUF_QUANT 4000 + +static HFONT hNewFont, hOldFont; +static FLOAT ScaleFactor; +static FLOAT* LineBuf; +static DWORD LineBufSize; +static DWORD LineBufIndex; +static FLOAT* VertBuf; +static DWORD VertBufSize; +static DWORD VertBufIndex; +static GLenum TessErrorOccurred; + + +/***************************************************************************** +* InitLineBuf +* +* Initializes the global LineBuf and its associated size and current-element +* counters. +*****************************************************************************/ + +INT InitLineBuf(VOID) +{ + if (!(LineBuf = (FLOAT*) + HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (LineBufSize = LINE_BUF_QUANT) * sizeof(FLOAT)))) + return 0; + LineBufIndex = 0; + return 1; +} + +/***************************************************************************** +* InitVertBuf +* +* Initializes the global VertBuf and its associated size and current-element +* counters. +*****************************************************************************/ + +INT InitVertBuf(VOID) +{ + if (!(VertBuf = (FLOAT*) + HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (VertBufSize = VERT_BUF_QUANT) * sizeof(FLOAT)))) + return 0; + VertBufIndex = 0; + return 1; +} + +/***************************************************************************** +* AppendToLineBuf +* +* Appends one floating-point value to the global LineBuf array. Return value +* is non-zero for success, zero for failure. +*****************************************************************************/ + +INT AppendToLineBuf(FLOAT value) +{ + if (LineBufIndex >= LineBufSize) + { + FLOAT* f; + + f = (FLOAT*) HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, LineBuf, (LineBufSize += LINE_BUF_QUANT) * sizeof(FLOAT)); + if (!f) + return 0; + LineBuf = f; + } + LineBuf[LineBufIndex++] = value; + return 1; +} + +/***************************************************************************** +* AppendToVertBuf +* +* Appends one floating-point value to the global VertBuf array. Return value +* is non-zero for success, zero for failure. +* +* Note that we can't realloc this one, because the tessellator is using +* pointers into it. +*****************************************************************************/ + +INT AppendToVertBuf(FLOAT value) +{ + if (VertBufIndex >= VertBufSize) + return 0; + VertBuf[VertBufIndex++] = value; + return 1; +} + +/***************************************************************************** +* FreeLineBuf +* +* Cleans up vertex buffer structure. +*****************************************************************************/ + +VOID FreeLineBuf(VOID) +{ + if (LineBuf) + { + HeapFree(GetProcessHeap(), 0, LineBuf); + LineBuf = NULL; + } +} + +/***************************************************************************** +* FreeVertBuf +* +* Cleans up vertex buffer structure. +*****************************************************************************/ + +VOID FreeVertBuf(VOID) +{ + if (VertBuf) + { + HeapFree(GetProcessHeap(), 0, VertBuf); + VertBuf = NULL; + } +} + +/***************************************************************************** +* GetWord +* +* Fetch the next 16-bit word from a little-endian byte stream, and increment +* the stream pointer to the next unscanned byte. +*****************************************************************************/ + +LONG GetWord(UCHAR** p) +{ + LONG value; + + value = ((*p)[1] << 8) + (*p)[0]; + *p += 2; + return value; +} + +/***************************************************************************** +* GetDWord +* +* Fetch the next 32-bit word from a little-endian byte stream, and increment +* the stream pointer to the next unscanned byte. +*****************************************************************************/ + +LONG GetDWord(UCHAR** p) +{ + LONG value; + + value = ((*p)[3] << 24) + ((*p)[2] << 16) + ((*p)[1] << 8) + (*p)[0]; + *p += 4; + return value; +} + +/***************************************************************************** +* GetFixed +* +* Fetch the next 32-bit fixed-point value from a little-endian byte stream, +* convert it to floating-point, and increment the stream pointer to the next +* unscanned byte. +*****************************************************************************/ +double GetFixed(UCHAR** p) +{ + LONG hiBits, loBits; + double value; + + loBits = GetWord(p); + hiBits = GetWord(p); + value = (double) ((hiBits << 16) | loBits) / 65536.0; + + return value * ScaleFactor; +} + + +/***************************************************************************** +** +** InvertGlyphBitmap. +** +** Invert the bitmap so that it suits OpenGL's representation. +** Each row starts on a double word boundary. +** +*****************************************************************************/ + +VOID InvertGlyphBitmap(INT w, INT h, DWORD *fptr, DWORD *tptr) +{ + INT dWordsInRow = (w+31)/32; + INT i, j; + + if (w <= 0 || h <= 0) { + return; + } + + tptr += ((h-1)*dWordsInRow); + for (i = 0; i < h; i++) { + for (j = 0; j < dWordsInRow; j++) { + *(tptr + j) = *(fptr + j); + } + tptr -= dWordsInRow; + fptr += dWordsInRow; + } +} + +/***************************************************************************** +* CreateHighResolutionFont +* +* Gets metrics for the current font and creates an equivalent font +* scaled to the design units of the font. +* +*****************************************************************************/ + +HFONT CreateHighResolutionFont(HDC hDC) +{ + UINT otmSize; + OUTLINETEXTMETRIC *otm; + LONG fontHeight, fontWidth, fontUnits; + LOGFONTW logFont, logFontFaceName; + + otmSize = GetOutlineTextMetricsW(hDC, 0, NULL); + if (!otmSize) + return NULL; + + otm = (OUTLINETEXTMETRIC *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, otmSize); + if (!otm) + return NULL; + + otm->otmSize = otmSize; + if (!GetOutlineTextMetricsW(hDC, otmSize, otm)) + return NULL; + + GetObjectW(GetCurrentObject(hDC, OBJ_FONT), sizeof(logFontFaceName), &logFontFaceName); + + fontHeight = otm->otmTextMetrics.tmHeight - + otm->otmTextMetrics.tmInternalLeading; + fontWidth = otm->otmTextMetrics.tmAveCharWidth; + fontUnits = (LONG) otm->otmEMSquare; + + ScaleFactor = 1.0F / (FLOAT) fontUnits; + + logFont.lfHeight = - ((LONG) fontUnits); + logFont.lfWidth = (LONG)((FLOAT) (fontWidth * fontUnits) / (FLOAT) fontHeight); + logFont.lfEscapement = 0; + logFont.lfOrientation = 0; + logFont.lfWeight = otm->otmTextMetrics.tmWeight; + logFont.lfItalic = otm->otmTextMetrics.tmItalic; + logFont.lfUnderline = otm->otmTextMetrics.tmUnderlined; + logFont.lfStrikeOut = otm->otmTextMetrics.tmStruckOut; + logFont.lfCharSet = otm->otmTextMetrics.tmCharSet; + logFont.lfOutPrecision = OUT_OUTLINE_PRECIS; + logFont.lfClipPrecision = CLIP_DEFAULT_PRECIS; + logFont.lfQuality = DEFAULT_QUALITY; + logFont.lfPitchAndFamily = + otm->otmTextMetrics.tmPitchAndFamily & 0xf0; + wcscpy(logFont.lfFaceName, logFontFaceName.lfFaceName); + + hNewFont = CreateFontIndirectW(&logFont); + + HeapFree(GetProcessHeap(), 0, otm); + + return hNewFont; +} + +/***************************************************************************** +* MakeLinesFromArc +* +* Subdivides one arc of a quadratic spline until the chordal deviation +* tolerance requirement is met, then places the resulting set of line +* segments in the global LineBuf. +*****************************************************************************/ +INT MakeLinesFromArc(FLOAT x0, FLOAT y0, FLOAT x1, FLOAT y1, FLOAT x2, FLOAT y2, + DWORD vertexCountIndex, FLOAT chordalDeviationSquared) +{ + FLOAT x01; + FLOAT y01; + FLOAT x12; + FLOAT y12; + FLOAT midPointX; + FLOAT midPointY; + FLOAT deltaX; + FLOAT deltaY; + + /* + * Calculate midpoint of the curve by de Casteljau: + */ + x01 = 0.5F * (x0 + x1); + y01 = 0.5F * (y0 + y1); + x12 = 0.5F * (x1 + x2); + y12 = 0.5F * (y1 + y2); + midPointX = 0.5F * (x01 + x12); + midPointY = 0.5F * (y01 + y12); + + + /* + * Estimate chordal deviation by the distance from the midpoint + * of the curve to its non-pointpolated control point. If this + * distance is greater than the specified chordal deviation + * constraint, then subdivide. Otherwise, generate polylines + * from the three control points. + */ + deltaX = midPointX - x1; + deltaY = midPointY - y1; + + if (deltaX * deltaX + deltaY * deltaY > chordalDeviationSquared) + { + MakeLinesFromArc( x0, y0, + x01, y01, + midPointX, midPointY, + vertexCountIndex, + chordalDeviationSquared); + + MakeLinesFromArc( midPointX, midPointY, + x12, y12, + x2, y2, + vertexCountIndex, + chordalDeviationSquared); + } + else + { + /* + * The "pen" is already at (x0, y0), so we don't need to + * add that point to the LineBuf. + */ + if (!AppendToLineBuf(x1) + || !AppendToLineBuf(y1) + || !AppendToLineBuf(x2) + || !AppendToLineBuf(y2)) + return 0; + LineBuf[vertexCountIndex] += 2.0F; + } + + return 1; +} + +/***************************************************************************** +* MakeLinesFromTTQSpline +* +* Converts points from the poly quadratic spline in a TT_PRIM_QSPLINE +* structure to polyline points in the global LineBuf. +*****************************************************************************/ + +INT MakeLinesFromTTQSpline( UCHAR** pp, DWORD vertexCountIndex, WORD pointCount, FLOAT chordalDeviation) +{ + FLOAT x0, y0, x1, y1, x2, y2; + WORD point; + + /* + * Process each of the non-pointpolated points in the outline. + * To do this, we need to generate two pointpolated points (the + * start and end of the arc) for each non-pointpolated point. + * The first pointpolated point is always the one most recently + * stored in LineBuf, so we just extract it from there. The + * second pointpolated point is either the average of the next + * two points in the QSpline, or the last point in the QSpline + * if only one remains. + */ + for (point = 0; point < pointCount - 1; ++point) + { + x0 = LineBuf[LineBufIndex - 2]; + y0 = LineBuf[LineBufIndex - 1]; + + x1 = (FLOAT) GetFixed(pp); + y1 = (FLOAT) GetFixed(pp); + + if (point == pointCount - 2) + { + /* + * This is the last arc in the QSpline. The final + * point is the end of the arc. + */ + x2 = (FLOAT) GetFixed(pp); + y2 = (FLOAT) GetFixed(pp); + } + else + { + /* + * Peek at the next point in the input to compute + * the end of the arc: + */ + x2 = 0.5F * (x1 + (FLOAT) GetFixed(pp)); + y2 = 0.5F * (y1 + (FLOAT) GetFixed(pp)); + /* + * Push the point back onto the input so it will + * be reused as the next off-curve point: + */ + *pp -= 8; + } + + if (!MakeLinesFromArc( x0, y0, + x1, y1, + x2, y2, + vertexCountIndex, + chordalDeviation * chordalDeviation)) + return 0; + } + + return 1; +} + +/***************************************************************************** +* MakeLinesFromTTLine +* +* Converts points from the polyline in a TT_PRIM_LINE structure to +* equivalent points in the global LineBuf. +*****************************************************************************/ +INT MakeLinesFromTTLine(UCHAR** pp, DWORD vertexCountIndex, WORD pointCount) +{ + /* + * Just copy the line segments into the line buffer (converting + * type as we go): + */ + LineBuf[vertexCountIndex] += pointCount; + while (pointCount--) + { + if (!AppendToLineBuf((FLOAT) GetFixed(pp)) /* X coord */ + || !AppendToLineBuf((FLOAT) GetFixed(pp))) /* Y coord */ + return 0; + } + + return 1; +} + +/***************************************************************************** +* MakeLinesFromTTPolyCurve +* +* Converts the lines and splines in a single TTPOLYCURVE structure to points +* in the global LineBuf. +*****************************************************************************/ + +INT MakeLinesFromTTPolycurve(UCHAR** pp, DWORD vertexCountIndex, FLOAT chordalDeviation) +{ + WORD type; + WORD pointCount; + + /* + * Pick up the relevant fields of the TTPOLYCURVE structure: + */ + type = (WORD) GetWord(pp); + pointCount = (WORD) GetWord(pp); + + /* + * Convert the "curve" to line segments: + */ + if (type == TT_PRIM_LINE) + return MakeLinesFromTTLine( pp, + vertexCountIndex, + pointCount); + else if (type == TT_PRIM_QSPLINE) + return MakeLinesFromTTQSpline( pp, + vertexCountIndex, + pointCount, + chordalDeviation); + else + return 0; +} + +/***************************************************************************** +* MakeLinesFromTTPolygon +* +* Converts a TTPOLYGONHEADER and its associated curve structures into a +* single polyline loop in the global LineBuf. +*****************************************************************************/ + +INT MakeLinesFromTTPolygon(UCHAR** pp, FLOAT chordalDeviation) +{ + DWORD polySize; + UCHAR* polyStart; + DWORD vertexCountIndex; + + /* + * Record where the polygon data begins, and where the loop's + * vertex count resides: + */ + polyStart = *pp; + vertexCountIndex = LineBufIndex; + if (!AppendToLineBuf(0.0F)) + return 0; + + /* + * Extract relevant data from the TTPOLYGONHEADER: + */ + polySize = GetDWord(pp); + if (GetDWord(pp) != TT_POLYGON_TYPE) /* polygon type */ + return 0; + if (!AppendToLineBuf((FLOAT) GetFixed(pp))) /* first X coord */ + return 0; + if (!AppendToLineBuf((FLOAT) GetFixed(pp))) /* first Y coord */ + return 0; + LineBuf[vertexCountIndex] += 1.0F; + + /* + * Process each of the TTPOLYCURVE structures in the polygon: + */ + while (*pp < polyStart + polySize) + if (!MakeLinesFromTTPolycurve( pp, + vertexCountIndex, + chordalDeviation)) + return 0; + + return 1; +} + +/***************************************************************************** +* TessVertexOut +* +* Used by tessellator to handle output vertexes. +*****************************************************************************/ + +VOID CALLBACK TessVertexOutData(FLOAT p[3], GLfloat z) +{ + GLfloat v[3]; + v[0] = (GLfloat) p[0]; + v[1] = (GLfloat) p[1]; + v[2] = z; + glVertex3fv(v); +} + +/***************************************************************************** +* TessCombine +* +* Used by tessellator to handle self-pointsecting contours and degenerate +* geometry. +*****************************************************************************/ +VOID CALLBACK TessCombine(double coords[3], VOID* vertex_data[4], FLOAT weight[4], VOID** outData) +{ + if (!AppendToVertBuf((FLOAT) coords[0]) + || !AppendToVertBuf((FLOAT) coords[1]) + || !AppendToVertBuf((FLOAT) coords[2])) + TessErrorOccurred = GL_OUT_OF_MEMORY; + + *outData = VertBuf + (VertBufIndex - 3); +} + +/***************************************************************************** +* TessError +* +* Saves the last tessellator error code in the global TessErrorOccurred. +*****************************************************************************/ + +VOID CALLBACK TessError(GLenum error) +{ + TessErrorOccurred = error; +} + +/***************************************************************************** +* MakeLinesFromGlyph +* +* Converts the outline of a glyph from the TTPOLYGON format to a simple +* array of floating-point values containing one or more loops. +* +* The first element of the output array is a count of the number of loops. +* The loop data follows this count. Each loop consists of a count of the +* number of vertices it contains, followed by the vertices. Each vertex +* is an X and Y coordinate. For example, a single triangle might be +* described by this array: +* +* 1., 3., 0., 0., 1., 0., 0., 1. +* ^ ^ ^ ^ ^ ^ ^ ^ +* #loops #verts x1 y1 x2 y2 x3 y3 +* +* A two-loop glyph would look like this: +* +* 2., 3., 0.,0., 1.,0., 0.,1., 3., .2,.2, .4,.2, .2,.4 +* +* Line segments from the TTPOLYGON are transferred to the output array in +* the obvious way. Quadratic splines in the TTPOLYGON are converted to +* collections of line segments +*****************************************************************************/ + +INT MakeLinesFromGlyph(UCHAR* glyphBuf, DWORD glyphSize, FLOAT chordalDeviation) +{ + UCHAR* p; + INT status = 0; + + /* + * Pick up all the polygons (aka loops) that make up the glyph: + */ + if (!AppendToLineBuf(0.0F)) /* loop count at LineBuf[0] */ + goto exit; + + p = glyphBuf; + while (p < glyphBuf + glyphSize) + { + if (!MakeLinesFromTTPolygon(&p, chordalDeviation)) + goto exit; + LineBuf[0] += 1.0F; /* increment loop count */ + } + + status = 1; + +exit: + return status; +} + +/***************************************************************************** +* DrawGlyph +* +* Converts the outline of a glyph to OpenGL drawing primitives, tessellating +* as needed, and then draws the glyph. Tessellation of the quadratic splines +* in the outline is controlled by "chordalDeviation", and the drawing +* primitives (lines or polygons) are selected by "format". +* +* Return value is nonzero for success, zero for failure. +* +* Does not check for OpenGL errors, so if the caller needs to know about them, +* it should call glGetError(). +*****************************************************************************/ + +INT DrawGlyph(UCHAR* glyphBuf, DWORD glyphSize, FLOAT chordalDeviation, FLOAT extrusion, INT format) +{ + INT status = 0; + FLOAT* p; + DWORD loop; + DWORD point; + GLUtesselator* tess = NULL; + + /* + * Initialize the global buffer into which we place the outlines: + */ + if (!InitLineBuf()) + goto exit; + + /* + * Convert the glyph outlines to a set of polyline loops. + * (See MakeLinesFromGlyph() for the format of the loop data + * structure.) + */ + if (!MakeLinesFromGlyph(glyphBuf, glyphSize, chordalDeviation)) + goto exit; + p = LineBuf; + + + /* + * Now draw the loops in the appropriate format: + */ + if (format == WGL_FONT_LINES) + { + /* + * This is the easy case. Just draw the outlines. + */ + for (loop = (DWORD) *p++; loop; --loop) + { + glBegin(GL_LINE_LOOP); + for (point = (DWORD) *p++; point; --point) + { + glVertex2fv(p); + p += 2; + } + glEnd(); + } + status = 1; + } + + else if (format == WGL_FONT_POLYGONS) + { + double v[3]; + FLOAT *save_p = p; + GLfloat z_value; + + /* + * This is the hard case. We have to set up a tessellator + * to convert the outlines into a set of polygonal + * primitives, which the tessellator passes to some + * auxiliary routines for drawing. + */ + + if (!InitVertBuf()) + goto exit; + if (!(tess = gluNewTess())) + goto exit; + + gluTessCallback(tess, GLU_BEGIN, (VOID(CALLBACK *)()) glBegin); + gluTessCallback(tess, GLU_TESS_VERTEX_DATA, (VOID(CALLBACK *)()) TessVertexOutData); + gluTessCallback(tess, GLU_END, (VOID(CALLBACK *)()) glEnd); + gluTessCallback(tess, GLU_ERROR, (VOID(CALLBACK *)()) TessError); + gluTessCallback(tess, GLU_TESS_COMBINE, (VOID(CALLBACK *)()) TessCombine); + gluTessNormal(tess, 0.0F, 0.0F, 1.0F); + + TessErrorOccurred = 0; + glNormal3f(0.0f, 0.0f, 1.0f); + v[2] = 0.0; + z_value = 0.0f; + + gluTessBeginPolygon(tess, (VOID *)*(INT *)&z_value); + + for (loop = (DWORD) *p++; loop; --loop) + { + gluTessBeginContour(tess); + + for (point = (DWORD) *p++; point; --point) + { + v[0] = p[0]; + v[1] = p[1]; + gluTessVertex(tess, v, p); + p += 2; + } + + gluTessEndContour(tess); + } + gluTessEndPolygon(tess); + + status = !TessErrorOccurred; + + /* Extrusion code */ + if (extrusion) + { + DWORD loops; + GLfloat thickness = (GLfloat) - extrusion; + FLOAT *vert, *vert2; + DWORD count; + + p = save_p; + loops = (DWORD) *p++; + + for (loop = 0; loop < loops; loop++) + { + GLfloat dx, dy, len; + DWORD last; + + count = (DWORD) *p++; + glBegin(GL_QUAD_STRIP); + + /* Check if the first and last vertex are identical + * so we don't draw the same quad twice. + */ + vert = p + (count-1)*2; + last = (p[0] == vert[0] && p[1] == vert[1]) ? count-1 : count; + + for (point = 0; point <= last; point++) + { + vert = p + 2 * (point % last); + vert2 = p + 2 * ((point+1) % last); + + dx = vert[0] - vert2[0]; + dy = vert[1] - vert2[1]; + len = (GLfloat)sqrt(dx * dx + dy * dy); + + glNormal3f(dy / len, -dx / len, 0.0f); + glVertex3f((GLfloat) vert[0], + (GLfloat) vert[1], thickness); + glVertex3f((GLfloat) vert[0], + (GLfloat) vert[1], 0.0f); + } + + glEnd(); + p += count*2; + } + + /* Draw the back face */ + p = save_p; + v[2] = thickness; + glNormal3f(0.0f, 0.0f, -1.0f); + gluTessNormal(tess, 0.0F, 0.0F, -1.0F); + + gluTessBeginPolygon(tess, (VOID *)*(INT *)&thickness); + + for (loop = (DWORD) *p++; loop; --loop) + { + count = (DWORD) *p++; + + gluTessBeginContour(tess); + + for (point = 0; point < count; point++) + { + vert = p + ((count-point-1)<<1); + v[0] = vert[0]; + v[1] = vert[1]; + gluTessVertex(tess, v, vert); + } + p += count*2; + + gluTessEndContour(tess); + } + gluTessEndPolygon(tess); + } + +#if !defined(NDEBUG) + if (TessErrorOccurred) + DBGPRINT("Tessellation error %s\n", gluErrorString(TessErrorOccurred)); +#endif + } + + +exit: + FreeLineBuf(); + if (tess) + gluDeleteTess(tess); + + FreeVertBuf(); + return status; +} + + +/***************************************************************************** +* MakeDisplayListFromGlyph +* +* Converts the outline of a glyph to an OpenGL display list. +* +* Return value is nonzero for success, zero for failure. +* +* Does not check for OpenGL errors, so if the caller needs to know about them, +* it should call glGetError(). +*****************************************************************************/ + +INT MakeDisplayListFromGlyph(DWORD listName, UCHAR* glyphBuf, DWORD glyphSize, LPGLYPHMETRICSFLOAT glyphMetricsFloat, + FLOAT chordalDeviation, FLOAT extrusion, INT format) +{ + INT status; + + glNewList(listName, GL_COMPILE); + status = DrawGlyph(glyphBuf, glyphSize, chordalDeviation, extrusion, format); + glTranslatef(glyphMetricsFloat->gmfCellIncX, glyphMetricsFloat->gmfCellIncY, 0.0F); + glEndList(); + + return status; +} + +// *********************************************************************** + +/***************************************************************************** +* IntUseFontBitmaps +* +* Converts a subrange of the glyphs in a GDI font to OpenGL display +* lists. +* +* Extended to support any GDI font, not just TrueType fonts. (DaveM) +* +*****************************************************************************/ + +BOOL APIENTRY IntUseFontBitmapsW(HDC hDC, DWORD first, DWORD count, DWORD listBase) +{ + INT i, ox, oy, ix, iy; + INT w = 0, h = 0; + INT iBufSize, iCurBufSize = 0; + DWORD *bitmapBuffer = NULL; + DWORD *invertedBitmapBuffer = NULL; + BOOL bSuccessOrFail = TRUE; + BOOL bTrueType = FALSE; + TEXTMETRIC tm; + GLYPHMETRICS gm; + RASTERIZER_STATUS rs; + MAT2 mat; + SIZE size; + RECT rect; + HDC hDCMem; + HBITMAP hBitmap; + BITMAPINFO bmi; + HFONT hFont; + + // Set up a unity matrix. + ZeroMemory(&mat, sizeof(mat)); + mat.eM11.value = 1; + mat.eM22.value = 1; + + // Test to see if selected font is TrueType or not + ZeroMemory(&tm, sizeof(tm)); + if (!GetTextMetrics(hDC, &tm)) + { + DBGPRINT("Font metrics error\n"); + return FALSE; + } + bTrueType = (tm.tmPitchAndFamily & TMPF_TRUETYPE) ? TRUE : FALSE; + + // Test to see if TRUE-TYPE capabilities are installed + // (only necessary if TrueType font selected) + ZeroMemory(&rs, sizeof(rs)); + + if (bTrueType) + { + if (!GetRasterizerCaps (&rs, sizeof (RASTERIZER_STATUS)) || !(rs.wFlags & TT_ENABLED)) + { + DBGPRINT("No TrueType caps\n"); + bTrueType = FALSE; + } + } + + // Trick to get the current font handle + hFont = SelectObject(hDC, GetStockObject(SYSTEM_FONT)); + SelectObject(hDC, hFont); + + // Have memory device context available for holding bitmaps of font glyphs + hDCMem = CreateCompatibleDC(hDC); + SelectObject(hDCMem, hFont); + SetTextColor(hDCMem, RGB(0xFF, 0xFF, 0xFF)); + SetBkColor(hDCMem, 0); + + for (i = first; (DWORD) i < (first + count); i++) + { + // Find out how much space is needed for the bitmap so we can + // Set the buffer size correctly. + if (bTrueType) + { + // Use TrueType support to get bitmap size of glyph + iBufSize = GetGlyphOutline(hDC, i, GGO_BITMAP, &gm, 0, NULL, &mat); + if (iBufSize == GDI_ERROR) + { + bSuccessOrFail = FALSE; + break; + } + } + else + { + // Use generic GDI support to compute bitmap size of glyph + w = tm.tmMaxCharWidth; + h = tm.tmHeight; + if (GetTextExtentPoint32(hDC, (LPCTSTR)&i, 1, &size)) + { + w = size.cx; + h = size.cy; + } + iBufSize = w * h; + // Use DWORD multiple for compatibility + iBufSize += 3; + iBufSize /= 4; + iBufSize *= 4; + } + + // If we need to allocate Larger Buffers, then do so - but allocate + // An extra 50 % so that we don't do too many mallocs ! + if (iBufSize > iCurBufSize) + { + if (bitmapBuffer) + { + HeapFree(GetProcessHeap(), 0, bitmapBuffer); + } + if (invertedBitmapBuffer) + { + HeapFree(GetProcessHeap(), 0, invertedBitmapBuffer); + } + + iCurBufSize = iBufSize * 2; + bitmapBuffer = (DWORD *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, iCurBufSize); + invertedBitmapBuffer = (DWORD *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, iCurBufSize); + + if (bitmapBuffer == NULL || invertedBitmapBuffer == NULL) + { + bSuccessOrFail = FALSE; + break; + } + } + + // If we fail to get the Glyph data, delete the display lists + // Created so far and return FALSE. + if (bTrueType) + { + // Use TrueType support to get bitmap of glyph + if (GetGlyphOutline(hDC, i, GGO_BITMAP, &gm, iBufSize, bitmapBuffer, &mat) == GDI_ERROR) + { + bSuccessOrFail = FALSE; + break; + } + + // Setup glBitmap parameters for current font glyph + w = gm.gmBlackBoxX; + h = gm.gmBlackBoxY; + ox = gm.gmptGlyphOrigin.x; + oy = gm.gmptGlyphOrigin.y; + ix = gm.gmCellIncX; + iy = gm.gmCellIncY; + } + else + { + // Use generic GDI support to create bitmap of glyph + ZeroMemory(bitmapBuffer, iBufSize); + + if (i >= tm.tmFirstChar && i <= tm.tmLastChar) + { + // Only create bitmaps for actual font glyphs + hBitmap = CreateBitmap(w, h, 1, 1, NULL); + SelectObject(hDCMem, hBitmap); + // Make bitmap of current font glyph + SetRect(&rect, 0, 0, w, h); + DrawText(hDCMem, (LPCTSTR)&i, 1, &rect, + DT_LEFT | DT_BOTTOM | DT_SINGLELINE | DT_NOCLIP); + // Make copy of bitmap in our local buffer + ZeroMemory(&bmi, sizeof(bmi)); + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi.bmiHeader.biWidth = w; + bmi.bmiHeader.biHeight = -h; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount = 1; + bmi.bmiHeader.biCompression = BI_RGB; + GetDIBits(hDCMem, hBitmap, 0, h, bitmapBuffer, &bmi, 0); + DeleteObject(hBitmap); + } + else + { + // Otherwise use empty display list for non-existing glyph + iBufSize = 0; + } + + // Setup glBitmap parameters for current font glyph + ox = 0; + oy = tm.tmDescent; + ix = w; + iy = 0; + } + + // Create an OpenGL display list. + glNewList((listBase + i), GL_COMPILE); + + // Some fonts have no data for the space character, yet advertise + // a non-zero size. + if (0 == iBufSize) + { + glBitmap(0, 0, 0.0f, 0.0f, (GLfloat) ix, (GLfloat) iy, NULL); + } + else + { + // Invert the Glyph data. + InvertGlyphBitmap(w, h, bitmapBuffer, invertedBitmapBuffer); + + // Render an OpenGL bitmap and invert the origin. + glBitmap(w, h, + (GLfloat) ox, (GLfloat) (h-oy), + (GLfloat) ix, (GLfloat) iy, + (GLubyte *) invertedBitmapBuffer); + } + + // Close this display list. + glEndList(); + } + + if (bSuccessOrFail == FALSE) + { + DBGPRINT("DGL_UseFontBitmaps: Get glyph failed\n"); + glDeleteLists((i+listBase), (i-first)); + } + + // Release resources used + DeleteObject(hFont); + DeleteDC(hDCMem); + + if (bitmapBuffer) + HeapFree(GetProcessHeap(), 0, bitmapBuffer); + + if (invertedBitmapBuffer) + HeapFree(GetProcessHeap(), 0, invertedBitmapBuffer); + + return(bSuccessOrFail); +} + +BOOL APIENTRY IntUseFontBitmapsA(HDC hDC, DWORD first, DWORD count, DWORD listBase) +{ + /* Just call IntUseFontBitmapsW for now */ + return IntUseFontBitmapsW(hDC, first, count, listBase); +} + + + +/***************************************************************************** +* IntUseFontOutlines +* +* Converts a subrange of the glyphs in a TrueType font to OpenGL display +* lists. +*****************************************************************************/ + +BOOL APIENTRY IntUseFontOutlinesW(HDC hDC, DWORD first, DWORD count, DWORD listBase, FLOAT chordalDeviation, + FLOAT extrusion, INT format, GLYPHMETRICSFLOAT *glyphMetricsFloatArray) +{ + DWORD glyphIndex; + UCHAR* glyphBuf; + DWORD glyphBufSize; + + /* + * Flush any previous OpenGL errors. This allows us to check for + * new errors so they can be reported via the function return value. + */ + while (glGetError() != GL_NO_ERROR); + + /* + * Make sure that the current font can be sampled accurately. + */ + hNewFont = CreateHighResolutionFont(hDC); + + if (!hNewFont) + return FALSE; + + hOldFont = SelectObject(hDC, hNewFont); + if (!hOldFont) + return FALSE; + + /* + * Preallocate a buffer for the outline data, and track its size: + */ + glyphBuf = (UCHAR*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, glyphBufSize = 10240); + + if (!glyphBuf) + return FALSE; /*WGL_STATUS_NOT_ENOUGH_MEMORY*/ + + /* + * Process each glyph in the given range: + */ + for (glyphIndex = first; glyphIndex - first < count; ++glyphIndex) + { + GLYPHMETRICS glyphMetrics; + DWORD glyphSize; + static MAT2 matrix = + { + {0, 1}, {0, 0}, + {0, 0}, {0, 1} + }; + LPGLYPHMETRICSFLOAT glyphMetricsFloat = &glyphMetricsFloatArray[glyphIndex - first]; + + /* + * Determine how much space is needed to store the glyph's + * outlines. If our glyph buffer isn't large enough, + * resize it. + */ + + glyphSize = GetGlyphOutline(hDC, glyphIndex, GGO_NATIVE, &glyphMetrics, 0, NULL, &matrix); + + if (glyphSize < 0) + return FALSE; /*WGL_STATUS_FAILURE*/ + + if (glyphSize > glyphBufSize) + { + HeapFree(GetProcessHeap(), 0, glyphBuf); + glyphBuf = (UCHAR*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, glyphBufSize = glyphSize); + if (!glyphBuf) + return FALSE; /*WGL_STATUS_NOT_ENOUGH_MEMORY*/ + } + + + /* + * Get the glyph's outlines. + */ + if (GetGlyphOutline(hDC, glyphIndex, GGO_NATIVE, &glyphMetrics, glyphBufSize, glyphBuf, &matrix) < 0) + { + HeapFree(GetProcessHeap(), 0, glyphBuf); + return FALSE; /*WGL_STATUS_FAILURE*/ + } + + glyphMetricsFloat->gmfBlackBoxX = + (FLOAT) glyphMetrics.gmBlackBoxX * ScaleFactor; + glyphMetricsFloat->gmfBlackBoxY = + (FLOAT) glyphMetrics.gmBlackBoxY * ScaleFactor; + glyphMetricsFloat->gmfptGlyphOrigin.x = + (FLOAT) glyphMetrics.gmptGlyphOrigin.x * ScaleFactor; + glyphMetricsFloat->gmfptGlyphOrigin.y = + (FLOAT) glyphMetrics.gmptGlyphOrigin.y * ScaleFactor; + glyphMetricsFloat->gmfCellIncX = + (FLOAT) glyphMetrics.gmCellIncX * ScaleFactor; + glyphMetricsFloat->gmfCellIncY = + (FLOAT) glyphMetrics.gmCellIncY * ScaleFactor; + + /* + * Turn the glyph into a display list: + */ + if (!MakeDisplayListFromGlyph((glyphIndex - first) + listBase, glyphBuf, glyphSize, glyphMetricsFloat, + chordalDeviation + ScaleFactor, extrusion, format)) + { + HeapFree(GetProcessHeap(), 0, glyphBuf); + return FALSE; /*WGL_STATUS_FAILURE*/ + } + } + + /* + * Clean up temporary storage and return. If an error occurred, + * clear all OpenGL error flags and return FAILURE status; + * otherwise just return SUCCESS. + */ + HeapFree(GetProcessHeap(), 0, glyphBuf); + + DeleteObject(SelectObject(hDC, hOldFont)); + + if (glGetError() == GL_NO_ERROR) + { + return TRUE; /*WGL_STATUS_SUCCESS*/ + } + else + { + while (glGetError() != GL_NO_ERROR); + + return FALSE; /*WGL_STATUS_FAILURE*/ + } +} + +BOOL APIENTRY IntUseFontOutlinesA(HDC hDC, DWORD first, DWORD count, DWORD listBase, FLOAT chordalDeviation, + FLOAT extrusion, INT format, GLYPHMETRICSFLOAT *glyphMetricsFloatArray) +{ + /* Just call IntUseFontOutlinesW for now */ + return IntUseFontOutlinesW(hDC, first, count, listBase, chordalDeviation, extrusion, format, glyphMetricsFloatArray); +} Propchange: trunk/reactos/dll/win32/opengl32/font.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/opengl32/opengl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.h [iso-8859-1] Wed Sep 30 14:12:56 2009 @@ -40,6 +40,7 @@ #include <ndk/ntndk.h> #include <GL/gl.h> +#include <GL/glu.h> /* gl function list */ #include "glfuncs.h" @@ -190,6 +191,14 @@ GLDRIVERDATA *OPENGL32_LoadICD( LPCWSTR driver ); BOOL OPENGL32_UnloadICD( GLDRIVERDATA *icd ); BOOL APIENTRY rosglMakeCurrent( HDC hdc, HGLRC hglrc ); +BOOL APIENTRY IntUseFontBitmapsA( HDC hDC, DWORD first, DWORD count, DWORD listBase ); +BOOL APIENTRY IntUseFontBitmapsW( HDC hDC, DWORD first, DWORD count, DWORD listBase ); +BOOL APIENTRY IntUseFontOutlinesA( HDC hDC, DWORD first, DWORD count, DWORD listBase, + FLOAT chordalDeviation, FLOAT extrusion, INT format, + GLYPHMETRICSFLOAT *glyphMetricsFloatArray ); +BOOL APIENTRY IntUseFontOutlinesW( HDC hDC, DWORD first, DWORD count, DWORD listBase, + FLOAT chordalDeviation, FLOAT extrusion, INT format, + GLYPHMETRICSFLOAT *glyphMetricsFloatArray ); /* empty gl functions from gl.c */ int WINAPI glEmptyFunc0( void ); Modified: trunk/reactos/dll/win32/opengl32/opengl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.rbuild [iso-8859-1] Wed Sep 30 14:12:56 2009 @@ -5,7 +5,9 @@ <library>gdi32</library> <library>user32</library> <library>advapi32</library> + <library>glu32</library> <pch>opengl32.h</pch> + <file>font.c</file> <file>gl.c</file> <file>opengl32.c</file> <file>wgl.c</file> Modified: trunk/reactos/dll/win32/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/wgl.c?r… ============================================================================== --- trunk/reactos/dll/win32/opengl32/wgl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/wgl.c [iso-8859-1] Wed Sep 30 14:12:56 2009 @@ -1209,23 +1209,18 @@ BOOL APIENTRY -rosglUseFontBitmapsA( HDC hdc, DWORD first, DWORD count, DWORD listBase ) -{ - UNIMPLEMENTED; - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; -} - - -BOOL -APIENTRY -rosglUseFontBitmapsW( HDC hdc, DWORD first, DWORD count, DWORD listBase ) -{ - UNIMPLEMENTED; - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; -} - +rosglUseFontBitmapsA( HDC hdc, DWORD first, DWORD count, DWORD listBase ) +{ + return IntUseFontBitmapsA(hdc, first, count, listBase); +} + + +BOOL +APIENTRY +rosglUseFontBitmapsW( HDC hdc, DWORD first, DWORD count, DWORD listBase ) +{ + return IntUseFontBitmapsW(hdc, first, count, listBase); +} BOOL APIENTRY @@ -1233,9 +1228,7 @@ FLOAT deviation, FLOAT extrusion, int format, GLYPHMETRICSFLOAT *pgmf ) { - UNIMPLEMENTED; - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + return IntUseFontOutlinesA(hdc, first, count, listBase, deviation, extrusion, format, pgmf); } @@ -1245,9 +1238,7 @@ FLOAT deviation, FLOAT extrusion, int format, GLYPHMETRICSFLOAT *pgmf ) { - UNIMPLEMENTED; - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + return IntUseFontOutlinesW(hdc, first, count, listBase, deviation, extrusion, format, pgmf); } #ifdef __cplusplus

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs