Fixed a small bug in my code and removed DbgPrint.

svn path=/trunk/; revision=7911
This commit is contained in:
Richard Campbell 2004-01-29 22:23:27 +00:00
parent 8904505d1f
commit 0d2c4c19fd

View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: text.c,v 1.70 2004/01/29 22:17:54 rcampbell Exp $ */ /* $Id: text.c,v 1.71 2004/01/29 22:23:27 rcampbell Exp $ */
#undef WIN32_LEAN_AND_MEAN #undef WIN32_LEAN_AND_MEAN
@ -253,10 +253,6 @@ BOOL FASTCALL InitFontSupport(VOID)
PVOID pBuff; PVOID pBuff;
BOOLEAN bRestartScan = TRUE; BOOLEAN bRestartScan = TRUE;
if(pBuff)
{
InitializeListHead(&FontListHead); InitializeListHead(&FontListHead);
ExInitializeFastMutex(&FontListLock); ExInitializeFastMutex(&FontListLock);
ExInitializeFastMutex(&FreeTypeLock); ExInitializeFastMutex(&FreeTypeLock);
@ -267,9 +263,7 @@ BOOL FASTCALL InitFontSupport(VOID)
{ {
RtlInitUnicodeString(&cchDir, L"\\SystemRoot\\Media\\Fonts\\"); RtlInitUnicodeString(&cchDir, L"\\SystemRoot\\Media\\Fonts\\");
//RtlInitUnicodeString(&cchFilename, (PWCHAR)ExAllocatePool(NonPagedPool,0x4000));
RtlInitUnicodeString(&cchSearchPattern,L"*.ttf"); RtlInitUnicodeString(&cchSearchPattern,L"*.ttf");
InitializeObjectAttributes( &obAttr, InitializeObjectAttributes( &obAttr,
&cchDir, &cchDir,
OBJ_CASE_INSENSITIVE, OBJ_CASE_INSENSITIVE,
@ -315,18 +309,16 @@ BOOL FASTCALL InitFontSupport(VOID)
if( !NT_SUCCESS(Status) || Status == STATUS_NO_MORE_FILES ) if( !NT_SUCCESS(Status) || Status == STATUS_NO_MORE_FILES )
break; break;
DbgPrint("Adding Font: \"%S\"\n", cchFilename.Buffer);
//NtGdiAddFontResource(&cchFilename, 0);
IntGdiAddFontResource(&cchFilename, 0); IntGdiAddFontResource(&cchFilename, 0);
ExFreePool(pBuff); ExFreePool(pBuff);
ExFreePool(cchFilename.Buffer); ExFreePool(cchFilename.Buffer);
bRestartScan = FALSE; bRestartScan = FALSE;
} }
ExFreePool(cchFilename.Buffer);
ExFreePool(pBuff); ExFreePool(pBuff);
return TRUE; return TRUE;
} }
} }
}
return FALSE; return FALSE;
} }