diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2022-04-05 21:27:03 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2022-04-05 21:27:03 +0000 |
commit | 37e731f0bd81249f8b43bada12adaa611b7a595b (patch) | |
tree | 99e477a2cd57a94782ae182b8c5e2c0024751356 /Build/source/libs/freetype2/freetype-src/builds/windows | |
parent | 7c200a413ce80d2d09a0dda338e9407bba0d3855 (diff) |
freetype2 : revert
git-svn-id: svn://tug.org/texlive/trunk@62919 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/freetype2/freetype-src/builds/windows')
20 files changed, 31 insertions, 113 deletions
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/detect.mk b/Build/source/libs/freetype2/freetype-src/builds/windows/detect.mk index 759a2e640a9..3eef47aaa9e 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/windows/detect.mk +++ b/Build/source/libs/freetype2/freetype-src/builds/windows/detect.mk @@ -3,7 +3,7 @@ # -# Copyright (C) 1996-2022 by +# Copyright (C) 1996-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/ftdebug.c b/Build/source/libs/freetype2/freetype-src/builds/windows/ftdebug.c index a65f5446941..94c22da7525 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/windows/ftdebug.c +++ b/Build/source/libs/freetype2/freetype-src/builds/windows/ftdebug.c @@ -4,7 +4,7 @@ * * Debugging and logging component for Win32 (body). * - * Copyright (C) 1996-2022 by + * Copyright (C) 1996-2021 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, @@ -136,8 +136,6 @@ va_start( ap, fmt ); vfprintf( stderr, fmt, ap ); -#if ( defined( _WIN32_WINNT ) && _WIN32_WINNT >= 0x0400 ) || \ - ( defined( _WIN32_WCE ) && _WIN32_WCE >= 0x0600 ) if ( IsDebuggerPresent() ) { static char buf[1024]; @@ -146,7 +144,6 @@ vsnprintf( buf, sizeof buf, fmt, ap ); OutputDebugStringA( buf ); } -#endif va_end( ap ); } @@ -162,8 +159,6 @@ va_start( ap, fmt ); vfprintf( stderr, fmt, ap ); -#if ( defined( _WIN32_WINNT ) && _WIN32_WINNT >= 0x0400 ) || \ - ( defined( _WIN32_WCE ) && _WIN32_WCE >= 0x0600 ) if ( IsDebuggerPresent() ) { static char buf[1024]; @@ -172,7 +167,6 @@ vsnprintf( buf, sizeof buf, fmt, ap ); OutputDebugStringA( buf ); } -#endif va_end( ap ); exit( EXIT_FAILURE ); diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/ftsystem.c b/Build/source/libs/freetype2/freetype-src/builds/windows/ftsystem.c index 4f4ac15f331..1ebadd49ff8 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/windows/ftsystem.c +++ b/Build/source/libs/freetype2/freetype-src/builds/windows/ftsystem.c @@ -4,7 +4,7 @@ * * Windows-specific FreeType low-level system interface (body). * - * Copyright (C) 2021-2022 by + * Copyright (C) 2021 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, @@ -196,78 +196,19 @@ } - /* non-desktop Universal Windows Platform */ -#if defined( WINAPI_FAMILY_PARTITION ) && \ - !WINAPI_FAMILY_PARTITION( WINAPI_PARTITION_DESKTOP ) - -#define PACK_DWORD64( hi, lo ) ( ( (DWORD64)(hi) << 32 ) | (DWORD)(lo) ) - -#define CreateFileMapping( a, b, c, d, e, f ) \ - CreateFileMappingFromApp( a, b, c, PACK_DWORD64( d, e ), f ) -#define MapViewOfFile( a, b, c, d, e ) \ - MapViewOfFileFromApp( a, b, PACK_DWORD64( c, d ), e ) +#ifdef _WIN32_WCE FT_LOCAL_DEF( HANDLE ) - CreateFileA( LPCSTR lpFileName, - DWORD dwDesiredAccess, - DWORD dwShareMode, - LPSECURITY_ATTRIBUTES lpSecurityAttributes, - DWORD dwCreationDisposition, - DWORD dwFlagsAndAttributes, - HANDLE hTemplateFile ) + CreateFileA( LPCSTR lpFileName, + DWORD dwDesiredAccess, + DWORD dwShareMode, + LPSECURITY_ATTRIBUTES lpSecurityAttributes, + DWORD dwCreationDisposition, + DWORD dwFlagsAndAttributes, + HANDLE hTemplateFile ) { - int len; - LPWSTR lpFileNameW; - - CREATEFILE2_EXTENDED_PARAMETERS createExParams = { - sizeof ( CREATEFILE2_EXTENDED_PARAMETERS ), - dwFlagsAndAttributes & 0x0000FFFF, - dwFlagsAndAttributes & 0xFFF00000, - dwFlagsAndAttributes & 0x000F0000, - lpSecurityAttributes, - hTemplateFile }; - - - /* allocate memory space for converted path name */ - len = MultiByteToWideChar( CP_ACP, MB_ERR_INVALID_CHARS, - lpFileName, -1, NULL, 0 ); - - lpFileNameW = (LPWSTR)_alloca( len * sizeof ( WCHAR ) ); - - if ( !len || !lpFileNameW ) - { - FT_ERROR(( "FT_Stream_Open: cannot convert file name to LPWSTR\n" )); - return INVALID_HANDLE_VALUE; - } - - /* now it is safe to do the translation */ - MultiByteToWideChar( CP_ACP, MB_ERR_INVALID_CHARS, - lpFileName, -1, lpFileNameW, len ); - - /* open the file */ - return CreateFile2( lpFileNameW, dwDesiredAccess, dwShareMode, - dwCreationDisposition, &createExParams ); - } - -#endif - - -#if defined( _WIN32_WCE ) - - /* malloc.h provides implementation of alloca()/_alloca() */ - #include <malloc.h> - - FT_LOCAL_DEF( HANDLE ) - CreateFileA( LPCSTR lpFileName, - DWORD dwDesiredAccess, - DWORD dwShareMode, - LPSECURITY_ATTRIBUTES lpSecurityAttributes, - DWORD dwCreationDisposition, - DWORD dwFlagsAndAttributes, - HANDLE hTemplateFile ) - { - int len; - LPWSTR lpFileNameW; + int len; + LPWSTR lpFileNameW; /* allocate memory space for converted path name */ @@ -292,15 +233,10 @@ dwFlagsAndAttributes, hTemplateFile ); } -#endif - - -#if defined( _WIN32_WCE ) || defined ( _WIN32_WINDOWS ) || \ - !defined( _WIN32_WINNT ) || _WIN32_WINNT <= 0x0400 FT_LOCAL_DEF( BOOL ) - GetFileSizeEx( HANDLE hFile, - PLARGE_INTEGER lpFileSize ) + GetFileSizeEx( HANDLE hFile, + PLARGE_INTEGER lpFileSize ) { lpFileSize->u.LowPart = GetFileSize( hFile, (DWORD *)&lpFileSize->u.HighPart ); @@ -312,7 +248,7 @@ return TRUE; } -#endif +#endif /* _WIN32_WCE */ /* documentation is in ftobjs.h */ diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/freetype.vcxproj b/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/freetype.vcxproj index 4c9e2b497cf..0d38678dbb7 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/freetype.vcxproj +++ b/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/freetype.vcxproj @@ -485,7 +485,6 @@ <ClCompile Include="..\..\..\src\sfnt\sfnt.c" />
<ClCompile Include="..\..\..\src\smooth\smooth.c" />
<ClCompile Include="..\..\..\src\sdf\sdf.c" />
- <ClCompile Include="..\..\..\src\svg\svg.c" />
<ClCompile Include="..\..\..\src\truetype\truetype.c" />
<ClCompile Include="..\..\..\src\type1\type1.c" />
<ClCompile Include="..\..\..\src\type42\type42.c" />
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/freetype.vcxproj.filters b/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/freetype.vcxproj.filters index 4085f6c4d9b..3f68c826086 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/freetype.vcxproj.filters +++ b/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/freetype.vcxproj.filters @@ -68,9 +68,6 @@ <ClCompile Include="..\..\..\src\smooth\smooth.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\src\svg\svg.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\src\truetype\truetype.c">
<Filter>Source Files</Filter>
</ClCompile>
@@ -146,4 +143,4 @@ <Filter>Source Files</Filter>
</ResourceCompile>
</ItemGroup>
-</Project>
+</Project>
\ No newline at end of file diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/index.html b/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/index.html index 02b9c1b30de..dcb1944b82c 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/index.html +++ b/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/index.html @@ -12,7 +12,7 @@ <p>This directory contains solution and project files for Visual C++ 2010 or newer, named <tt>freetype.sln</tt>, and <tt>freetype.vcxproj</tt>. It compiles the following libraries -from the FreeType 2.12.0 sources:</p> +from the FreeType 2.11.1 sources:</p> <ul> <li>freetype.dll using 'Release' or 'Debug' configurations</li> diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/visualc/freetype.vcproj b/Build/source/libs/freetype2/freetype-src/builds/windows/visualc/freetype.vcproj index a16782c2306..4cbb6b9e73a 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/windows/visualc/freetype.vcproj +++ b/Build/source/libs/freetype2/freetype-src/builds/windows/visualc/freetype.vcproj @@ -435,17 +435,9 @@ </FileConfiguration>
</File>
<File
- RelativePath="..\..\..\src\sdf\sdf.c"
- >
- </File>
- <File
RelativePath="..\..\..\src\smooth\smooth.c"
>
</File>
- <File
- RelativePath="..\..\..\src\svg\svg.c"
- >
- </File>
<Filter
Name="FT_MODULES"
>
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/visualc/index.html b/Build/source/libs/freetype2/freetype-src/builds/windows/visualc/index.html index 0dabfe2b9f0..d0c8f2f9473 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/windows/visualc/index.html +++ b/Build/source/libs/freetype2/freetype-src/builds/windows/visualc/index.html @@ -12,7 +12,7 @@ <p>This directory contains project files <tt>freetype.dsp</tt> for Visual C++ 6.0, and <tt>freetype.vcproj</tt> for Visual C++ 2002 through 2008, which you might need to upgrade automatically. -It compiles the following libraries from the FreeType 2.12.0 sources:</p> +It compiles the following libraries from the FreeType 2.11.1 sources:</p> <ul> <li>freetype.dll using 'Release' or 'Debug' configurations</li> diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/visualce/index.html b/Build/source/libs/freetype2/freetype-src/builds/windows/visualce/index.html index d11978e37c5..b50ef79b060 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/windows/visualce/index.html +++ b/Build/source/libs/freetype2/freetype-src/builds/windows/visualce/index.html @@ -21,7 +21,7 @@ the following targets: <li>PPC/SP WM6 (Windows Mobile 6)</li> </ul> -It compiles the following libraries from the FreeType 2.12.0 sources:</p> +It compiles the following libraries from the FreeType 2.11.1 sources:</p> <ul> <pre> diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-bcc.mk b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-bcc.mk index b88dbac6ed5..d497dd15dc6 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-bcc.mk +++ b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-bcc.mk @@ -3,7 +3,7 @@ # -# Copyright (C) 1996-2022 by +# Copyright (C) 1996-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-bccd.mk b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-bccd.mk index 2be492cef15..701b83d25c7 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-bccd.mk +++ b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-bccd.mk @@ -3,7 +3,7 @@ # -# Copyright (C) 1996-2022 by +# Copyright (C) 1996-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-dev.mk b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-dev.mk index a58f8247d2f..a2f464479ef 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-dev.mk +++ b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-dev.mk @@ -5,7 +5,7 @@ # -# Copyright (C) 1996-2022 by +# Copyright (C) 1996-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-gcc.mk b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-gcc.mk index 52b893339fc..4117453ec33 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-gcc.mk +++ b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-gcc.mk @@ -3,7 +3,7 @@ # -# Copyright (C) 1996-2022 by +# Copyright (C) 1996-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-icc.mk b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-icc.mk index a05a3a7896b..ebab45ef2c6 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-icc.mk +++ b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-icc.mk @@ -3,7 +3,7 @@ # -# Copyright (C) 1996-2022 by +# Copyright (C) 1996-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-intl.mk b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-intl.mk index fb5c96090f1..0fef8d72453 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-intl.mk +++ b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-intl.mk @@ -3,7 +3,7 @@ # -# Copyright (C) 1996-2022 by +# Copyright (C) 1996-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-lcc.mk b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-lcc.mk index 66de0aa5642..7aed5b5177a 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-lcc.mk +++ b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-lcc.mk @@ -3,7 +3,7 @@ # -# Copyright (C) 1996-2022 by +# Copyright (C) 1996-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-mingw32.mk b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-mingw32.mk index e3b89697a6c..6731778855a 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-mingw32.mk +++ b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-mingw32.mk @@ -3,7 +3,7 @@ # -# Copyright (C) 1996-2022 by +# Copyright (C) 1996-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-vcc.mk b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-vcc.mk index 4a48407a27e..278624f375d 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-vcc.mk +++ b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-vcc.mk @@ -3,7 +3,7 @@ # -# Copyright (C) 1996-2022 by +# Copyright (C) 1996-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-wat.mk b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-wat.mk index 4458b23418b..df2ece36569 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-wat.mk +++ b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-wat.mk @@ -3,7 +3,7 @@ # -# Copyright (C) 1996-2022 by +# Copyright (C) 1996-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/win32-def.mk b/Build/source/libs/freetype2/freetype-src/builds/windows/win32-def.mk index eb96181ddc6..15bfd0cfd1a 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/windows/win32-def.mk +++ b/Build/source/libs/freetype2/freetype-src/builds/windows/win32-def.mk @@ -3,7 +3,7 @@ # -# Copyright (C) 1996-2022 by +# Copyright (C) 1996-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, |