Author: tkreuzer
Date: Sat May 28 21:57:24 2011
New Revision: 51986
URL: http://svn.reactos.org/svn/reactos?rev=51986&view=rev
Log:
[WIN32K]
Get rid of ftGdiGetGlyphOutline, NtGdiGetFontFamilyInfo, IntGetCharDimensions,
ftGdiGetTextCharsetInfo, IntGetFontLanguageInfo, RealizeFontInit
Modified:
branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/misc.c
branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/ntuser/winsta.c
branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/dclife.c
branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/dcutil.c
branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/path.c
branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/w32ksvc.h
Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/misc.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/misc.c?rev=51986&r1=51985&r2=51986&view=diff
==============================================================================
--- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/misc.c
[iso-8859-1] (original)
+++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/misc.c
[iso-8859-1] Sat May 28 21:57:24 2011
@@ -146,32 +146,7 @@
}
-// *********** hacks
-
-ULONG
-FASTCALL
-ftGdiGetGlyphOutline(
- PDC dc,
- WCHAR wch,
- UINT iFormat,
- LPGLYPHMETRICS pgm,
- ULONG cjBuf,
- PVOID pvBuf,
- LPMAT2 pmat2,
- BOOL bIgnoreRotation)
-{
- ASSERT(FALSE);
- return 0;
-}
-
-int APIENTRY
-NtGdiGetFontFamilyInfo(HDC Dc,
- LPLOGFONTW UnsafeLogFont,
- PFONTFAMILYINFO UnsafeInfo,
- DWORD Size)
-{
- return 0;
-}
+// *********** hack
NTSTATUS FASTCALL
TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont)
@@ -181,39 +156,5 @@
return STATUS_UNSUCCESSFUL;
}
-DWORD
-FASTCALL
-IntGetCharDimensions(HDC hdc, PTEXTMETRICW ptm, PDWORD height)
-{
- ASSERT(FALSE);
- return -1;
-}
-
-INT
-FASTCALL
-ftGdiGetTextCharsetInfo(
- PDC Dc,
- LPFONTSIGNATURE lpSig,
- DWORD dwFlags)
-{
- ASSERT(FALSE);
- return 0;
-}
-
-DWORD
-FASTCALL
-IntGetFontLanguageInfo(PDC Dc)
-{
- ASSERT(FALSE);
- return 0;
-}
-
-PTEXTOBJ
-FASTCALL
-RealizeFontInit(HFONT hFont)
-{
- ASSERT(FALSE);
- return 0;
-}
Modified:
branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/ntuser/winsta.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/ntuser/winsta.c?rev=51986&r1=51985&r2=51986&view=diff
==============================================================================
--- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/ntuser/winsta.c
[iso-8859-1] (original)
+++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/ntuser/winsta.c
[iso-8859-1] Sat May 28 21:57:24 2011
@@ -314,7 +314,7 @@
BOOL FASTCALL
co_IntInitializeDesktopGraphics(VOID)
{
- TEXTMETRICW tmw;
+ //TEXTMETRICW tmw;
UNICODE_STRING DriverName = RTL_CONSTANT_STRING(L"DISPLAY");
if (! IntCreatePrimarySurface())
{
@@ -342,8 +342,11 @@
gpsi->BitCount = gpsi->Planes * gpsi->BitsPixel;
gpsi->dmLogPixels = NtGdiGetDeviceCaps(ScreenDeviceContext, LOGPIXELSY);
// Font is realized and this dc was previously set to internal DC_ATTR.
+ DPRINT1("HACK HACK HACK HACK HACK HACK HACK HACK HACK \n");
+#if 0
gpsi->cxSysFontChar = IntGetCharDimensions(hSystemBM, &tmw,
(DWORD*)&gpsi->cySysFontChar);
gpsi->tmSysFont = tmw;
+#endif
return TRUE;
}
@@ -974,7 +977,7 @@
/*
* FIXME - don't allow changing the window station if there are threads
that are attached to desktops and own gui objects
*/
-
+
PsSetProcessWindowStation(ppi->peProcess, hWindowStation);
ppi->prpwinsta = NewWinSta;
Modified:
branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/dclife.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/dclife.c?rev=51986&r1=51985&r2=51986&view=diff
==============================================================================
--- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/dclife.c
[iso-8859-1] (original)
+++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/dclife.c
[iso-8859-1] Sat May 28 21:57:24 2011
@@ -106,8 +106,6 @@
void
DC_InitHack(PDC pdc)
{
- pdc->pdcattr->iCS_CP = ftGdiGetTextCharsetInfo(pdc,NULL,0);
-
/* This should never fail */
ASSERT(pdc->dclevel.ppal);
Modified:
branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/dcutil.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/dcutil.c?rev=51986&r1=51985&r2=51986&view=diff
==============================================================================
--- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/dcutil.c
[iso-8859-1] (original)
+++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/dcutil.c
[iso-8859-1] Sat May 28 21:57:24 2011
@@ -290,7 +290,8 @@
break;
case GdiGetFontLanguageInfo:
- SafeResult = IntGetFontLanguageInfo(pdc);
+ ASSERT(FALSE); // FIXME
+ SafeResult = 0;
break;
case GdiGetIsMemDc:
Modified:
branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/path.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/path.c?rev=51986&r1=51985&r2=51986&view=diff
==============================================================================
--- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/path.c
[iso-8859-1] (original)
+++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/path.c
[iso-8859-1] Sat May 28 21:57:24 2011
@@ -2037,7 +2037,8 @@
pdcattr = dc->pdcattr;
- TextObj = RealizeFontInit( pdcattr->hlfntNew);
+ASSERT(FALSE);
+ TextObj = NULL;
if ( !TextObj ) return FALSE;
FontGetObject( TextObj, sizeof(lf), &lf);
Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/w32ksvc.h
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/w32ksvc.h?rev=51986&r1=51985&r2=51986&view=diff
==============================================================================
--- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/w32ksvc.h
[iso-8859-1] (original)
+++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/w32ksvc.h
[iso-8859-1] Sat May 28 21:57:24 2011
@@ -678,7 +678,6 @@
SVC_(GdiSetDIBits, 7)
SVC_(GdiSetViewportOrgEx, 4)
SVC_(GdiSetWindowOrgEx, 4)
-SVC_(GdiGetFontFamilyInfo, 4)
SVC_(GdiOffsetViewportOrgEx, 4)
SVC_(GdiOffsetWindowOrgEx, 4)
