diff --git a/reactos/include/reactos/win32k/ntgdihdl.h b/reactos/include/reactos/win32k/ntgdihdl.h index 259e67be5c8..65362c21918 100644 --- a/reactos/include/reactos/win32k/ntgdihdl.h +++ b/reactos/include/reactos/win32k/ntgdihdl.h @@ -230,7 +230,7 @@ typedef struct __GDI_SHARED_HANDLE_TABLE // Must match win32k/include/gdiobj.h FLONG flDeviceUniq; // Device settings uniqueness. PVOID pvLangPack; // Lanuage Pack. CFONT cfPublic[GDI_CFONT_MAX]; // Public Fonts. - DWORD dwCsbSupported1; // OEM code-page bitfield. + DWORD dwCFCount; } GDI_SHARED_HANDLE_TABLE, *PGDI_SHARED_HANDLE_TABLE; typedef struct _RGN_ATTR diff --git a/reactos/include/reactos/win32k/ntgdityp.h b/reactos/include/reactos/win32k/ntgdityp.h index 671d435aca0..d69fd4e29c0 100644 --- a/reactos/include/reactos/win32k/ntgdityp.h +++ b/reactos/include/reactos/win32k/ntgdityp.h @@ -231,10 +231,15 @@ typedef struct _UNIVERSAL_FONT_ID ULONG Index; } UNIVERSAL_FONT_ID, *PUNIVERSAL_FONT_ID; -typedef struct _REALIZATION_INFO // Based on LOCALESIGNATURE +#define RI_TECH_BITMAP 1 +#define RI_TECH_FIXED 2 +#define RI_TECH_SCALABLE 3 + +typedef struct _REALIZATION_INFO { - DWORD dwCsbDefault[2]; - DWORD dwCsbSupported0; + DWORD iTechnology; + DWORD iUniq; + DWORD dwUnknown; } REALIZATION_INFO, *PREALIZATION_INFO; typedef struct _WIDTHDATA @@ -402,7 +407,10 @@ typedef struct _CFONT USHORT sWidth[256]; // Widths in pels. ULONG ulAveWidth; // bogus average used by USER TMW_INTERNAL tmw; // cached metrics - LOCALESIGNATURE lsLocSig; // font signature information + DWORD iTechnology; + DWORD iUniq; + DWORD dwUnknown; + DWORD dwCFCount; } CFONT, *PCFONT; // diff --git a/reactos/subsystems/win32/win32k/include/gdiobj.h b/reactos/subsystems/win32/win32k/include/gdiobj.h index a31df8f2cbe..5843aceee83 100644 --- a/reactos/subsystems/win32/win32k/include/gdiobj.h +++ b/reactos/subsystems/win32/win32k/include/gdiobj.h @@ -21,7 +21,7 @@ typedef struct _GDI_HANDLE_TABLE FLONG flDeviceUniq; // Device settings uniqueness. PVOID pvLangPack; // Language Pack. CFONT cfPublic[GDI_CFONT_MAX]; // Public Fonts. - DWORD dwCsbSupported1; // OEM code-page bitfield. + DWORD dwCFCount; ////////////////////////////////////////////////////////////////////////////// PPAGED_LOOKASIDE_LIST LookasideLists; diff --git a/reactos/subsystems/win32/win32k/objects/freetype.c b/reactos/subsystems/win32/win32k/objects/freetype.c index b00a282e7e0..8bb65454212 100644 --- a/reactos/subsystems/win32/win32k/objects/freetype.c +++ b/reactos/subsystems/win32/win32k/objects/freetype.c @@ -1,3 +1,30 @@ +/* + * FreeType font engine interface + * + * Copyright 2001 Huw D M Davies for CodeWeavers. + * Copyright 2006 Dmitry Timoshkov for CodeWeavers. + * + * This file contains the WineEng* functions. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +/* + * + * Addaped for the use in ReactOS. + * + */ /* * PROJECT: ReactOS win32 kernel mode subsystem * LICENSE: GPL - See COPYING in the top level directory