update for HEAD-2003050101

[reactos.git] / include / win32k / text.h

diff --git a/include/win32k/text.h b/include/win32k/text.h
index fc1be70..96e6507 100644 (file)
--- a/include/win32k/text.h
+++ b/include/win32k/text.h
@@ -5,7 +5,8 @@
 /* GDI logical font object */
 typedef struct
 {
-   LOGFONT    logfont;
+   LOGFONTW   logfont;
+   HFONT      GDIFontHandle;
 } TEXTOBJ, *PTEXTOBJ;
 
 /*  Internal interface  */
@@ -13,15 +14,12 @@ typedef struct
 #define  TEXTOBJ_AllocText() \
   ((HFONT) GDIOBJ_AllocObj (sizeof (TEXTOBJ), GO_FONT_MAGIC))
 #define  TEXTOBJ_FreeText(hBMObj)  GDIOBJ_FreeObj((HGDIOBJ) hBMObj, GO_FONT_MAGIC, GDIOBJFLAG_DEFAULT)
-/*
-#define  TEXTOBJ_HandleToPtr(hBMObj)  \
-  ((PTEXTOBJ) GDIOBJ_HandleToPtr ((HGDIOBJ) hBMObj, GO_FONT_MAGIC))
-#define  TEXTOBJ_PtrToHandle(hBMObj)  \
-  ((HFONT) GDIOBJ_PtrToHandle ((PGDIOBJ) hBMObj, GO_FONT_MAGIC))
-*/
 #define  TEXTOBJ_LockText(hBMObj) ((PTEXTOBJ) GDIOBJ_LockObj ((HGDIOBJ) hBMObj, GO_FONT_MAGIC))
 #define  TEXTOBJ_UnlockText(hBMObj) GDIOBJ_UnlockObj ((HGDIOBJ) hBMObj, GO_FONT_MAGIC)
 
+NTSTATUS TextIntRealizeFont(HFONT FontHandle);
+NTSTATUS TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont);
+
 int
 STDCALL
 W32kAddFontResource(LPCWSTR  Filename);
@@ -45,7 +43,7 @@ W32kCreateFont(int  Height,
 
 HFONT
 STDCALL
-W32kCreateFontIndirect(CONST LPLOGFONT lf);
+W32kCreateFontIndirect(CONST LPLOGFONTW lf);
 
 BOOL
 STDCALL
@@ -64,7 +62,7 @@ W32kEnumFontFamilies(HDC  hDC,
 int
 STDCALL
 W32kEnumFontFamiliesEx(HDC  hDC,
-                            LPLOGFONT  Logfont,
+                            LPLOGFONTW  Logfont,
                             FONTENUMPROC  EnumFontFamExProc,
                             LPARAM  lParam,
                             DWORD  Flags);
@@ -160,7 +158,7 @@ UINT
 STDCALL
 W32kGetOutlineTextMetrics(HDC  hDC,
                                 UINT  Data,
-                                LPOUTLINETEXTMETRIC  otm);
+                                LPOUTLINETEXTMETRICW otm);
 
 BOOL
 STDCALL
@@ -210,7 +208,7 @@ W32kGetTextFace(HDC  hDC,
 BOOL
 STDCALL
 W32kGetTextMetrics(HDC  hDC,
-                         LPTEXTMETRIC  tm);
+                         LPTEXTMETRICW  tm);
 
 BOOL
 STDCALL