[Git][freetype/freetype][master] [builds/windows] Try both wide and narrow `CreateFile`

[Alexei Podtelezhnikov (@apodtele)]

Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType

Commits:

• 0b429b60
  by Alexei Podtelezhnikov at 2021-09-17T08:31:27-04:00

  [builds/windows] Try both wide and narrow `CreateFile`
  
  Windows handles wchar_t* UTF-16 and char* ANSI (presently UTF-8)
  filenames using alternative -A and -W API. We'll try them both
  when opening a file. This means that you should not worry about
  about conversions.
  
  Fixes #1098 and !76.
  
  * builds/windows/ftsystem.c (FT_Stream_Open): Call alternative
  `CreateFile` in the case of failure.
  

1 changed file:

• builds/windows/ftsystem.c

Changes:

builds/windows/ftsystem.c

---

...	...	@@ -215,9 +215,21 @@
215	215	NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0 );
216	216	if ( file == INVALID_HANDLE_VALUE )
217	217	{
218		- FT_ERROR(( "FT_Stream_Open:" ));
219		- FT_ERROR(( " could not open `%s'\n", filepathname ));
220		- return FT_THROW( Cannot_Open_Resource );
	218	+ /* fall back on the alernative interface */
	219	+#ifdef UNICODE
	220	+ file = CreateFileA( (LPCSTR)filepathname, GENERIC_READ, FILE_SHARE_READ,
	221	+ NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0 );
	222	+#else
	223	+ file = CreateFileW( (LPCWSTR)filepathname, GENERIC_READ, FILE_SHARE_READ,
	224	+ NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0 );
	225	+#endif
	226	+
	227	+ if ( file == INVALID_HANDLE_VALUE )
	228	+ {
	229	+ FT_ERROR(( "FT_Stream_Open:" ));
	230	+ FT_ERROR(( " could not open `%s'\n", filepathname ));
	231	+ return FT_THROW( Cannot_Open_Resource );
	232	+ }
221	233	}
222	234
223	235	#if defined _WIN32_WCE || defined _WIN32_WINDOWS || \

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings.