Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 37154: - Remove WIN32_WINNT override.
by fireball＠svn.reactos.org 02 Nov '08

02 Nov '08

Author: fireball Date: Sun Nov 2 13:12:20 2008 New Revision: 37154 URL: http://svn.reactos.org/svn/reactos?rev=37154&view=rev Log: - Remove WIN32_WINNT override. Modified: trunk/rosapps/applications/sysutils/dosfsck/io.c Modified: trunk/rosapps/applications/sysutils/dosfsck/io.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/dosf… ============================================================================== --- trunk/rosapps/applications/sysutils/dosfsck/io.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/dosfsck/io.c [iso-8859-1] Sun Nov 2 13:12:20 2008 @@ -24,7 +24,6 @@ #ifdef _WIN32 -#define _WIN32_WINNT 0x0400 #include <windows.h> #include <winioctl.h> #define __LITTLE_ENDIAN 1234

1 0

[pschweitzer] 37153: Implemented FsRtlUninitializeBaseMcb, FsRtlUninitializeLargeMcb
by pschweitzer＠svn.reactos.org 02 Nov '08

02 Nov '08

Author: pschweitzer Date: Sun Nov 2 13:10:51 2008 New Revision: 37153 URL: http://svn.reactos.org/svn/reactos?rev=37153&view=rev Log: Implemented FsRtlUninitializeBaseMcb, FsRtlUninitializeLargeMcb Modified: branches/pierre-fsd/ntoskrnl/fsrtl/largemcb.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/largemcb.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/large… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] Sun Nov 2 13:10:51 2008 @@ -427,22 +427,35 @@ } /* - * @unimplemented + * @implemented */ VOID NTAPI FsRtlUninitializeBaseMcb(IN PBASE_MCB Mcb) { - KEBUGCHECK(0); -} - -/* - * @unimplemented + if ((Mcb->PoolType == PagedPool) && (Mcb->MaximumPairCount == MAXIMUM_PAIR_COUNT)) + { + ExFreeToPagedLookasideList(&FsRtlFirstMappingLookasideList, + Mcb->Mapping); + } + else + { + ExFreePoolWithTag(Mcb->Mapping, TAG('F', 'S', 'B', 'C')); + } +} + +/* + * @implemented */ VOID NTAPI FsRtlUninitializeLargeMcb(IN PLARGE_MCB Mcb) { - KEBUGCHECK(0); -} - + if (Mcb->FastMutex) + { + ExFreeToPagedLookasideList(&FsRtlFastMutexLookasideList, + Mcb->FastMutex); + FsRtlUninitializeBaseMcb(&(Mcb->BaseMcb)); + } +} +

1 0

[fireball] 37152: - Remove WINVER definition. - Fix no-EOL-at-EOF warnings.
by fireball＠svn.reactos.org 02 Nov '08

02 Nov '08

Author: fireball Date: Sun Nov 2 13:07:00 2008 New Revision: 37152 URL: http://svn.reactos.org/svn/reactos?rev=37152&view=rev Log: - Remove WINVER definition. - Fix no-EOL-at-EOF warnings. Modified: trunk/rostests/dxtest/ddraw/DDraw/display_modes.cpp trunk/rostests/dxtest/ddraw/Surface/blt.cpp trunk/rostests/dxtest/ddraw/ddrawtest.h Modified: trunk/rostests/dxtest/ddraw/DDraw/display_modes.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/DDraw/displa… ============================================================================== --- trunk/rostests/dxtest/ddraw/DDraw/display_modes.cpp [iso-8859-1] (original) +++ trunk/rostests/dxtest/ddraw/DDraw/display_modes.cpp [iso-8859-1] Sun Nov 2 13:07:00 2008 @@ -124,4 +124,4 @@ DirectDraw->Release(); return TRUE; -} +} Modified: trunk/rostests/dxtest/ddraw/Surface/blt.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/Surface/blt.… ============================================================================== --- trunk/rostests/dxtest/ddraw/Surface/blt.cpp [iso-8859-1] (original) +++ trunk/rostests/dxtest/ddraw/Surface/blt.cpp [iso-8859-1] Sun Nov 2 13:07:00 2008 @@ -154,4 +154,4 @@ Surface->Release(); return TRUE; -} +} Modified: trunk/rostests/dxtest/ddraw/ddrawtest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/ddrawtest.h?… ============================================================================== --- trunk/rostests/dxtest/ddraw/ddrawtest.h [iso-8859-1] (original) +++ trunk/rostests/dxtest/ddraw/ddrawtest.h [iso-8859-1] Sun Nov 2 13:07:00 2008 @@ -1,7 +1,5 @@ #ifndef _DDRAWTEST_H #define _DDRAWTEST_H - -#define WINVER 0x501 #include <stdio.h> #include <windows.h>

1 0

[sginsberg] 37151: - Stub out IoTranslateBusAddress, PoCancelDeviceNotify, PoRegisterDeviceNotify, PoRequestShutdownEvent, PoSetHiberRange and PoShutdownBugCheck - Add missing KiCheckForSListAddress
by sginsberg＠svn.reactos.org 02 Nov '08

02 Nov '08

Author: sginsberg Date: Sun Nov 2 10:33:43 2008 New Revision: 37151 URL: http://svn.reactos.org/svn/reactos?rev=37151&view=rev Log: - Stub out IoTranslateBusAddress, PoCancelDeviceNotify, PoRegisterDeviceNotify, PoRequestShutdownEvent, PoSetHiberRange and PoShutdownBugCheck - Add missing KiCheckForSListAddress Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/ntoskrnl.pspec trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sun Nov 2 10:33:43 2008 @@ -3489,3 +3489,18 @@ return STATUS_NOT_SUPPORTED; } } + +/* + * @unimplemented + */ +BOOLEAN +NTAPI +IoTranslateBusAddress(IN INTERFACE_TYPE InterfaceType, + IN ULONG BusNumber, + IN PHYSICAL_ADDRESS BusAddress, + IN OUT PULONG AddressSpace, + OUT PPHYSICAL_ADDRESS TranslatedAddress) +{ + UNIMPLEMENTED; + return FALSE; +} Modified: trunk/reactos/ntoskrnl/ntoskrnl.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.pspec?re… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] Sun Nov 2 10:33:43 2008 @@ -494,7 +494,7 @@ @ stdcall IoSynchronousInvalidateDeviceRelations(ptr long) @ stdcall IoSynchronousPageWrite(ptr ptr ptr ptr ptr) @ stdcall IoThreadToProcess(ptr) -;IoTranslateBusAddress +@ stdcall IoTranslateBusAddress(long long long long ptr ptr) @ stdcall IoUnregisterFileSystem(ptr) @ stdcall IoUnregisterFsRegistrationChange(ptr ptr) @ stdcall IoUnregisterPlugPlayNotification(ptr) @@ -705,6 +705,7 @@ @ fastcall KiAcquireSpinLock(ptr) @ extern KiBugCheckData @ stdcall KiCheckForKernelApcDelivery() +;KiCheckForSListAddress #ifdef _M_IX86 @ stdcall KiCoprocessorError() #endif @@ -915,17 +916,17 @@ ;PfxInsertPrefix ;PfxRemovePrefix @ stdcall PoCallDriver(ptr ptr) -;PoCancelDeviceNotify +@ stdcall PoCancelDeviceNotify(ptr) @ stdcall PoQueueShutdownWorkItem(ptr) @ stdcall PoRegisterDeviceForIdleDetection(ptr long long long) -;PoRegisterDeviceNotify +@ stdcall PoRegisterDeviceNotify(ptr long long long ptr ptr) @ stdcall PoRegisterSystemState(ptr long) @ stdcall PoRequestPowerIrp(ptr long long ptr ptr ptr) -;PoRequestShutdownEvent -;PoSetHiberRange +@ stdcall PoRequestShutdownEvent(ptr) +@ stdcall PoSetHiberRange(ptr long ptr long long) @ stdcall PoSetPowerState(ptr long long) @ stdcall PoSetSystemState(long) -;PoShutdownBugCheck +@ stdcall PoShutdownBugCheck(long long ptr ptr ptr ptr) @ stdcall PoStartNextPowerIrp(ptr) @ stdcall PoUnregisterSystemState(ptr) @ stdcall ProbeForRead(ptr long long) Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=37… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Sun Nov 2 10:33:43 2008 @@ -217,6 +217,84 @@ /* PUBLIC FUNCTIONS **********************************************************/ /* + * @unimplemented + */ +NTSTATUS +NTAPI +PoCancelDeviceNotify(IN PVOID NotifyBlock) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +PoRegisterDeviceNotify(OUT PVOID Unknown0, + IN ULONG Unknown1, + IN ULONG Unknown2, + IN ULONG Unknown3, + IN PVOID Unknown4, + IN PVOID Unknown5) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +VOID +NTAPI +PoShutdownBugCheck(IN BOOLEAN LogError, + IN ULONG BugCheckCode, + IN ULONG_PTR BugCheckParameter1, + IN ULONG_PTR BugCheckParameter2, + IN ULONG_PTR BugCheckParameter3, + IN ULONG_PTR BugCheckParameter4) +{ + DPRINT1("PoShutdownBugCheck called\n"); + + /* FIXME: Log error if requested */ + /* FIXME: Initiate a shutdown */ + + /* Bugcheck the system */ + KeBugCheckEx(BugCheckCode, + BugCheckParameter1, + BugCheckParameter2, + BugCheckParameter3, + BugCheckParameter4); +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +PoRequestShutdownEvent(OUT PVOID *Event) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +VOID +NTAPI +PoSetHiberRange(IN PVOID HiberContext, + IN ULONG Flags, + IN OUT PVOID StartPage, + IN ULONG Length, + IN ULONG PageTag) +{ + UNIMPLEMENTED; + return; +} + +/* * @implemented */ NTSTATUS

1 0

[fireball] 37150: Dmitry Gorbachev - Fix a bug in OEM to Unicode conversion code (wrong cast). See issue #3837 for more details.
by fireball＠svn.reactos.org 02 Nov '08

02 Nov '08

Author: fireball Date: Sun Nov 2 09:15:37 2008 New Revision: 37150 URL: http://svn.reactos.org/svn/reactos?rev=37150&view=rev Log: Dmitry Gorbachev - Fix a bug in OEM to Unicode conversion code (wrong cast). See issue #3837 for more details. Modified: trunk/reactos/lib/rtl/nls.c Modified: trunk/reactos/lib/rtl/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/nls.c?rev=37150&r1… ============================================================================== --- trunk/reactos/lib/rtl/nls.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/nls.c [iso-8859-1] Sun Nov 2 09:15:37 2008 @@ -366,7 +366,7 @@ for (i = 0; i < Size; i++) { - *UnicodeString = NlsOemToUnicodeTable[(INT)*OemString]; + *UnicodeString = NlsOemToUnicodeTable[(UCHAR)*OemString]; UnicodeString++; OemString++; }

1 0

[sginsberg] 37149: - Sync 36654 to trunk
by sginsberg＠svn.reactos.org 02 Nov '08

02 Nov '08

Author: sginsberg Date: Sun Nov 2 08:08:49 2008 New Revision: 37149 URL: http://svn.reactos.org/svn/reactos?rev=37149&view=rev Log: - Sync 36654 to trunk Modified: trunk/reactos/include/ndk/exfuncs.h trunk/reactos/ntoskrnl/ex/resource.c trunk/reactos/ntoskrnl/ntoskrnl.pspec Modified: trunk/reactos/include/ndk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/exfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/exfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/exfuncs.h [iso-8859-1] Sun Nov 2 08:08:49 2008 @@ -111,6 +111,33 @@ IN PEX_ENUM_HANDLE_CALLBACK EnumHandleProcedure, IN OUT PVOID Context, OUT PHANDLE Handle OPTIONAL +); + +// +// Resource Functions +// +PVOID +NTAPI +ExEnterCriticalRegionAndAcquireResourceExclusive( + IN PERESOURCE Resource +); + +PVOID +NTAPI +ExEnterCriticalRegionAndAcquireResourceShared( + IN PERESOURCE Resource +); + +PVOID +NTAPI +ExEnterCriticalRegionAndAcquireSharedWaitForExclusive( + IN PERESOURCE Resource +); + +VOID +FASTCALL +ExReleaseResourceAndLeaveCriticalRegion( + IN PERESOURCE Resource ); #endif Modified: trunk/reactos/ntoskrnl/ex/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/resource.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] Sun Nov 2 08:08:49 2008 @@ -2199,6 +2199,66 @@ } /*++ + * @name ExEnterCriticalRegionAndAcquireResourceShared + * @implemented NT5.2 + * + * The ExEnterCriticalRegionAndAcquireResourceShared routine + * enters a critical region and then acquires a resource shared. + * + * @param Resource + * Pointer to the resource to acquire. + * + * @return Pointer to the Win32K thread pointer of the current thread. + * + * @remarks See ExAcquireResourceSharedLite. + * + *--*/ +PVOID +NTAPI +ExEnterCriticalRegionAndAcquireResourceShared(IN PERESOURCE Resource) +{ + /* Enter critical region */ + KeEnterCriticalRegion(); + + /* Acquire the resource */ + ExAcquireResourceSharedLite(Resource, TRUE); + + /* Return the Win32 Thread */ + return KeGetCurrentThread()->Win32Thread; +} + +/*++ + * @name ExEnterCriticalRegionAndAcquireSharedWaitForExclusive + * @implemented NT5.2 + * + * The ExEnterCriticalRegionAndAcquireSharedWaitForExclusive routine + * enters a critical region and then acquires a resource shared if + * shared access can be granted and there are no exclusive waiters. + * It then acquires the resource exclusively. + * + * @param Resource + * Pointer to the resource to acquire. + * + * @return Pointer to the Win32K thread pointer of the current thread. + * + * @remarks See ExAcquireSharedWaitForExclusive. + * + *--*/ +PVOID +NTAPI +ExEnterCriticalRegionAndAcquireSharedWaitForExclusive(IN PERESOURCE Resource) +{ + /* Enter critical region */ + KeEnterCriticalRegion(); + + /* Acquire the resource */ + ExAcquireSharedWaitForExclusive(Resource, TRUE); + + /* Return the Win32 Thread */ + return KeGetCurrentThread()->Win32Thread; +} + +/*++ * @name ExReleaseResourceAndLeaveCriticalRegion * @implemented NT5.1 * @@ -2223,6 +2283,3 @@ /* Leave critical region */ KeLeaveCriticalRegion(); } - -/* EOF */ - Modified: trunk/reactos/ntoskrnl/ntoskrnl.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.pspec?re… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] Sun Nov 2 08:08:49 2008 @@ -80,8 +80,8 @@ @ stdcall ExDisableResourceBoostLite(ptr) @ fastcall ExEnterCriticalRegionAndAcquireFastMutexUnsafe(ptr) @ stdcall ExEnterCriticalRegionAndAcquireResourceExclusive(ptr) -;ExEnterCriticalRegionAndAcquireResourceShared -;ExEnterCriticalRegionAndAcquireSharedWaitForExclusive +@ stdcall ExEnterCriticalRegionAndAcquireResourceShared(ptr) +@ stdcall ExEnterCriticalRegionAndAcquireSharedWaitForExclusive(ptr) @ stdcall ExEnumHandleTable(ptr ptr ptr ptr) @ extern ExEventObjectType _ExEventObjectType @ stdcall ExExtendZone(ptr ptr long)

1 0

[jimtabor] 37148: - Move functions out of freetype. Implemented FT: GetKerningPairs and RealizationInfo. Other misc changes.
by jimtabor＠svn.reactos.org 02 Nov '08

02 Nov '08

Author: jimtabor Date: Sun Nov 2 06:17:15 2008 New Revision: 37148 URL: http://svn.reactos.org/svn/reactos?rev=37148&view=rev Log: - Move functions out of freetype. Implemented FT: GetKerningPairs and RealizationInfo. Other misc changes. Modified: trunk/reactos/subsystems/win32/win32k/eng/objects.h trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/subsystems/win32/win32k/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Modified: trunk/reactos/subsystems/win32/win32k/eng/objects.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/objects.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/objects.h [iso-8859-1] Sun Nov 2 06:17:15 2008 @@ -67,8 +67,18 @@ ULONG Dummy; } FLOATGDI; + +#define FDM_TYPE_TEXT_METRIC 0x80000000 + typedef struct _FONTGDI { FONTOBJ FontObj; + ULONG iUnique; + FLONG flType; + union{ + DHPDEV dhpdev; + FT_Face face; + }; + FLONG flRealizedType; LONG lMaxNegA; LONG lMaxNegC; @@ -76,7 +86,6 @@ TEXTMETRICW TextMetric; LPWSTR Filename; - FT_Face face; BYTE Underline; BYTE StrikeOut; } FONTGDI, *PFONTGDI; Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] Sun Nov 2 06:17:15 2008 @@ -94,6 +94,10 @@ DWORD FASTCALL ftGetFontLanguageInfo(PDC); INT FASTCALL ftGdiGetTextCharsetInfo(PDC,PFONTSIGNATURE,DWORD); DWORD FASTCALL ftGetFontUnicodeRanges(PFONTGDI, PGLYPHSET); +DWORD FASTCALL ftGdiGetFontData(PFONTGDI,DWORD,DWORD,PVOID,DWORD); +BOOL FASTCALL IntGdiGetFontResourceInfo(PUNICODE_STRING,PVOID,DWORD*,DWORD); +BOOL FASTCALL ftGdiRealizationInfo(PFONTGDI,PREALIZATION_INFO); +DWORD FASTCALL ftGdiGetKerningPairs(PFONTGDI,DWORD,LPKERNINGPAIR); #define IntLockProcessPrivateFonts(W32Process) \ ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&W32Process->PrivateFontListLock) Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] Sun Nov 2 06:17:15 2008 @@ -13,6 +13,48 @@ #define NDEBUG #include <debug.h> +/** Internal ******************************************************************/ + +INT +FASTCALL +FontGetObject(PTEXTOBJ TFont, INT Count, PVOID Buffer) +{ + if( Buffer == NULL ) return sizeof(LOGFONTW); + + switch (Count) + { + + case sizeof(ENUMLOGFONTEXDVW): + RtlCopyMemory( (LPENUMLOGFONTEXDVW) Buffer, + &TFont->logfont, + sizeof(ENUMLOGFONTEXDVW)); + break; + case sizeof(ENUMLOGFONTEXW): + RtlCopyMemory( (LPENUMLOGFONTEXW) Buffer, + &TFont->logfont.elfEnumLogfontEx, + sizeof(ENUMLOGFONTEXW)); + break; + + case sizeof(EXTLOGFONTW): + case sizeof(ENUMLOGFONTW): + RtlCopyMemory((LPENUMLOGFONTW) Buffer, + &TFont->logfont.elfEnumLogfontEx.elfLogFont, + sizeof(ENUMLOGFONTW)); + break; + + case sizeof(LOGFONTW): + RtlCopyMemory((LPLOGFONTW) Buffer, + &TFont->logfont.elfEnumLogfontEx.elfLogFont, + sizeof(LOGFONTW)); + break; + + default: + SetLastWin32Error(ERROR_BUFFER_OVERFLOW); + return 0; + } + return Count; +} + /** Functions ******************************************************************/ INT @@ -60,6 +102,66 @@ ExFreePool(SafeFileName.Buffer); return Ret; +} + +DWORD +STDCALL +NtGdiGetFontData( + HDC hDC, + DWORD Table, + DWORD Offset, + LPVOID Buffer, + DWORD Size) +{ + PDC Dc; + PDC_ATTR Dc_Attr; + HFONT hFont; + PTEXTOBJ TextObj; + PFONTGDI FontGdi; + DWORD Result = GDI_ERROR; + NTSTATUS Status = STATUS_SUCCESS; + + if (Buffer && Size) + { + _SEH_TRY + { + ProbeForRead(Buffer, Size, 1); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + } + + if (!NT_SUCCESS(Status)) return Result; + + Dc = DC_LockDc(hDC); + if (Dc == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return GDI_ERROR; + } + Dc_Attr = Dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; + + hFont = Dc_Attr->hlfntNew; + TextObj = TEXTOBJ_LockText(hFont); + DC_UnlockDc(Dc); + + if (TextObj == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return GDI_ERROR; + } + + FontGdi = ObjToGDI(TextObj->Font, FONT); + + Result = ftGdiGetFontData(FontGdi, Table, Offset, Buffer, Size); + + TEXTOBJ_UnlockText(TextObj); + + return Result; } /* @@ -298,6 +400,107 @@ return Size; } +W32KAPI +BOOL +APIENTRY +NtGdiGetFontResourceInfoInternalW( + IN LPWSTR pwszFiles, + IN ULONG cwc, + IN ULONG cFiles, + IN UINT cjIn, + OUT LPDWORD pdwBytes, + OUT LPVOID pvBuf, + IN DWORD dwType) +{ + NTSTATUS Status = STATUS_SUCCESS; + DWORD dwBytes; + UNICODE_STRING SafeFileNames; + BOOL bRet = FALSE; + ULONG cbStringSize; + + union + { + LOGFONTW logfontw; + WCHAR FullName[LF_FULLFACESIZE]; + } Buffer; + + /* FIXME: handle cFiles > 0 */ + + /* Check for valid dwType values + dwType == 4 seems to be handled by gdi32 only */ + if (dwType == 4 || dwType > 5) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* Allocate a safe unicode string buffer */ + cbStringSize = cwc * sizeof(WCHAR); + SafeFileNames.MaximumLength = SafeFileNames.Length = cbStringSize - sizeof(WCHAR); + SafeFileNames.Buffer = ExAllocatePoolWithTag(PagedPool, + cbStringSize, + TAG('R','T','S','U')); + if (!SafeFileNames.Buffer) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + /* Check buffers and copy pwszFiles to safe unicode string */ + _SEH_TRY + { + ProbeForRead(pwszFiles, cbStringSize, 1); + ProbeForWrite(pdwBytes, sizeof(DWORD), 1); + ProbeForWrite(pvBuf, cjIn, 1); + + RtlCopyMemory(SafeFileNames.Buffer, pwszFiles, cbStringSize); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + /* Free the string buffer for the safe filename */ + ExFreePool(SafeFileNames.Buffer); + return FALSE; + } + + /* Do the actual call */ + bRet = IntGdiGetFontResourceInfo(&SafeFileNames, &Buffer, &dwBytes, dwType); + + /* Check if succeeded and the buffer is big enough */ + if (bRet && cjIn >= dwBytes) + { + /* Copy the data back to caller */ + _SEH_TRY + { + /* Buffers are already probed */ + RtlCopyMemory(pvBuf, &Buffer, dwBytes); + *pdwBytes = dwBytes; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + bRet = FALSE; + } + } + + /* Free the string for the safe filenames */ + ExFreePool(SafeFileNames.Buffer); + + return bRet; +} + HFONT STDCALL NtGdiHfontCreate( Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Sun Nov 2 06:17:15 2008 @@ -40,6 +40,7 @@ #include <ft2build.h> #include FT_FREETYPE_H #include FT_GLYPH_H +#include FT_TYPE1_TABLES_H #include <freetype/tttables.h> #include <freetype/fttrigon.h> #include <freetype/ftglyph.h> @@ -103,7 +104,7 @@ }; /* - * For NtGdiTranslateCharsetInfo + * For TranslateCharsetInfo */ #define FS(x) {{0,0,0,0},{0x1<<(x),0}} #define MAXTCIINDEX 32 @@ -784,7 +785,14 @@ Otm->otmSize = Needed; - FillTM(&Otm->otmTextMetrics, FontGDI, pOS2, pHori, !Error ? &Win : 0); +// FillTM(&Otm->otmTextMetrics, FontGDI, pOS2, pHori, !Error ? &Win : 0); + if (!(FontGDI->flRealizedType & FDM_TYPE_TEXT_METRIC)) + { + FillTM(&FontGDI->TextMetric, FontGDI, pOS2, pHori, !Error ? &Win : 0); + FontGDI->flRealizedType |= FDM_TYPE_TEXT_METRIC; + } + + RtlCopyMemory(&Otm->otmTextMetrics, &FontGDI->TextMetric, sizeof(TEXTMETRICW)); Otm->otmFiller = 0; memcpy(&Otm->otmPanoseNumber, pOS2->panose, PANOSE_COUNT); @@ -1289,81 +1297,6 @@ return FALSE; } -int STDCALL -NtGdiGetFontFamilyInfo(HDC Dc, - LPLOGFONTW UnsafeLogFont, - PFONTFAMILYINFO UnsafeInfo, - DWORD Size) -{ - NTSTATUS Status; - LOGFONTW LogFont; - PFONTFAMILYINFO Info; - DWORD Count; - PW32PROCESS Win32Process; - - /* Make a safe copy */ - Status = MmCopyFromCaller(&LogFont, UnsafeLogFont, sizeof(LOGFONTW)); - if (! NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return -1; - } - - /* Allocate space for a safe copy */ - Info = ExAllocatePoolWithTag(PagedPool, Size * sizeof(FONTFAMILYINFO), TAG_GDITEXT); - if (NULL == Info) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return -1; - } - - /* Enumerate font families in the global list */ - IntLockGlobalFonts; - Count = 0; - if (! GetFontFamilyInfoForList(&LogFont, Info, &Count, Size, &FontListHead) ) - { - IntUnLockGlobalFonts; - ExFreePool(Info); - return -1; - } - IntUnLockGlobalFonts; - - /* Enumerate font families in the process local list */ - Win32Process = PsGetCurrentProcessWin32Process(); - IntLockProcessPrivateFonts(Win32Process); - if (! GetFontFamilyInfoForList(&LogFont, Info, &Count, Size, - &Win32Process->PrivateFontListHead)) - { - IntUnLockProcessPrivateFonts(Win32Process); - ExFreePool(Info); - return -1; - } - IntUnLockProcessPrivateFonts(Win32Process); - - /* Enumerate font families in the registry */ - if (! GetFontFamilyInfoForSubstitutes(&LogFont, Info, &Count, Size)) - { - ExFreePool(Info); - return -1; - } - - /* Return data to caller */ - if (0 != Count) - { - Status = MmCopyToCaller(UnsafeInfo, Info, - (Count < Size ? Count : Size) * sizeof(FONTFAMILYINFO)); - if (! NT_SUCCESS(Status)) - { - ExFreePool(Info); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return -1; - } - } - - ExFreePool(Info); - - return Count; -} FT_Glyph STDCALL ftGdiGlyphCacheGet( @@ -1468,1048 +1401,6 @@ return GlyphCopy; } -BOOL -APIENTRY -NtGdiExtTextOutW( - IN HDC hDC, - IN INT XStart, - IN INT YStart, - IN UINT fuOptions, - IN OPTIONAL LPRECT lprc, - IN LPWSTR UnsafeString, - IN INT Count, - IN OPTIONAL LPINT UnsafeDx, - IN DWORD dwCodePage) -{ - /* - * FIXME: - * Call EngTextOut, which does the real work (calling DrvTextOut where - * appropriate) - */ - - DC *dc; - PDC_ATTR Dc_Attr; - SURFOBJ *SurfObj; - BITMAPOBJ *BitmapObj = NULL; - int error, glyph_index, n, i; - FT_Face face; - FT_GlyphSlot glyph; - FT_Glyph realglyph; - FT_BitmapGlyph realglyph2; - LONGLONG TextLeft, RealXStart; - ULONG TextTop, previous, BackgroundLeft; - FT_Bool use_kerning; - RECTL DestRect, MaskRect, SpecifiedDestRect; - POINTL SourcePoint, BrushOrigin; - HBRUSH hBrushFg = NULL; - PGDIBRUSHOBJ BrushFg = NULL; - GDIBRUSHINST BrushFgInst; - HBRUSH hBrushBg = NULL; - PGDIBRUSHOBJ BrushBg = NULL; - GDIBRUSHINST BrushBgInst; - HBITMAP HSourceGlyph; - SURFOBJ *SourceGlyphSurf; - SIZEL bitSize; - FT_CharMap found = 0, charmap; - INT yoff; - FONTOBJ *FontObj; - PFONTGDI FontGDI; - PTEXTOBJ TextObj = NULL; - PPALGDI PalDestGDI; - XLATEOBJ *XlateObj=NULL, *XlateObj2=NULL; - ULONG Mode; - FT_Render_Mode RenderMode; - BOOLEAN Render; - NTSTATUS Status; - INT *Dx = NULL; - POINT Start; - BOOL DoBreak = FALSE; - LPCWSTR String, SafeString = NULL; - HPALETTE hDestPalette; - - // TODO: Write test-cases to exactly match real Windows in different - // bad parameters (e.g. does Windows check the DC or the RECT first?). - dc = DC_LockDc(hDC); - if (!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (dc->DC_Type == DC_TYPE_INFO) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - Dc_Attr = dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - - /* Check if String is valid */ - if ((Count > 0xFFFF) || (Count > 0 && UnsafeString == NULL)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - goto fail; - } - if (Count > 0) - { - SafeString = ExAllocatePoolWithTag(PagedPool, Count * sizeof(WCHAR), TAG_GDITEXT); - if (!SafeString) - { - goto fail; - } - Status = MmCopyFromCaller(SafeString, UnsafeString, Count * sizeof(WCHAR)); - if (! NT_SUCCESS(Status)) - { - goto fail; - } - } - String = SafeString; - - if (lprc && (fuOptions & (ETO_OPAQUE | ETO_CLIPPED))) - { - // At least one of the two flags were specified. Copy lprc. Once. - Status = MmCopyFromCaller(&SpecifiedDestRect, lprc, sizeof(RECT)); - if (!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - IntLPtoDP(dc, (POINT *) &SpecifiedDestRect, 2); - } - - if (NULL != UnsafeDx && Count > 0) - { - Dx = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), TAG_GDITEXT); - if (NULL == Dx) - { - goto fail; - } - Status = MmCopyFromCaller(Dx, UnsafeDx, Count * sizeof(INT)); - if (! NT_SUCCESS(Status)) - { - goto fail; - } - } - - BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); - if ( !BitmapObj ) - { - goto fail; - } - SurfObj = &BitmapObj->SurfObj; - ASSERT(SurfObj); - - Start.x = XStart; Start.y = YStart; - IntLPtoDP(dc, &Start, 1); - - RealXStart = (Start.x + dc->ptlDCOrig.x) << 6; - YStart = Start.y + dc->ptlDCOrig.y; - - /* Create the brushes */ - hDestPalette = BitmapObj->hDIBPalette; - if (!hDestPalette) hDestPalette = pPrimarySurface->DevInfo.hpalDefault; - PalDestGDI = PALETTE_LockPalette(hDestPalette); - if ( !PalDestGDI ) - Mode = PAL_RGB; - else - { - Mode = PalDestGDI->Mode; - PALETTE_UnlockPalette(PalDestGDI); - } - XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, hDestPalette, NULL); - if ( !XlateObj ) - { - goto fail; - } - hBrushFg = NtGdiCreateSolidBrush(XLATEOBJ_iXlate(XlateObj, Dc_Attr->crForegroundClr), 0); - if ( !hBrushFg ) - { - goto fail; - } - BrushFg = BRUSHOBJ_LockBrush(hBrushFg); - if ( !BrushFg ) - { - goto fail; - } - IntGdiInitBrushInstance(&BrushFgInst, BrushFg, NULL); - if ((fuOptions & ETO_OPAQUE) || Dc_Attr->jBkMode == OPAQUE) - { - hBrushBg = NtGdiCreateSolidBrush(XLATEOBJ_iXlate(XlateObj, Dc_Attr->crBackgroundClr), 0); - if ( !hBrushBg ) - { - goto fail; - } - BrushBg = BRUSHOBJ_LockBrush(hBrushBg); - if ( !BrushBg ) - { - goto fail; - } - IntGdiInitBrushInstance(&BrushBgInst, BrushBg, NULL); - } - XlateObj2 = (XLATEOBJ*)IntEngCreateXlate(PAL_RGB, Mode, NULL, hDestPalette); - if ( !XlateObj2 ) - { - goto fail; - } - - SourcePoint.x = 0; - SourcePoint.y = 0; - MaskRect.left = 0; - MaskRect.top = 0; - BrushOrigin.x = 0; - BrushOrigin.y = 0; - - if ((fuOptions & ETO_OPAQUE) && lprc) - { - DestRect.left = SpecifiedDestRect.left + dc->ptlDCOrig.x; - DestRect.top = SpecifiedDestRect.top + dc->ptlDCOrig.y; - DestRect.right = SpecifiedDestRect.right + dc->ptlDCOrig.x; - DestRect.bottom = SpecifiedDestRect.bottom + dc->ptlDCOrig.y; - IntLPtoDP(dc, (LPPOINT)&DestRect, 2); - IntEngBitBlt( - &BitmapObj->SurfObj, - NULL, - NULL, - dc->CombinedClip, - NULL, - &DestRect, - &SourcePoint, - &SourcePoint, - &BrushBgInst.BrushObject, - &BrushOrigin, - ROP3_TO_ROP4(PATCOPY)); - fuOptions &= ~ETO_OPAQUE; - } - else - { - if (Dc_Attr->jBkMode == OPAQUE) - { - fuOptions |= ETO_OPAQUE; - } - } - - TextObj = TEXTOBJ_LockText(Dc_Attr->hlfntNew); - if(TextObj == NULL) - { - goto fail; - } - - FontObj = TextObj->Font; - ASSERT(FontObj); - FontGDI = ObjToGDI(FontObj, FONT); - ASSERT(FontGDI); - - IntLockFreeType; - face = FontGDI->face; - if (face->charmap == NULL) - { - DPRINT("WARNING: No charmap selected!\n"); - DPRINT("This font face has %d charmaps\n", face->num_charmaps); - - for (n = 0; n < face->num_charmaps; n++) - { - charmap = face->charmaps[n]; - DPRINT("found charmap encoding: %u\n", charmap->encoding); - if (charmap->encoding != 0) - { - found = charmap; - break; - } - } - if (!found) - { - DPRINT1("WARNING: Could not find desired charmap!\n"); - } - error = FT_Set_Charmap(face, found); - if (error) - { - DPRINT1("WARNING: Could not set the charmap!\n"); - } - } - - Render = IntIsFontRenderingEnabled(); - if (Render) - RenderMode = IntGetFontRenderMode(&TextObj->logfont.elfEnumLogfontEx.elfLogFont); - else - RenderMode = FT_RENDER_MODE_MONO; - - error = FT_Set_Pixel_Sizes( - face, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, - /* FIXME should set character height if neg */ - (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); - if (error) - { - DPRINT1("Error in setting pixel sizes: %u\n", error); - IntUnLockFreeType; - goto fail; - } - - /* - * Process the vertical alignment and determine the yoff. - */ - - if (Dc_Attr->lTextAlign & TA_BASELINE) - yoff = 0; - else if (Dc_Attr->lTextAlign & TA_BOTTOM) - yoff = -face->size->metrics.descender >> 6; - else /* TA_TOP */ - yoff = face->size->metrics.ascender >> 6; - - use_kerning = FT_HAS_KERNING(face); - previous = 0; - - /* - * Process the horizontal alignment and modify XStart accordingly. - */ - - if (Dc_Attr->lTextAlign & (TA_RIGHT | TA_CENTER)) - { - ULONGLONG TextWidth = 0; - LPCWSTR TempText = String; - int Start; - - /* - * Calculate width of the text. - */ - - if (NULL != Dx) - { - Start = Count < 2 ? 0 : Count - 2; - TextWidth = Count < 2 ? 0 : (Dx[Count - 2] << 6); - } - else - { - Start = 0; - } - TempText = String + Start; - - for (i = Start; i < Count; i++) - { - if (fuOptions & ETO_GLYPH_INDEX) - glyph_index = *TempText; - else - glyph_index = FT_Get_Char_Index(face, *TempText); - - if (!(realglyph = ftGdiGlyphCacheGet(face, glyph_index, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) - { - error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); - if (error) - { - DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); - } - - glyph = face->glyph; - realglyph = ftGdiGlyphCacheSet(face, glyph_index, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, glyph, RenderMode); - if (!realglyph) - { - DPRINT1("Failed to render glyph! [index: %u]\n", glyph_index); - IntUnLockFreeType; - goto fail; - } - - } - /* retrieve kerning distance */ - if (use_kerning && previous && glyph_index) - { - FT_Vector delta; - FT_Get_Kerning(face, previous, glyph_index, 0, &delta); - TextWidth += delta.x; - } - - TextWidth += realglyph->advance.x >> 10; - - previous = glyph_index; - TempText++; - } - - previous = 0; - - if (Dc_Attr->lTextAlign & TA_RIGHT) - { - RealXStart -= TextWidth; - } - else - { - RealXStart -= TextWidth / 2; - } - } - - TextLeft = RealXStart; - TextTop = YStart; - BackgroundLeft = (RealXStart + 32) >> 6; - - /* - * The main rendering loop. - */ - - for (i = 0; i < Count; i++) - { - if (fuOptions & ETO_GLYPH_INDEX) - glyph_index = *String; - else - glyph_index = FT_Get_Char_Index(face, *String); - - if (!(realglyph = ftGdiGlyphCacheGet(face, glyph_index, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) - { - error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); - if (error) - { - DPRINT1("Failed to load and render glyph! [index: %u]\n", glyph_index); - IntUnLockFreeType; - goto fail; - } - glyph = face->glyph; - realglyph = ftGdiGlyphCacheSet(face, - glyph_index, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, - glyph, - RenderMode); - if (!realglyph) - { - DPRINT1("Failed to render glyph! [index: %u]\n", glyph_index); - IntUnLockFreeType; - goto fail; - } - } -// DbgPrint("realglyph: %x\n", realglyph); -// DbgPrint("TextLeft: %d\n", TextLeft); - - /* retrieve kerning distance and move pen position */ - if (use_kerning && previous && glyph_index && NULL == Dx) - { - FT_Vector delta; - FT_Get_Kerning(face, previous, glyph_index, 0, &delta); - TextLeft += delta.x; - } -// DPRINT1("TextLeft: %d\n", TextLeft); -// DPRINT1("TextTop: %d\n", TextTop); - - if (realglyph->format == ft_glyph_format_outline) - { - DbgPrint("Should already be done\n"); -// error = FT_Render_Glyph(glyph, RenderMode); - error = FT_Glyph_To_Bitmap(&realglyph, RenderMode, 0, 0); - if (error) - { - DPRINT1("WARNING: Failed to render glyph!\n"); - goto fail; - } - } - realglyph2 = (FT_BitmapGlyph)realglyph; - -// DPRINT1("Pitch: %d\n", pitch); -// DPRINT1("Advance: %d\n", realglyph->advance.x); - - if (fuOptions & ETO_OPAQUE) - { - DestRect.left = BackgroundLeft; - DestRect.right = (TextLeft + (realglyph->advance.x >> 10) + 32) >> 6; - DestRect.top = TextTop + yoff - ((face->size->metrics.ascender + 32) >> 6); - DestRect.bottom = TextTop + yoff + ((32 - face->size->metrics.descender) >> 6); - IntEngBitBlt( - &BitmapObj->SurfObj, - NULL, - NULL, - dc->CombinedClip, - NULL, - &DestRect, - &SourcePoint, - &SourcePoint, - &BrushBgInst.BrushObject, - &BrushOrigin, - ROP3_TO_ROP4(PATCOPY)); - BackgroundLeft = DestRect.right; - } - - DestRect.left = ((TextLeft + 32) >> 6) + realglyph2->left; - DestRect.right = DestRect.left + realglyph2->bitmap.width; - DestRect.top = TextTop + yoff - realglyph2->top; - DestRect.bottom = DestRect.top + realglyph2->bitmap.rows; - - bitSize.cx = realglyph2->bitmap.width; - bitSize.cy = realglyph2->bitmap.rows; - MaskRect.right = realglyph2->bitmap.width; - MaskRect.bottom = realglyph2->bitmap.rows; - - /* - * We should create the bitmap out of the loop at the biggest possible - * glyph size. Then use memset with 0 to clear it and sourcerect to - * limit the work of the transbitblt. - * - * FIXME: DIB bitmaps should have an lDelta which is a multiple of 4. - * Here we pass in the pitch from the FreeType bitmap, which is not - * guaranteed to be a multiple of 4. If it's not, we should expand - * the FreeType bitmap to a temporary bitmap. - */ - - HSourceGlyph = EngCreateBitmap(bitSize, realglyph2->bitmap.pitch, - (realglyph2->bitmap.pixel_mode == ft_pixel_mode_grays) ? - BMF_8BPP : BMF_1BPP, BMF_TOPDOWN, - realglyph2->bitmap.buffer); - if ( !HSourceGlyph ) - { - DPRINT1("WARNING: EngLockSurface() failed!\n"); - // FT_Done_Glyph(realglyph); - IntUnLockFreeType; - goto fail; - } - SourceGlyphSurf = EngLockSurface((HSURF)HSourceGlyph); - if ( !SourceGlyphSurf ) - { - EngDeleteSurface((HSURF)HSourceGlyph); - DPRINT1("WARNING: EngLockSurface() failed!\n"); - IntUnLockFreeType; - goto fail; - } - - /* - * Use the font data as a mask to paint onto the DCs surface using a - * brush. - */ - - if (lprc && - (fuOptions & ETO_CLIPPED) && - DestRect.right >= SpecifiedDestRect.right + dc->ptlDCOrig.x) - { - // We do the check '>=' instead of '>' to possibly save an iteration - // through this loop, since it's breaking after the drawing is done, - // and x is always incremented. - DestRect.right = SpecifiedDestRect.right + dc->ptlDCOrig.x; - DoBreak = TRUE; - } - - IntEngMaskBlt( - SurfObj, - SourceGlyphSurf, - dc->CombinedClip, - XlateObj, - XlateObj2, - &DestRect, - &SourcePoint, - (PPOINTL)&MaskRect, - &BrushFgInst.BrushObject, - &BrushOrigin); - - EngUnlockSurface(SourceGlyphSurf); - EngDeleteSurface((HSURF)HSourceGlyph); - - if (DoBreak) - { - break; - } - - if (NULL == Dx) - { - TextLeft += realglyph->advance.x >> 10; -// DbgPrint("new TextLeft: %d\n", TextLeft); - } - else - { - TextLeft += Dx[i] << 6; -// DbgPrint("new TextLeft2: %d\n", TextLeft); - } - previous = glyph_index; - - String++; - } - - IntUnLockFreeType; - - EngDeleteXlate(XlateObj); - EngDeleteXlate(XlateObj2); - BITMAPOBJ_UnlockBitmap(BitmapObj); - if(TextObj != NULL) - TEXTOBJ_UnlockText(TextObj); - if (hBrushBg != NULL) - { - BRUSHOBJ_UnlockBrush(BrushBg); - NtGdiDeleteObject(hBrushBg); - } - BRUSHOBJ_UnlockBrush(BrushFg); - NtGdiDeleteObject(hBrushFg); - if (NULL != SafeString) - { - ExFreePool((void*)SafeString); - } - if (NULL != Dx) - { - ExFreePool(Dx); - } - DC_UnlockDc( dc ); - - return TRUE; - -fail: - if ( XlateObj2 != NULL ) - EngDeleteXlate(XlateObj2); - if ( XlateObj != NULL ) - EngDeleteXlate(XlateObj); - if(TextObj != NULL) - TEXTOBJ_UnlockText(TextObj); - if (BitmapObj != NULL) - BITMAPOBJ_UnlockBitmap(BitmapObj); - if (hBrushBg != NULL) - { - BRUSHOBJ_UnlockBrush(BrushBg); - NtGdiDeleteObject(hBrushBg); - } - if (hBrushFg != NULL) - { - BRUSHOBJ_UnlockBrush(BrushFg); - NtGdiDeleteObject(hBrushFg); - } - if (NULL != SafeString) - { - ExFreePool((void*)SafeString); - } - if (NULL != Dx) - { - ExFreePool(Dx); - } - DC_UnlockDc(dc); - - return FALSE; -} - - /* - * @implemented - */ -BOOL -STDCALL -NtGdiGetCharABCWidthsW( - IN HDC hDC, - IN UINT FirstChar, - IN ULONG Count, - IN OPTIONAL PWCHAR pwch, - IN FLONG fl, - OUT PVOID Buffer) -{ - LPABC SafeBuff; - LPABCFLOAT SafeBuffF = NULL; - PDC dc; - PDC_ATTR Dc_Attr; - PTEXTOBJ TextObj; - PFONTGDI FontGDI; - FT_Face face; - FT_CharMap charmap, found = NULL; - UINT i, glyph_index, BufferSize; - HFONT hFont = 0; - NTSTATUS Status = STATUS_SUCCESS; - - if(pwch) - { - _SEH_TRY - { - ProbeForRead(pwch, - sizeof(PWSTR), - 1); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - if (!NT_SUCCESS(Status)) - { - SetLastWin32Error(Status); - return FALSE; - } - - BufferSize = Count * sizeof(ABC); // Same size! - SafeBuff = ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_GDITEXT); - if (!fl) SafeBuffF = (LPABCFLOAT) SafeBuff; - if (SafeBuff == NULL) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - dc = DC_LockDc(hDC); - if (dc == NULL) - { - ExFreePool(SafeBuff); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - Dc_Attr = dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - hFont = Dc_Attr->hlfntNew; - TextObj = TEXTOBJ_LockText(hFont); - DC_UnlockDc(dc); - - if (TextObj == NULL) - { - ExFreePool(SafeBuff); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - - FontGDI = ObjToGDI(TextObj->Font, FONT); - - face = FontGDI->face; - if (face->charmap == NULL) - { - for (i = 0; i < face->num_charmaps; i++) - { - charmap = face->charmaps[i]; - if (charmap->encoding != 0) - { - found = charmap; - break; - } - } - - if (!found) - { - DPRINT1("WARNING: Could not find desired charmap!\n"); - ExFreePool(SafeBuff); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - - IntLockFreeType; - FT_Set_Charmap(face, found); - IntUnLockFreeType; - } - - IntLockFreeType; - FT_Set_Pixel_Sizes(face, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, - /* FIXME should set character height if neg */ - (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); - - for (i = FirstChar; i < FirstChar+Count; i++) - { - int adv, lsb, bbx, left, right; - - if (pwch) - { - if (fl & GCABCW_INDICES) - glyph_index = pwch[i - FirstChar]; - else - glyph_index = FT_Get_Char_Index(face, pwch[i - FirstChar]); - } - else - { - if (fl & GCABCW_INDICES) - glyph_index = i; - else - glyph_index = FT_Get_Char_Index(face, i); - } - FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); - - left = (INT)face->glyph->metrics.horiBearingX & -64; - right = (INT)((face->glyph->metrics.horiBearingX + face->glyph->metrics.width) + 63) & -64; - adv = (face->glyph->advance.x + 32) >> 6; - -// int test = (INT)(face->glyph->metrics.horiAdvance + 63) >> 6; -// DPRINT1("Advance Wine %d and Advance Ros %d\n",test, adv ); /* It's the same!*/ - - lsb = left >> 6; - bbx = (right - left) >> 6; -/* - DPRINT1("lsb %d and bbx %d\n", lsb, bbx ); - */ - if (!fl) - { - SafeBuffF[i - FirstChar].abcfA = (FLOAT) lsb; - SafeBuffF[i - FirstChar].abcfB = (FLOAT) bbx; - SafeBuffF[i - FirstChar].abcfC = (FLOAT) (adv - lsb - bbx); - } - else - { - SafeBuff[i - FirstChar].abcA = lsb; - SafeBuff[i - FirstChar].abcB = bbx; - SafeBuff[i - FirstChar].abcC = adv - lsb - bbx; - } - } - IntUnLockFreeType; - TEXTOBJ_UnlockText(TextObj); - Status = MmCopyToCaller(Buffer, SafeBuff, BufferSize); - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - ExFreePool(SafeBuff); - return FALSE; - } - ExFreePool(SafeBuff); - DPRINT("NtGdiGetCharABCWidths Worked!\n"); - return TRUE; -} - - /* - * @implemented - */ -BOOL -STDCALL -NtGdiGetCharWidthW( - IN HDC hDC, - IN UINT FirstChar, - IN UINT Count, - IN OPTIONAL PWCHAR pwc, - IN FLONG fl, - OUT PVOID Buffer) -{ - NTSTATUS Status = STATUS_SUCCESS; - LPINT SafeBuff; - PFLOAT SafeBuffF = NULL; - PDC dc; - PDC_ATTR Dc_Attr; - PTEXTOBJ TextObj; - PFONTGDI FontGDI; - FT_Face face; - FT_CharMap charmap, found = NULL; - UINT i, glyph_index, BufferSize; - HFONT hFont = 0; - - if(pwc) - { - _SEH_TRY - { - ProbeForRead(pwc, - sizeof(PWSTR), - 1); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - if (!NT_SUCCESS(Status)) - { - SetLastWin32Error(Status); - return FALSE; - } - - BufferSize = Count * sizeof(INT); // Same size! - SafeBuff = ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_GDITEXT); - if (!fl) SafeBuffF = (PFLOAT) SafeBuff; - if (SafeBuff == NULL) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - dc = DC_LockDc(hDC); - if (dc == NULL) - { - ExFreePool(SafeBuff); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - Dc_Attr = dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - hFont = Dc_Attr->hlfntNew; - TextObj = TEXTOBJ_LockText(hFont); - DC_UnlockDc(dc); - - if (TextObj == NULL) - { - ExFreePool(SafeBuff); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - - FontGDI = ObjToGDI(TextObj->Font, FONT); - - face = FontGDI->face; - if (face->charmap == NULL) - { - for (i = 0; i < face->num_charmaps; i++) - { - charmap = face->charmaps[i]; - if (charmap->encoding != 0) - { - found = charmap; - break; - } - } - - if (!found) - { - DPRINT1("WARNING: Could not find desired charmap!\n"); - ExFreePool(SafeBuff); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - - IntLockFreeType; - FT_Set_Charmap(face, found); - IntUnLockFreeType; - } - - IntLockFreeType; - FT_Set_Pixel_Sizes(face, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, - /* FIXME should set character height if neg */ - (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); - - for (i = FirstChar; i < FirstChar+Count; i++) - { - if (pwc) - { - if (fl & GCW_INDICES) - glyph_index = pwc[i - FirstChar]; - else - glyph_index = FT_Get_Char_Index(face, pwc[i - FirstChar]); - } - else - { - if (fl & GCW_INDICES) - glyph_index = i; - else - glyph_index = FT_Get_Char_Index(face, i); - } - FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); - if (!fl) - SafeBuffF[i - FirstChar] = (FLOAT) ((face->glyph->advance.x + 32) >> 6); - else - SafeBuff[i - FirstChar] = (face->glyph->advance.x + 32) >> 6; - } - IntUnLockFreeType; - TEXTOBJ_UnlockText(TextObj); - MmCopyToCaller(Buffer, SafeBuff, BufferSize); - ExFreePool(SafeBuff); - return TRUE; -} - - - /* - * @implemented - */ -DWORD -STDCALL -NtGdiGetGlyphIndicesW( - IN HDC hdc, - IN OPTIONAL LPWSTR UnSafepwc, - IN INT cwc, - OUT OPTIONAL LPWORD UnSafepgi, - IN DWORD iMode) -{ - PDC dc; - PDC_ATTR Dc_Attr; - PTEXTOBJ TextObj; - PFONTGDI FontGDI; - HFONT hFont = 0; - NTSTATUS Status = STATUS_SUCCESS; - OUTLINETEXTMETRICW *potm; - INT i; - FT_Face face; - WCHAR DefChar = 0xffff; - PWSTR Buffer = NULL; - ULONG Size; - - if ((!UnSafepwc) && (!UnSafepgi)) return cwc; - - dc = DC_LockDc(hdc); - if (!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return GDI_ERROR; - } - Dc_Attr = dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - hFont = Dc_Attr->hlfntNew; - TextObj = TEXTOBJ_LockText(hFont); - DC_UnlockDc(dc); - if (!TextObj) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return GDI_ERROR; - } - - FontGDI = ObjToGDI(TextObj->Font, FONT); - TEXTOBJ_UnlockText(TextObj); - - Buffer = ExAllocatePoolWithTag(PagedPool, cwc*sizeof(WORD), TAG_GDITEXT); - if (!Buffer) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return GDI_ERROR; - } - - if (iMode & GGI_MARK_NONEXISTING_GLYPHS) DefChar = 0x001f; /* Indicate non existence */ - else - { - Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); - potm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); - if (!potm) - { - Status = ERROR_NOT_ENOUGH_MEMORY; - goto ErrorRet; - } - IntGetOutlineTextMetrics(FontGDI, Size, potm); - DefChar = potm->otmTextMetrics.tmDefaultChar; // May need this. - ExFreePool(potm); - } - - _SEH_TRY - { - ProbeForRead(UnSafepwc, - sizeof(PWSTR), - 1); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) goto ErrorRet; - - IntLockFreeType; - face = FontGDI->face; - - for (i = 0; i < cwc; i++) - { - Buffer[i] = FT_Get_Char_Index(face, UnSafepwc[i]); - if (Buffer[i] == 0) - { - if (DefChar == 0xffff && FT_IS_SFNT(face)) - { - TT_OS2 *pOS2 = FT_Get_Sfnt_Table(face, ft_sfnt_os2); - DefChar = (pOS2->usDefaultChar ? FT_Get_Char_Index(face, pOS2->usDefaultChar) : 0); - } - Buffer[i] = DefChar; - } - } - - IntUnLockFreeType; - - _SEH_TRY - { - ProbeForWrite(UnSafepgi, - sizeof(WORD), - 1); - RtlCopyMemory(UnSafepgi, - Buffer, - cwc*sizeof(WORD)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - -ErrorRet: - ExFreePoolWithTag(Buffer, TAG_GDITEXT); - if (NT_SUCCESS(Status)) return cwc; - SetLastWin32Error(Status); - return GDI_ERROR; -} static void @@ -3595,11 +2486,8 @@ } else { - memcpy(&ptmwi->TextMetric, &FontGDI->TextMetric, sizeof(TEXTMETRICW)); - /* FIXME: Fill Diff member */ - RtlZeroMemory(&ptmwi->Diff, sizeof(ptmwi->Diff)); - Status = STATUS_SUCCESS; + IntLockFreeType; pOS2 = FT_Get_Sfnt_Table(FontGDI->face, ft_sfnt_os2); if (NULL == pOS2) @@ -3621,7 +2509,15 @@ if (NT_SUCCESS(Status)) { - FillTM(&ptmwi->TextMetric, FontGDI, pOS2, pHori, !Error ? &Win : 0); + if (!(FontGDI->flRealizedType & FDM_TYPE_TEXT_METRIC)) + { + FillTM(&FontGDI->TextMetric, FontGDI, pOS2, pHori, !Error ? &Win : 0); + FontGDI->flRealizedType |= FDM_TYPE_TEXT_METRIC; + } + + RtlCopyMemory(&ptmwi->TextMetric, &FontGDI->TextMetric, sizeof(TEXTMETRICW)); + /* FIXME: Fill Diff member */ + RtlZeroMemory(&ptmwi->Diff, sizeof(ptmwi->Diff)); } } TEXTOBJ_UnlockText(TextObj); @@ -3641,61 +2537,43 @@ } -DWORD STDCALL -NtGdiGetFontData( - HDC hDC, +DWORD +FASTCALL +ftGdiGetFontData( + PFONTGDI FontGdi, DWORD Table, DWORD Offset, - LPVOID Buffer, + PVOID Buffer, DWORD Size) { - PDC Dc; - PDC_ATTR Dc_Attr; - HFONT hFont; - PTEXTOBJ TextObj; - PFONTGDI FontGdi; - DWORD Result = GDI_ERROR; - - Dc = DC_LockDc(hDC); - if (Dc == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return GDI_ERROR; - } - Dc_Attr = Dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; - hFont = Dc_Attr->hlfntNew; - TextObj = TEXTOBJ_LockText(hFont); - DC_UnlockDc(Dc); - - if (TextObj == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return GDI_ERROR; - } - - FontGdi = ObjToGDI(TextObj->Font, FONT); - - IntLockFreeType; - - if (FT_IS_SFNT(FontGdi->face)) - { - if (Table) - Table = Table >> 24 | Table << 24 | (Table >> 8 & 0xFF00) | + DWORD Result = GDI_ERROR; + + IntLockFreeType; + + if (FT_IS_SFNT(FontGdi->face)) + { + if (Table) + Table = Table >> 24 | Table << 24 | (Table >> 8 & 0xFF00) | (Table << 8 & 0xFF0000); - if (Buffer == NULL) - Size = 0; - - if (!FT_Load_Sfnt_Table(FontGdi->face, Table, Offset, Buffer, &Size)) - Result = Size; - } - - IntUnLockFreeType; - - TEXTOBJ_UnlockText(TextObj); - - return Result; + if (!Buffer) Size = 0; + + if (Buffer && Size) + { + FT_Error Error; + FT_ULong Needed = 0; + + Error = FT_Load_Sfnt_Table(FontGdi->face, Table, Offset, NULL, &Needed); + + if( !Error && Needed < Size) Size = Needed; + } + if (!FT_Load_Sfnt_Table(FontGdi->face, Table, Offset, Buffer, &Size)) + Result = Size; + } + + IntUnLockFreeType; + + return Result; } static UINT FASTCALL @@ -3838,7 +2716,33 @@ } } -NTSTATUS FASTCALL +static +VOID +FASTCALL +IntFontType(PFONTGDI Font) +{ + PS_FontInfoRec psfInfo; + + if (FT_HAS_MULTIPLE_MASTERS(Font->face)) + Font->FontObj.flFontType |= FO_MULTIPLEMASTER; + if (FT_HAS_VERTICAL( Font->face )) + Font->FontObj.flFontType |= FO_VERT_FACE; + if (FT_IS_SCALABLE( Font->face )) + Font->FontObj.flFontType |= FO_TYPE_RASTER; + if (FT_IS_SFNT(Font->face)) + { + Font->FontObj.flFontType |= FO_TYPE_TRUETYPE; + if (FT_Get_Sfnt_Table(Font->face, ft_sfnt_post)) + Font->FontObj.flFontType |= FO_POSTSCRIPT; + } + if (!FT_Get_PS_Font_Info(Font->face, &psfInfo )) + { + Font->FontObj.flFontType |= FO_POSTSCRIPT; + } +} + +NTSTATUS +FASTCALL TextIntRealizeFont(HFONT FontHandle) { NTSTATUS Status = STATUS_SUCCESS; @@ -3891,7 +2795,12 @@ else { PFONTGDI FontGdi = ObjToGDI(TextObj->Font, FONT); + // Need hdev, when freetype is loaded need to create DEVOBJ for + // Consumer and Producer. TextObj->Font->iUniq = 1; // Now it can be cached. + IntFontType(FontGdi); + FontGdi->flType = TextObj->Font->flFontType; + FontGdi->flRealizedType = 0; FontGdi->Underline = TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfUnderline ? 0xff : 0; FontGdi->StrikeOut = TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfStrikeOut ? 0xff : 0; TextObj->Initialized = TRUE; @@ -3906,47 +2815,10 @@ return Status; } -INT FASTCALL -FontGetObject(PTEXTOBJ TFont, INT Count, PVOID Buffer) -{ - if( Buffer == NULL ) return sizeof(LOGFONTW); - - switch (Count) - { - - case sizeof(ENUMLOGFONTEXDVW): - RtlCopyMemory( (LPENUMLOGFONTEXDVW) Buffer, - &TFont->logfont, - sizeof(ENUMLOGFONTEXDVW)); - break; - case sizeof(ENUMLOGFONTEXW): - RtlCopyMemory( (LPENUMLOGFONTEXW) Buffer, - &TFont->logfont.elfEnumLogfontEx, - sizeof(ENUMLOGFONTEXW)); - break; - - case sizeof(EXTLOGFONTW): - case sizeof(ENUMLOGFONTW): - RtlCopyMemory((LPENUMLOGFONTW) Buffer, - &TFont->logfont.elfEnumLogfontEx.elfLogFont, - sizeof(ENUMLOGFONTW)); - break; - - case sizeof(LOGFONTW): - RtlCopyMemory((LPLOGFONTW) Buffer, - &TFont->logfont.elfEnumLogfontEx.elfLogFont, - sizeof(LOGFONTW)); - break; - - default: - SetLastWin32Error(ERROR_BUFFER_OVERFLOW); - return 0; - } - return Count; -} - - -static BOOL FASTCALL + +static +BOOL +FASTCALL IntGetFullFileName( POBJECT_NAME_INFORMATION NameInfo, ULONG Size, @@ -3989,12 +2861,13 @@ return TRUE; } -static BOOL FASTCALL +BOOL +FASTCALL IntGdiGetFontResourceInfo( - IN PUNICODE_STRING FileName, - OUT void *pBuffer, - OUT DWORD *pdwBytes, - IN DWORD dwType) + PUNICODE_STRING FileName, + PVOID pBuffer, + DWORD *pdwBytes, + DWORD dwType) { UNICODE_STRING EntryFileName; POBJECT_NAME_INFORMATION NameInfo1, NameInfo2; @@ -4102,103 +2975,1194 @@ return TRUE; } -W32KAPI BOOL APIENTRY -NtGdiGetFontResourceInfoInternalW( - IN LPWSTR pwszFiles, - IN ULONG cwc, - IN ULONG cFiles, - IN UINT cjIn, - OUT LPDWORD pdwBytes, - OUT LPVOID pvBuf, - IN DWORD dwType) -{ - NTSTATUS Status = STATUS_SUCCESS; - DWORD dwBytes; - UNICODE_STRING SafeFileNames; - BOOL bRet = FALSE; - ULONG cbStringSize; - - union - { - LOGFONTW logfontw; - WCHAR FullName[LF_FULLFACESIZE]; - } Buffer; - - /* FIXME: handle cFiles > 0 */ - - /* Check for valid dwType values - dwType == 4 seems to be handled by gdi32 only */ - if (dwType == 4 || dwType > 5) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - /* Allocate a safe unicode string buffer */ - cbStringSize = cwc * sizeof(WCHAR); - SafeFileNames.MaximumLength = SafeFileNames.Length = cbStringSize - sizeof(WCHAR); - SafeFileNames.Buffer = ExAllocatePoolWithTag(PagedPool, - cbStringSize, - TAG('R','T','S','U')); - if (!SafeFileNames.Buffer) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - /* Check buffers and copy pwszFiles to safe unicode string */ - _SEH_TRY - { - ProbeForRead(pwszFiles, cbStringSize, 1); - ProbeForWrite(pdwBytes, sizeof(DWORD), 1); - ProbeForWrite(pvBuf, cjIn, 1); - - RtlCopyMemory(SafeFileNames.Buffer, pwszFiles, cbStringSize); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END - - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - /* Free the string buffer for the safe filename */ - ExFreePool(SafeFileNames.Buffer); - return FALSE; - } - - /* Do the actual call */ - bRet = IntGdiGetFontResourceInfo(&SafeFileNames, &Buffer, &dwBytes, dwType); - - /* Check if succeeded and the buffer is big enough */ - if (bRet && cjIn >= dwBytes) - { - /* Copy the data back to caller */ - _SEH_TRY + +BOOL +FASTCALL +ftGdiRealizationInfo(PFONTGDI Font, PREALIZATION_INFO Info) +{ + if (FT_HAS_FIXED_SIZES(Font->face)) + Info->iTechnology = RI_TECH_BITMAP; + else + { + if (FT_IS_SCALABLE(Font->face)) + Info->iTechnology = RI_TECH_SCALABLE; + else + Info->iTechnology = RI_TECH_FIXED; + } + Info->iUniq = Font->FontObj.iUniq; + Info->dwUnknown = -1; + return TRUE; +} + +DWORD +FASTCALL +ftGdiGetKerningPairs( PFONTGDI Font, + DWORD cPairs, + LPKERNINGPAIR pKerningPair) +{ + DWORD Count = 0; + FT_Face face; + + face = Font->face; + + if (FT_HAS_KERNING(face) && face->charmap->encoding == FT_ENCODING_UNICODE) + { + FT_UInt previous_index = 0, glyph_index = 0; + FT_ULong char_code, char_previous; + FT_Vector delta; + int i; + + char_previous = char_code = FT_Get_First_Char(face, &glyph_index); + + IntUnLockFreeType; + + for (i = 0; i < face->num_glyphs; i++) + { + if (previous_index && glyph_index) + { + FT_Get_Kerning(face, previous_index, glyph_index, FT_KERNING_DEFAULT, &delta); + + if (pKerningPair && cPairs) + { + pKerningPair[i].wFirst = char_previous; + pKerningPair[i].wSecond = char_code; + pKerningPair[i].iKernAmount = delta.x; + } + Count++; + } + previous_index = glyph_index; + char_previous = char_code; + char_code = FT_Get_Next_Char(face, char_code, &glyph_index); + } + IntUnLockFreeType; + } + return Count; +} + + +//////////////// +// +// Functions needing sorting. +// +/////////////// +int STDCALL +NtGdiGetFontFamilyInfo(HDC Dc, + LPLOGFONTW UnsafeLogFont, + PFONTFAMILYINFO UnsafeInfo, + DWORD Size) +{ + NTSTATUS Status; + LOGFONTW LogFont; + PFONTFAMILYINFO Info; + DWORD Count; + PW32PROCESS Win32Process; + + /* Make a safe copy */ + Status = MmCopyFromCaller(&LogFont, UnsafeLogFont, sizeof(LOGFONTW)); + if (! NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return -1; + } + + /* Allocate space for a safe copy */ + Info = ExAllocatePoolWithTag(PagedPool, Size * sizeof(FONTFAMILYINFO), TAG_GDITEXT); + if (NULL == Info) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return -1; + } + + /* Enumerate font families in the global list */ + IntLockGlobalFonts; + Count = 0; + if (! GetFontFamilyInfoForList(&LogFont, Info, &Count, Size, &FontListHead) ) + { + IntUnLockGlobalFonts; + ExFreePool(Info); + return -1; + } + IntUnLockGlobalFonts; + + /* Enumerate font families in the process local list */ + Win32Process = PsGetCurrentProcessWin32Process(); + IntLockProcessPrivateFonts(Win32Process); + if (! GetFontFamilyInfoForList(&LogFont, Info, &Count, Size, + &Win32Process->PrivateFontListHead)) + { + IntUnLockProcessPrivateFonts(Win32Process); + ExFreePool(Info); + return -1; + } + IntUnLockProcessPrivateFonts(Win32Process); + + /* Enumerate font families in the registry */ + if (! GetFontFamilyInfoForSubstitutes(&LogFont, Info, &Count, Size)) + { + ExFreePool(Info); + return -1; + } + + /* Return data to caller */ + if (0 != Count) + { + Status = MmCopyToCaller(UnsafeInfo, Info, + (Count < Size ? Count : Size) * sizeof(FONTFAMILYINFO)); + if (! NT_SUCCESS(Status)) { - /* Buffers are already probed */ - RtlCopyMemory(pvBuf, &Buffer, dwBytes); - *pdwBytes = dwBytes; + ExFreePool(Info); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return -1; } - _SEH_HANDLE + } + + ExFreePool(Info); + + return Count; +} + +BOOL +APIENTRY +NtGdiExtTextOutW( + IN HDC hDC, + IN INT XStart, + IN INT YStart, + IN UINT fuOptions, + IN OPTIONAL LPRECT lprc, + IN LPWSTR UnsafeString, + IN INT Count, + IN OPTIONAL LPINT UnsafeDx, + IN DWORD dwCodePage) +{ + /* + * FIXME: + * Call EngTextOut, which does the real work (calling DrvTextOut where + * appropriate) + */ + + DC *dc; + PDC_ATTR Dc_Attr; + SURFOBJ *SurfObj; + BITMAPOBJ *BitmapObj = NULL; + int error, glyph_index, n, i; + FT_Face face; + FT_GlyphSlot glyph; + FT_Glyph realglyph; + FT_BitmapGlyph realglyph2; + LONGLONG TextLeft, RealXStart; + ULONG TextTop, previous, BackgroundLeft; + FT_Bool use_kerning; + RECTL DestRect, MaskRect, SpecifiedDestRect; + POINTL SourcePoint, BrushOrigin; + HBRUSH hBrushFg = NULL; + PGDIBRUSHOBJ BrushFg = NULL; + GDIBRUSHINST BrushFgInst; + HBRUSH hBrushBg = NULL; + PGDIBRUSHOBJ BrushBg = NULL; + GDIBRUSHINST BrushBgInst; + HBITMAP HSourceGlyph; + SURFOBJ *SourceGlyphSurf; + SIZEL bitSize; + FT_CharMap found = 0, charmap; + INT yoff; + FONTOBJ *FontObj; + PFONTGDI FontGDI; + PTEXTOBJ TextObj = NULL; + PPALGDI PalDestGDI; + XLATEOBJ *XlateObj=NULL, *XlateObj2=NULL; + ULONG Mode; + FT_Render_Mode RenderMode; + BOOLEAN Render; + NTSTATUS Status; + INT *Dx = NULL; + POINT Start; + BOOL DoBreak = FALSE; + LPCWSTR String, SafeString = NULL; + HPALETTE hDestPalette; + + // TODO: Write test-cases to exactly match real Windows in different + // bad parameters (e.g. does Windows check the DC or the RECT first?). + dc = DC_LockDc(hDC); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + if (dc->DC_Type == DC_TYPE_INFO) + { + DC_UnlockDc(dc); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } + + Dc_Attr = dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + /* Check if String is valid */ + if ((Count > 0xFFFF) || (Count > 0 && UnsafeString == NULL)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + goto fail; + } + if (Count > 0) + { + SafeString = ExAllocatePoolWithTag(PagedPool, Count * sizeof(WCHAR), TAG_GDITEXT); + if (!SafeString) + { + goto fail; + } + Status = MmCopyFromCaller(SafeString, UnsafeString, Count * sizeof(WCHAR)); + if (! NT_SUCCESS(Status)) + { + goto fail; + } + } + String = SafeString; + + if (lprc && (fuOptions & (ETO_OPAQUE | ETO_CLIPPED))) + { + // At least one of the two flags were specified. Copy lprc. Once. + Status = MmCopyFromCaller(&SpecifiedDestRect, lprc, sizeof(RECT)); + if (!NT_SUCCESS(Status)) + { + DC_UnlockDc(dc); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + IntLPtoDP(dc, (POINT *) &SpecifiedDestRect, 2); + } + + if (NULL != UnsafeDx && Count > 0) + { + Dx = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), TAG_GDITEXT); + if (NULL == Dx) + { + goto fail; + } + Status = MmCopyFromCaller(Dx, UnsafeDx, Count * sizeof(INT)); + if (! NT_SUCCESS(Status)) + { + goto fail; + } + } + + BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); + if ( !BitmapObj ) + { + goto fail; + } + SurfObj = &BitmapObj->SurfObj; + ASSERT(SurfObj); + + Start.x = XStart; Start.y = YStart; + IntLPtoDP(dc, &Start, 1); + + RealXStart = (Start.x + dc->ptlDCOrig.x) << 6; + YStart = Start.y + dc->ptlDCOrig.y; + + /* Create the brushes */ + hDestPalette = BitmapObj->hDIBPalette; + if (!hDestPalette) hDestPalette = pPrimarySurface->DevInfo.hpalDefault; + PalDestGDI = PALETTE_LockPalette(hDestPalette); + if ( !PalDestGDI ) + Mode = PAL_RGB; + else + { + Mode = PalDestGDI->Mode; + PALETTE_UnlockPalette(PalDestGDI); + } + XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, hDestPalette, NULL); + if ( !XlateObj ) + { + goto fail; + } + hBrushFg = NtGdiCreateSolidBrush(XLATEOBJ_iXlate(XlateObj, Dc_Attr->crForegroundClr), 0); + if ( !hBrushFg ) + { + goto fail; + } + BrushFg = BRUSHOBJ_LockBrush(hBrushFg); + if ( !BrushFg ) + { + goto fail; + } + IntGdiInitBrushInstance(&BrushFgInst, BrushFg, NULL); + if ((fuOptions & ETO_OPAQUE) || Dc_Attr->jBkMode == OPAQUE) + { + hBrushBg = NtGdiCreateSolidBrush(XLATEOBJ_iXlate(XlateObj, Dc_Attr->crBackgroundClr), 0); + if ( !hBrushBg ) + { + goto fail; + } + BrushBg = BRUSHOBJ_LockBrush(hBrushBg); + if ( !BrushBg ) + { + goto fail; + } + IntGdiInitBrushInstance(&BrushBgInst, BrushBg, NULL); + } + XlateObj2 = (XLATEOBJ*)IntEngCreateXlate(PAL_RGB, Mode, NULL, hDestPalette); + if ( !XlateObj2 ) + { + goto fail; + } + + SourcePoint.x = 0; + SourcePoint.y = 0; + MaskRect.left = 0; + MaskRect.top = 0; + BrushOrigin.x = 0; + BrushOrigin.y = 0; + + if ((fuOptions & ETO_OPAQUE) && lprc) + { + DestRect.left = SpecifiedDestRect.left + dc->ptlDCOrig.x; + DestRect.top = SpecifiedDestRect.top + dc->ptlDCOrig.y; + DestRect.right = SpecifiedDestRect.right + dc->ptlDCOrig.x; + DestRect.bottom = SpecifiedDestRect.bottom + dc->ptlDCOrig.y; + IntLPtoDP(dc, (LPPOINT)&DestRect, 2); + IntEngBitBlt( + &BitmapObj->SurfObj, + NULL, + NULL, + dc->CombinedClip, + NULL, + &DestRect, + &SourcePoint, + &SourcePoint, + &BrushBgInst.BrushObject, + &BrushOrigin, + ROP3_TO_ROP4(PATCOPY)); + fuOptions &= ~ETO_OPAQUE; + } + else + { + if (Dc_Attr->jBkMode == OPAQUE) + { + fuOptions |= ETO_OPAQUE; + } + } + + TextObj = TEXTOBJ_LockText(Dc_Attr->hlfntNew); + if(TextObj == NULL) + { + goto fail; + } + + FontObj = TextObj->Font; + ASSERT(FontObj); + FontGDI = ObjToGDI(FontObj, FONT); + ASSERT(FontGDI); + + IntLockFreeType; + face = FontGDI->face; + if (face->charmap == NULL) + { + DPRINT("WARNING: No charmap selected!\n"); + DPRINT("This font face has %d charmaps\n", face->num_charmaps); + + for (n = 0; n < face->num_charmaps; n++) + { + charmap = face->charmaps[n]; + DPRINT("found charmap encoding: %u\n", charmap->encoding); + if (charmap->encoding != 0) + { + found = charmap; + break; + } + } + if (!found) + { + DPRINT1("WARNING: Could not find desired charmap!\n"); + } + error = FT_Set_Charmap(face, found); + if (error) + { + DPRINT1("WARNING: Could not set the charmap!\n"); + } + } + + Render = IntIsFontRenderingEnabled(); + if (Render) + RenderMode = IntGetFontRenderMode(&TextObj->logfont.elfEnumLogfontEx.elfLogFont); + else + RenderMode = FT_RENDER_MODE_MONO; + + error = FT_Set_Pixel_Sizes( + face, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, + /* FIXME should set character height if neg */ + (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? + - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); + if (error) + { + DPRINT1("Error in setting pixel sizes: %u\n", error); + IntUnLockFreeType; + goto fail; + } + + /* + * Process the vertical alignment and determine the yoff. + */ + + if (Dc_Attr->lTextAlign & TA_BASELINE) + yoff = 0; + else if (Dc_Attr->lTextAlign & TA_BOTTOM) + yoff = -face->size->metrics.descender >> 6; + else /* TA_TOP */ + yoff = face->size->metrics.ascender >> 6; + + use_kerning = FT_HAS_KERNING(face); + previous = 0; + + /* + * Process the horizontal alignment and modify XStart accordingly. + */ + + if (Dc_Attr->lTextAlign & (TA_RIGHT | TA_CENTER)) + { + ULONGLONG TextWidth = 0; + LPCWSTR TempText = String; + int Start; + + /* + * Calculate width of the text. + */ + + if (NULL != Dx) + { + Start = Count < 2 ? 0 : Count - 2; + TextWidth = Count < 2 ? 0 : (Dx[Count - 2] << 6); + } + else + { + Start = 0; + } + TempText = String + Start; + + for (i = Start; i < Count; i++) + { + if (fuOptions & ETO_GLYPH_INDEX) + glyph_index = *TempText; + else + glyph_index = FT_Get_Char_Index(face, *TempText); + + if (!(realglyph = ftGdiGlyphCacheGet(face, glyph_index, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) + { + error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); + if (error) + { + DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); + } + + glyph = face->glyph; + realglyph = ftGdiGlyphCacheSet(face, glyph_index, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, glyph, RenderMode); + if (!realglyph) + { + DPRINT1("Failed to render glyph! [index: %u]\n", glyph_index); + IntUnLockFreeType; + goto fail; + } + + } + /* retrieve kerning distance */ + if (use_kerning && previous && glyph_index) + { + FT_Vector delta; + FT_Get_Kerning(face, previous, glyph_index, 0, &delta); + TextWidth += delta.x; + } + + TextWidth += realglyph->advance.x >> 10; + + previous = glyph_index; + TempText++; + } + + previous = 0; + + if (Dc_Attr->lTextAlign & TA_RIGHT) + { + RealXStart -= TextWidth; + } + else + { + RealXStart -= TextWidth / 2; + } + } + + TextLeft = RealXStart; + TextTop = YStart; + BackgroundLeft = (RealXStart + 32) >> 6; + + /* + * The main rendering loop. + */ + + for (i = 0; i < Count; i++) + { + if (fuOptions & ETO_GLYPH_INDEX) + glyph_index = *String; + else + glyph_index = FT_Get_Char_Index(face, *String); + + if (!(realglyph = ftGdiGlyphCacheGet(face, glyph_index, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) + { + error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); + if (error) { - Status = _SEH_GetExceptionCode(); + DPRINT1("Failed to load and render glyph! [index: %u]\n", glyph_index); + IntUnLockFreeType; + goto fail; } - _SEH_END - - if(!NT_SUCCESS(Status)) + glyph = face->glyph; + realglyph = ftGdiGlyphCacheSet(face, + glyph_index, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, + glyph, + RenderMode); + if (!realglyph) { - SetLastNtError(Status); - bRet = FALSE; + DPRINT1("Failed to render glyph! [index: %u]\n", glyph_index); + IntUnLockFreeType; + goto fail; } - } - - /* Free the string for the safe filenames */ - ExFreePool(SafeFileNames.Buffer); - - return bRet; -} + } +// DbgPrint("realglyph: %x\n", realglyph); +// DbgPrint("TextLeft: %d\n", TextLeft); + + /* retrieve kerning distance and move pen position */ + if (use_kerning && previous && glyph_index && NULL == Dx) + { + FT_Vector delta; + FT_Get_Kerning(face, previous, glyph_index, 0, &delta); + TextLeft += delta.x; + } +// DPRINT1("TextLeft: %d\n", TextLeft); +// DPRINT1("TextTop: %d\n", TextTop); + + if (realglyph->format == ft_glyph_format_outline) + { + DbgPrint("Should already be done\n"); +// error = FT_Render_Glyph(glyph, RenderMode); + error = FT_Glyph_To_Bitmap(&realglyph, RenderMode, 0, 0); + if (error) + { + DPRINT1("WARNING: Failed to render glyph!\n"); + goto fail; + } + } + realglyph2 = (FT_BitmapGlyph)realglyph; + +// DPRINT1("Pitch: %d\n", pitch); +// DPRINT1("Advance: %d\n", realglyph->advance.x); + + if (fuOptions & ETO_OPAQUE) + { + DestRect.left = BackgroundLeft; + DestRect.right = (TextLeft + (realglyph->advance.x >> 10) + 32) >> 6; + DestRect.top = TextTop + yoff - ((face->size->metrics.ascender + 32) >> 6); + DestRect.bottom = TextTop + yoff + ((32 - face->size->metrics.descender) >> 6); + IntEngBitBlt( + &BitmapObj->SurfObj, + NULL, + NULL, + dc->CombinedClip, + NULL, + &DestRect, + &SourcePoint, + &SourcePoint, + &BrushBgInst.BrushObject, + &BrushOrigin, + ROP3_TO_ROP4(PATCOPY)); + BackgroundLeft = DestRect.right; + } + + DestRect.left = ((TextLeft + 32) >> 6) + realglyph2->left; + DestRect.right = DestRect.left + realglyph2->bitmap.width; + DestRect.top = TextTop + yoff - realglyph2->top; + DestRect.bottom = DestRect.top + realglyph2->bitmap.rows; + + bitSize.cx = realglyph2->bitmap.width; + bitSize.cy = realglyph2->bitmap.rows; + MaskRect.right = realglyph2->bitmap.width; + MaskRect.bottom = realglyph2->bitmap.rows; + + /* + * We should create the bitmap out of the loop at the biggest possible + * glyph size. Then use memset with 0 to clear it and sourcerect to + * limit the work of the transbitblt. + * + * FIXME: DIB bitmaps should have an lDelta which is a multiple of 4. + * Here we pass in the pitch from the FreeType bitmap, which is not + * guaranteed to be a multiple of 4. If it's not, we should expand + * the FreeType bitmap to a temporary bitmap. + */ + + HSourceGlyph = EngCreateBitmap(bitSize, realglyph2->bitmap.pitch, + (realglyph2->bitmap.pixel_mode == ft_pixel_mode_grays) ? + BMF_8BPP : BMF_1BPP, BMF_TOPDOWN, + realglyph2->bitmap.buffer); + if ( !HSourceGlyph ) + { + DPRINT1("WARNING: EngLockSurface() failed!\n"); + // FT_Done_Glyph(realglyph); + IntUnLockFreeType; + goto fail; + } + SourceGlyphSurf = EngLockSurface((HSURF)HSourceGlyph); + if ( !SourceGlyphSurf ) + { + EngDeleteSurface((HSURF)HSourceGlyph); + DPRINT1("WARNING: EngLockSurface() failed!\n"); + IntUnLockFreeType; + goto fail; + } + + /* + * Use the font data as a mask to paint onto the DCs surface using a + * brush. + */ + + if (lprc && + (fuOptions & ETO_CLIPPED) && + DestRect.right >= SpecifiedDestRect.right + dc->ptlDCOrig.x) + { + // We do the check '>=' instead of '>' to possibly save an iteration + // through this loop, since it's breaking after the drawing is done, + // and x is always incremented. + DestRect.right = SpecifiedDestRect.right + dc->ptlDCOrig.x; + DoBreak = TRUE; + } + + IntEngMaskBlt( + SurfObj, + SourceGlyphSurf, + dc->CombinedClip, + XlateObj, + XlateObj2, + &DestRect, + &SourcePoint, + (PPOINTL)&MaskRect, + &BrushFgInst.BrushObject, + &BrushOrigin); + + EngUnlockSurface(SourceGlyphSurf); + EngDeleteSurface((HSURF)HSourceGlyph); + + if (DoBreak) + { + break; + } + + if (NULL == Dx) + { + TextLeft += realglyph->advance.x >> 10; +// DbgPrint("new TextLeft: %d\n", TextLeft); + } + else + { + TextLeft += Dx[i] << 6; +// DbgPrint("new TextLeft2: %d\n", TextLeft); + } + previous = glyph_index; + + String++; + } + + IntUnLockFreeType; + + EngDeleteXlate(XlateObj); + EngDeleteXlate(XlateObj2); + BITMAPOBJ_UnlockBitmap(BitmapObj); + if(TextObj != NULL) + TEXTOBJ_UnlockText(TextObj); + if (hBrushBg != NULL) + { + BRUSHOBJ_UnlockBrush(BrushBg); + NtGdiDeleteObject(hBrushBg); + } + BRUSHOBJ_UnlockBrush(BrushFg); + NtGdiDeleteObject(hBrushFg); + if (NULL != SafeString) + { + ExFreePool((void*)SafeString); + } + if (NULL != Dx) + { + ExFreePool(Dx); + } + DC_UnlockDc( dc ); + + return TRUE; + +fail: + if ( XlateObj2 != NULL ) + EngDeleteXlate(XlateObj2); + if ( XlateObj != NULL ) + EngDeleteXlate(XlateObj); + if(TextObj != NULL) + TEXTOBJ_UnlockText(TextObj); + if (BitmapObj != NULL) + BITMAPOBJ_UnlockBitmap(BitmapObj); + if (hBrushBg != NULL) + { + BRUSHOBJ_UnlockBrush(BrushBg); + NtGdiDeleteObject(hBrushBg); + } + if (hBrushFg != NULL) + { + BRUSHOBJ_UnlockBrush(BrushFg); + NtGdiDeleteObject(hBrushFg); + } + if (NULL != SafeString) + { + ExFreePool((void*)SafeString); + } + if (NULL != Dx) + { + ExFreePool(Dx); + } + DC_UnlockDc(dc); + + return FALSE; +} + + /* + * @implemented + */ +BOOL +STDCALL +NtGdiGetCharABCWidthsW( + IN HDC hDC, + IN UINT FirstChar, + IN ULONG Count, + IN OPTIONAL PWCHAR pwch, + IN FLONG fl, + OUT PVOID Buffer) +{ + LPABC SafeBuff; + LPABCFLOAT SafeBuffF = NULL; + PDC dc; + PDC_ATTR Dc_Attr; + PTEXTOBJ TextObj; + PFONTGDI FontGDI; + FT_Face face; + FT_CharMap charmap, found = NULL; + UINT i, glyph_index, BufferSize; + HFONT hFont = 0; + NTSTATUS Status = STATUS_SUCCESS; + + if(pwch) + { + _SEH_TRY + { + ProbeForRead(pwch, + sizeof(PWSTR), + 1); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + if (!NT_SUCCESS(Status)) + { + SetLastWin32Error(Status); + return FALSE; + } + + BufferSize = Count * sizeof(ABC); // Same size! + SafeBuff = ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_GDITEXT); + if (!fl) SafeBuffF = (LPABCFLOAT) SafeBuff; + if (SafeBuff == NULL) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + dc = DC_LockDc(hDC); + if (dc == NULL) + { + ExFreePool(SafeBuff); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + Dc_Attr = dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + hFont = Dc_Attr->hlfntNew; + TextObj = TEXTOBJ_LockText(hFont); + DC_UnlockDc(dc); + + if (TextObj == NULL) + { + ExFreePool(SafeBuff); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + + FontGDI = ObjToGDI(TextObj->Font, FONT); + + face = FontGDI->face; + if (face->charmap == NULL) + { + for (i = 0; i < face->num_charmaps; i++) + { + charmap = face->charmaps[i]; + if (charmap->encoding != 0) + { + found = charmap; + break; + } + } + + if (!found) + { + DPRINT1("WARNING: Could not find desired charmap!\n"); + ExFreePool(SafeBuff); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + + IntLockFreeType; + FT_Set_Charmap(face, found); + IntUnLockFreeType; + } + + IntLockFreeType; + FT_Set_Pixel_Sizes(face, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, + /* FIXME should set character height if neg */ + (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); + + for (i = FirstChar; i < FirstChar+Count; i++) + { + int adv, lsb, bbx, left, right; + + if (pwch) + { + if (fl & GCABCW_INDICES) + glyph_index = pwch[i - FirstChar]; + else + glyph_index = FT_Get_Char_Index(face, pwch[i - FirstChar]); + } + else + { + if (fl & GCABCW_INDICES) + glyph_index = i; + else + glyph_index = FT_Get_Char_Index(face, i); + } + FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); + + left = (INT)face->glyph->metrics.horiBearingX & -64; + right = (INT)((face->glyph->metrics.horiBearingX + face->glyph->metrics.width) + 63) & -64; + adv = (face->glyph->advance.x + 32) >> 6; + +// int test = (INT)(face->glyph->metrics.horiAdvance + 63) >> 6; +// DPRINT1("Advance Wine %d and Advance Ros %d\n",test, adv ); /* It's the same!*/ + + lsb = left >> 6; + bbx = (right - left) >> 6; +/* + DPRINT1("lsb %d and bbx %d\n", lsb, bbx ); + */ + if (!fl) + { + SafeBuffF[i - FirstChar].abcfA = (FLOAT) lsb; + SafeBuffF[i - FirstChar].abcfB = (FLOAT) bbx; + SafeBuffF[i - FirstChar].abcfC = (FLOAT) (adv - lsb - bbx); + } + else + { + SafeBuff[i - FirstChar].abcA = lsb; + SafeBuff[i - FirstChar].abcB = bbx; + SafeBuff[i - FirstChar].abcC = adv - lsb - bbx; + } + } + IntUnLockFreeType; + TEXTOBJ_UnlockText(TextObj); + Status = MmCopyToCaller(Buffer, SafeBuff, BufferSize); + if (! NT_SUCCESS(Status)) + { + SetLastNtError(Status); + ExFreePool(SafeBuff); + return FALSE; + } + ExFreePool(SafeBuff); + DPRINT("NtGdiGetCharABCWidths Worked!\n"); + return TRUE; +} + + /* + * @implemented + */ +BOOL +STDCALL +NtGdiGetCharWidthW( + IN HDC hDC, + IN UINT FirstChar, + IN UINT Count, + IN OPTIONAL PWCHAR pwc, + IN FLONG fl, + OUT PVOID Buffer) +{ + NTSTATUS Status = STATUS_SUCCESS; + LPINT SafeBuff; + PFLOAT SafeBuffF = NULL; + PDC dc; + PDC_ATTR Dc_Attr; + PTEXTOBJ TextObj; + PFONTGDI FontGDI; + FT_Face face; + FT_CharMap charmap, found = NULL; + UINT i, glyph_index, BufferSize; + HFONT hFont = 0; + + if(pwc) + { + _SEH_TRY + { + ProbeForRead(pwc, + sizeof(PWSTR), + 1); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + if (!NT_SUCCESS(Status)) + { + SetLastWin32Error(Status); + return FALSE; + } + + BufferSize = Count * sizeof(INT); // Same size! + SafeBuff = ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_GDITEXT); + if (!fl) SafeBuffF = (PFLOAT) SafeBuff; + if (SafeBuff == NULL) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + dc = DC_LockDc(hDC); + if (dc == NULL) + { + ExFreePool(SafeBuff); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + Dc_Attr = dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + hFont = Dc_Attr->hlfntNew; + TextObj = TEXTOBJ_LockText(hFont); + DC_UnlockDc(dc); + + if (TextObj == NULL) + { + ExFreePool(SafeBuff); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + + FontGDI = ObjToGDI(TextObj->Font, FONT); + + face = FontGDI->face; + if (face->charmap == NULL) + { + for (i = 0; i < face->num_charmaps; i++) + { + charmap = face->charmaps[i]; + if (charmap->encoding != 0) + { + found = charmap; + break; + } + } + + if (!found) + { + DPRINT1("WARNING: Could not find desired charmap!\n"); + ExFreePool(SafeBuff); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + + IntLockFreeType; + FT_Set_Charmap(face, found); + IntUnLockFreeType; + } + + IntLockFreeType; + FT_Set_Pixel_Sizes(face, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, + /* FIXME should set character height if neg */ + (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? + - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); + + for (i = FirstChar; i < FirstChar+Count; i++) + { + if (pwc) + { + if (fl & GCW_INDICES) + glyph_index = pwc[i - FirstChar]; + else + glyph_index = FT_Get_Char_Index(face, pwc[i - FirstChar]); + } + else + { + if (fl & GCW_INDICES) + glyph_index = i; + else + glyph_index = FT_Get_Char_Index(face, i); + } + FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); + if (!fl) + SafeBuffF[i - FirstChar] = (FLOAT) ((face->glyph->advance.x + 32) >> 6); + else + SafeBuff[i - FirstChar] = (face->glyph->advance.x + 32) >> 6; + } + IntUnLockFreeType; + TEXTOBJ_UnlockText(TextObj); + MmCopyToCaller(Buffer, SafeBuff, BufferSize); + ExFreePool(SafeBuff); + return TRUE; +} + + + /* + * @implemented + */ +DWORD +STDCALL +NtGdiGetGlyphIndicesW( + IN HDC hdc, + IN OPTIONAL LPWSTR UnSafepwc, + IN INT cwc, + OUT OPTIONAL LPWORD UnSafepgi, + IN DWORD iMode) +{ + PDC dc; + PDC_ATTR Dc_Attr; + PTEXTOBJ TextObj; + PFONTGDI FontGDI; + HFONT hFont = 0; + NTSTATUS Status = STATUS_SUCCESS; + OUTLINETEXTMETRICW *potm; + INT i; + FT_Face face; + WCHAR DefChar = 0xffff; + PWSTR Buffer = NULL; + ULONG Size; + + if ((!UnSafepwc) && (!UnSafepgi)) return cwc; + + dc = DC_LockDc(hdc); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return GDI_ERROR; + } + Dc_Attr = dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + hFont = Dc_Attr->hlfntNew; + TextObj = TEXTOBJ_LockText(hFont); + DC_UnlockDc(dc); + if (!TextObj) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return GDI_ERROR; + } + + FontGDI = ObjToGDI(TextObj->Font, FONT); + TEXTOBJ_UnlockText(TextObj); + + Buffer = ExAllocatePoolWithTag(PagedPool, cwc*sizeof(WORD), TAG_GDITEXT); + if (!Buffer) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return GDI_ERROR; + } + + if (iMode & GGI_MARK_NONEXISTING_GLYPHS) DefChar = 0x001f; /* Indicate non existence */ + else + { + Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); + potm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); + if (!potm) + { + Status = ERROR_NOT_ENOUGH_MEMORY; + goto ErrorRet; + } + IntGetOutlineTextMetrics(FontGDI, Size, potm); + DefChar = potm->otmTextMetrics.tmDefaultChar; // May need this. + ExFreePool(potm); + } + + _SEH_TRY + { + ProbeForRead(UnSafepwc, + sizeof(PWSTR), + 1); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) goto ErrorRet; + + IntLockFreeType; + face = FontGDI->face; + + for (i = 0; i < cwc; i++) + { + Buffer[i] = FT_Get_Char_Index(face, UnSafepwc[i]); + if (Buffer[i] == 0) + { + if (DefChar == 0xffff && FT_IS_SFNT(face)) + { + TT_OS2 *pOS2 = FT_Get_Sfnt_Table(face, ft_sfnt_os2); + DefChar = (pOS2->usDefaultChar ? FT_Get_Char_Index(face, pOS2->usDefaultChar) : 0); + } + Buffer[i] = DefChar; + } + } + + IntUnLockFreeType; + + _SEH_TRY + { + ProbeForWrite(UnSafepgi, + sizeof(WORD), + 1); + RtlCopyMemory(UnSafepgi, + Buffer, + cwc*sizeof(WORD)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + +ErrorRet: + ExFreePoolWithTag(Buffer, TAG_GDITEXT); + if (NT_SUCCESS(Status)) return cwc; + SetLastWin32Error(Status); + return GDI_ERROR; +} + /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Sun Nov 2 06:17:15 2008 @@ -750,21 +750,34 @@ } /* - * @unimplemented + * @implemented */ BOOL APIENTRY EngQuerySystemAttribute( IN ENG_SYSTEM_ATTRIBUTE CapNum, OUT PDWORD pCapability) { + SYSTEM_BASIC_INFORMATION sbi; + SYSTEM_PROCESSOR_INFORMATION spi; + switch (CapNum) { case EngNumberOfProcessors: - *pCapability = 1; + NtQuerySystemInformation( + SystemBasicInformation, + &sbi, + sizeof(SYSTEM_BASIC_INFORMATION), + NULL); + *pCapability = sbi.NumberOfProcessors; return TRUE; case EngProcessorFeature: - *pCapability = 0; + NtQuerySystemInformation( + SystemProcessorInformation, + &spi, + sizeof(SYSTEM_PROCESSOR_INFORMATION), + NULL); + *pCapability = spi.ProcessorFeatureBits; return TRUE; default:

1 0

[sginsberg] 37147: - Stub out Ke386IoSetAccessProcess, Ke386SetIoAccessMap and Ke386QueryIoAccessMap - Reference: "The Simplest Device Drivers" http://www.freewebs.com/four-f/KmdTut/kmd03.html
by sginsberg＠svn.reactos.org 02 Nov '08

02 Nov '08

Author: sginsberg Date: Sun Nov 2 05:48:24 2008 New Revision: 37147 URL: http://svn.reactos.org/svn/reactos?rev=37147&view=rev Log: - Stub out Ke386IoSetAccessProcess, Ke386SetIoAccessMap and Ke386QueryIoAccessMap - Reference: "The Simplest Device Drivers" http://www.freewebs.com/four-f/KmdTut/kmd03.html Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c trunk/reactos/ntoskrnl/ntoskrnl.pspec Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] Sun Nov 2 05:48:24 2008 @@ -120,4 +120,38 @@ return STATUS_SUCCESS; } -/* EOF */ +/* + * @unimplemented + */ +BOOLEAN +NTAPI +Ke386IoSetAccessProcess(IN PKPROCESS Process, + IN ULONG Flag) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +BOOLEAN +NTAPI +Ke386SetIoAccessMap(IN ULONG Flag, + IN PVOID IopmBuffer) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +BOOLEAN +NTAPI +Ke386QueryIoAccessMap(IN ULONG Flag, + IN PVOID IopmBuffer) +{ + UNIMPLEMENTED; + return FALSE; +} Modified: trunk/reactos/ntoskrnl/ntoskrnl.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.pspec?re… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] Sun Nov 2 05:48:24 2008 @@ -538,9 +538,9 @@ @ stdcall KdSystemDebugControl(long ptr long ptr long ptr long) #ifdef _M_IX86 @ stdcall Ke386CallBios(long ptr) -;Ke386IoSetAccessProcess -;Ke386QueryIoAccessMap -;Ke386SetIoAccessMap +@ stdcall Ke386IoSetAccessProcess(ptr long) +@ stdcall Ke386QueryIoAccessMap(long ptr) +@ stdcall Ke386SetIoAccessMap(long ptr) #endif @ fastcall KeAcquireGuardedMutex(ptr) @ fastcall KeAcquireGuardedMutexUnsafe(ptr)

1 0

[jimtabor] 37146: - Update FONTGDI and TEXTOBJ. Added support for FT WinFNT. Fixed FillTM so it can pass underline and strike out support.
by jimtabor＠svn.reactos.org 02 Nov '08

02 Nov '08

Author: jimtabor Date: Sat Nov 1 19:57:17 2008 New Revision: 37146 URL: http://svn.reactos.org/svn/reactos?rev=37146&view=rev Log: - Update FONTGDI and TEXTOBJ. Added support for FT WinFNT. Fixed FillTM so it can pass underline and strike out support. Modified: trunk/reactos/subsystems/win32/win32k/eng/objects.h trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/subsystems/win32/win32k/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/subsystems/win32/win32k/eng/objects.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/objects.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/objects.h [iso-8859-1] Sat Nov 1 19:57:17 2008 @@ -68,11 +68,17 @@ } FLOATGDI; typedef struct _FONTGDI { - FONTOBJ FontObj; + FONTOBJ FontObj; - LPWSTR Filename; - FT_Face face; + LONG lMaxNegA; + LONG lMaxNegC; + LONG lMinWidthD; + TEXTMETRICW TextMetric; + LPWSTR Filename; + FT_Face face; + BYTE Underline; + BYTE StrikeOut; } FONTGDI, *PFONTGDI; typedef struct _PATHGDI { Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] Sat Nov 1 19:57:17 2008 @@ -60,10 +60,11 @@ /* Header for all gdi objects in the handle table. Do not (re)move this. */ BASEOBJECT BaseObject; - + LFTYPE lft; + FLONG fl; ENUMLOGFONTEXDVW logfont; //LOGFONTW logfont; - FONTOBJ *Font; - BOOLEAN Initialized; /* Don't reinitialize for each DC */ + FONTOBJ *Font; + BOOLEAN Initialized; /* Don't reinitialize for each DC */ } TEXTOBJ, *PTEXTOBJ; /* Internal interface */ Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] Sat Nov 1 19:57:17 2008 @@ -340,6 +340,8 @@ } hNewFont = TextObj->BaseObject.hHmgr; + TextObj->lft = cjElfw; + TextObj->fl = fl; RtlCopyMemory (&TextObj->logfont, &SafeLogfont, sizeof(ENUMLOGFONTEXDVW)); if (SafeLogfont.elfEnumLogfontEx.elfLogFont.lfEscapement != Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Sat Nov 1 19:57:17 2008 @@ -557,15 +557,41 @@ static void FASTCALL -FillTM(TEXTMETRICW *TM, FT_Face Face, TT_OS2 *pOS2, TT_HoriHeader *pHori) +FillTM(TEXTMETRICW *TM, PFONTGDI FontGDI, TT_OS2 *pOS2, TT_HoriHeader *pHori, FT_WinFNT_HeaderRec *pWin) { FT_Fixed XScale, YScale; int Ascent, Descent; + FT_Face Face = FontGDI->face; XScale = Face->size->metrics.x_scale; YScale = Face->size->metrics.y_scale; - if (0 == pOS2->usWinAscent + pOS2->usWinDescent) + if (pWin) + { + TM->tmHeight = pWin->pixel_height; + TM->tmAscent = pWin->ascent; + TM->tmDescent = TM->tmHeight - TM->tmAscent; + TM->tmInternalLeading = pWin->internal_leading; + TM->tmExternalLeading = pWin->external_leading; + TM->tmAveCharWidth = pWin->avg_width; + TM->tmMaxCharWidth = pWin->max_width; + TM->tmWeight = pWin->weight; + TM->tmOverhang = 0; + TM->tmDigitizedAspectX = pWin->horizontal_resolution; + TM->tmDigitizedAspectY = pWin->vertical_resolution; + TM->tmFirstChar = pWin->first_char; + TM->tmLastChar = pWin->last_char; + TM->tmDefaultChar = pWin->default_char + pWin->first_char; + TM->tmBreakChar = pWin->break_char + pWin->first_char; + TM->tmItalic = pWin->italic; + TM->tmUnderlined = FontGDI->Underline; + TM->tmStruckOut = FontGDI->StrikeOut; + TM->tmPitchAndFamily = pWin->pitch_and_family; + TM->tmCharSet = pWin->charset; + return; + } + + if (0 == pOS2->usWinAscent + pOS2->usWinDescent) { Ascent = pHori->Ascender; Descent = -pHori->Descender; @@ -613,8 +639,8 @@ TM->tmDefaultChar = pOS2->usDefaultChar; TM->tmBreakChar = L'\0' != pOS2->usBreakChar ? pOS2->usBreakChar : ' '; TM->tmItalic = (Face->style_flags & FT_STYLE_FLAG_ITALIC) ? 255 : 0; - TM->tmUnderlined = 0; /* entry in OS2 table */ - TM->tmStruckOut = 0; /* entry in OS2 table */ + TM->tmUnderlined = FontGDI->Underline; + TM->tmStruckOut = FontGDI->StrikeOut; /* Yes TPMF_FIXED_PITCH is correct; braindead api */ if (! FT_IS_FIXED_WIDTH(Face)) @@ -676,7 +702,8 @@ * */ INT FASTCALL -IntGetOutlineTextMetrics(PFONTGDI FontGDI, UINT Size, +IntGetOutlineTextMetrics(PFONTGDI FontGDI, + UINT Size, OUTLINETEXTMETRICW *Otm) { unsigned Needed; @@ -686,6 +713,8 @@ FT_Fixed XScale, YScale; ANSI_STRING FamilyNameA, StyleNameA; UNICODE_STRING FamilyNameW, StyleNameW, Regular; + FT_WinFNT_HeaderRec Win; + FT_Error Error; char *Cp; Needed = sizeof(OUTLINETEXTMETRICW); @@ -751,9 +780,11 @@ pPost = FT_Get_Sfnt_Table(FontGDI->face, ft_sfnt_post); /* we can live with this failing */ + Error = FT_Get_WinFNT_Header(FontGDI->face , &Win); + Otm->otmSize = Needed; - FillTM(&Otm->otmTextMetrics, FontGDI->face, pOS2, pHori); + FillTM(&Otm->otmTextMetrics, FontGDI, pOS2, pHori, !Error ? &Win : 0); Otm->otmFiller = 0; memcpy(&Otm->otmPanoseNumber, pOS2->panose, PANOSE_COUNT); @@ -2450,10 +2481,9 @@ if (DefChar == 0xffff && FT_IS_SFNT(face)) { TT_OS2 *pOS2 = FT_Get_Sfnt_Table(face, ft_sfnt_os2); - Buffer[i] = (pOS2->usDefaultChar ? FT_Get_Char_Index(face, pOS2->usDefaultChar) : 0); + DefChar = (pOS2->usDefaultChar ? FT_Get_Char_Index(face, pOS2->usDefaultChar) : 0); } - else - Buffer[i] = DefChar; + Buffer[i] = DefChar; } } @@ -2475,7 +2505,7 @@ _SEH_END; ErrorRet: - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, TAG_GDITEXT); if (NT_SUCCESS(Status)) return cwc; SetLastWin32Error(Status); return GDI_ERROR; @@ -3527,6 +3557,7 @@ FT_Face Face; TT_OS2 *pOS2; TT_HoriHeader *pHori; + FT_WinFNT_HeaderRec Win; ULONG Error; NTSTATUS Status = STATUS_SUCCESS; @@ -3584,11 +3615,13 @@ Status = STATUS_INTERNAL_ERROR; } + Error = FT_Get_WinFNT_Header(FontGDI->face , &Win); + IntUnLockFreeType; if (NT_SUCCESS(Status)) { - FillTM(&ptmwi->TextMetric, FontGDI->face, pOS2, pHori); + FillTM(&ptmwi->TextMetric, FontGDI, pOS2, pHori, !Error ? &Win : 0); } } TEXTOBJ_UnlockText(TextObj); @@ -3849,7 +3882,6 @@ &TextObj->logfont.elfEnumLogfontEx.elfLogFont, &FaceName, &FontListHead); IntUnLockGlobalFonts; - if (NULL == TextObj->Font) { DPRINT1("Requested font %S not found, no fonts loaded at all\n", @@ -3858,6 +3890,10 @@ } else { + PFONTGDI FontGdi = ObjToGDI(TextObj->Font, FONT); + TextObj->Font->iUniq = 1; // Now it can be cached. + FontGdi->Underline = TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfUnderline ? 0xff : 0; + FontGdi->StrikeOut = TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfStrikeOut ? 0xff : 0; TextObj->Initialized = TRUE; Status = STATUS_SUCCESS; }

1 0

[hyperion] 37145: Arch Blackmann's rules for preprocessed spec files were quite broken (of course). Fixing them. * Add the module name to the name of the intermediate .spec file generated by the preprocessor. Fixes race condition in parallel builds of HAL targets * Pass module defines and includes to the preprocessor. Fixes a future bug that would have caused Aleksey to commit suicide and ReactOS to be forked into Debian GNU/ReactOS * Don't silently ignore stubs defined by .pspec files. What the
by hyperion＠svn.reactos.org 01 Nov '08

01 Nov '08

Author: hyperion Date: Sat Nov 1 18:23:02 2008 New Revision: 37145 URL: http://svn.reactos.org/svn/reactos?rev=37145&view=rev Log: Arch Blackmann's rules for preprocessed spec files were quite broken (of course). Fixing them. * Add the module name to the name of the intermediate .spec file generated by the preprocessor. Fixes race condition in parallel builds of HAL targets * Pass module defines and includes to the preprocessor. Fixes a future bug that would have caused Aleksey to commit suicide and ReactOS to be forked into Debian GNU/ReactOS * Don't silently ignore stubs defined by .pspec files. What the hell, Arch? Bonus improvement: cleaned up linker command, generating .exp files correctly as intermediate files with the appropriate dependencies. Happy Hallowmas! Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sat Nov 1 18:23:02 2008 @@ -1058,17 +1058,19 @@ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule winebuildPDefRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).auto.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WINEBLD)\n" - "\t${gcc} -xc -E $(source) -I. > $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n" - "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext)_$(module_name).auto.def --def -E $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec", + "\t${gcc} -xc -E ${$(module_name)_RCFLAGS} $(source) > $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).def.spec\n" + "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext)_$(module_name).auto.def --def -E $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).def.spec\n\n", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).def.spec", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).auto.def", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule winebuildPRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c:\n" - "\t${cp} $(NUL) $@ 1>$(NUL)\n" +Rule winebuildPRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c: $(source_path)$(SEP)$(source_name_noext).pspec $(WINEBUILD_TARGET)\n" + "\t$(ECHO_WINEBLD)\n" + "\t${gcc} -xc -E ${$(module_name)_RCFLAGS} $(source) > $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.spec\n" + "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext)_$(module_name).stubs.c --pedll $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext)_$(module_name).stubs.spec\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.spec", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); @@ -1078,7 +1080,7 @@ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).auto.def", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext)_$(module_name).stubs.c: $(source_path)$(SEP)$(source_name_noext).spec $(WINEBUILD_TARGET)\n" +Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext)_$(module_name).stubs.c: $(source_path)$(SEP)$(source_name_noext).spec $(WINEBUILD_TARGET)\n" "\t$(ECHO_WINEBLD)\n" "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext)_$(module_name).stubs.c --pedll $(source_path)$(SEP)$(source_name_noext).spec\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" @@ -1476,15 +1478,6 @@ else linkerScriptArgument = ""; - fprintf ( fMakefile, - "%s: %s %s $(RSYM_TARGET) $(PEFIXUP_TARGET) | %s\n", - target_macro.c_str (), - definitionFilename ? backend->GetFullName ( *definitionFilename ).c_str () : "", - dependencies.c_str (), - target_folder.c_str () ); - fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); - string targetName ( module.output->name ); - /* check if we need to add default C++ libraries, ie if we have * a C++ user-mode module without the -nostdlib linker flag */ @@ -1492,8 +1485,18 @@ linkerParameters.find ("-nostdlib") == string::npos && !(module.type == KernelModeDLL || module.type == KernelModeDriver); + string targetName ( module.output->name ); + if ( !module.HasImportLibrary() ) { + fprintf ( fMakefile, + "%s: %s %s $(RSYM_TARGET) $(PEFIXUP_TARGET) | %s\n", + target_macro.c_str (), + definitionFilename ? backend->GetFullName ( *definitionFilename ).c_str () : "", + dependencies.c_str (), + target_folder.c_str () ); + fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); + fprintf ( fMakefile, "\t%s %s%s %s %s %s %s -o %s\n", linker.c_str (), @@ -1507,18 +1510,32 @@ } else { - FileLocation temp_exp ( TemporaryDirectory, - "", - module.name + ".temp.exp" ); + FileLocation temp_exp ( IntermediateDirectory, + module.output->relative_path, + module.name + ".exp" ); CLEAN_FILE ( temp_exp ); fprintf ( fMakefile, - "\t${dlltool} --dllname %s --def %s --output-exp %s%s%s\n", + "%s: %s | %s\n", + backend->GetFullName ( temp_exp ).c_str (), + definitionFilename ? backend->GetFullName ( *definitionFilename ).c_str () : "", + backend->GetFullPath ( temp_exp ).c_str () ); + fprintf ( fMakefile, "\t$(ECHO_DLLTOOL)\n" ); + + fprintf ( fMakefile, + "\t${dlltool} --dllname %s --def %s --output-exp $@%s%s\n", targetName.c_str (), definitionFilename ? backend->GetFullName ( *definitionFilename ).c_str () : "", - backend->GetFullName ( temp_exp ).c_str (), module.mangledSymbols ? "" : " --kill-at", module.underscoreSymbols ? " --add-underscore" : "" ); + + fprintf ( fMakefile, + "%s: %s %s $(RSYM_TARGET) $(PEFIXUP_TARGET) | %s\n", + target_macro.c_str (), + backend->GetFullName ( temp_exp ).c_str (), + dependencies.c_str (), + target_folder.c_str () ); + fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); fprintf ( fMakefile, "\t%s %s%s %s %s %s %s %s -o %s\n", @@ -1537,10 +1554,6 @@ "\t$(Q)$(PEFIXUP_TARGET) %s -exports%s\n", target_macro.c_str (), pefixupParameters.c_str() ); - - fprintf ( fMakefile, - "\t-@${rm} %s 2>$(NUL)\n", - backend->GetFullName ( temp_exp ).c_str () ); } GenerateBuildMapCode ();

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