[libflac] patches for UWP builds

6 files changed, 118 insertions, 6 deletions

diff --git a/ports/libflac/CONTROL b/ports/libflac/CONTROL
index 2a0572d2a..ca2995d68 100644
--- a/ports/libflac/CONTROL
+++ b/ports/libflac/CONTROL
@@ -1,4 +1,4 @@
 Source: libflac

-Version: 1.3.2-3

+Version: 1.3.2-4

 Description: Library for manipulating FLAC files

 Build-Depends: libogg

diff --git a/ports/libflac/portfile.cmake b/ports/libflac/portfile.cmake
index cbf7d6fd3..7657e3927 100644
--- a/ports/libflac/portfile.cmake
+++ b/ports/libflac/portfile.cmake
@@ -1,8 +1,3 @@
- # libFLAC uses winapi functions not available in WindowsStore

-if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)

-    message(FATAL_ERROR "Error: UWP builds are currently not supported.")

-endif()

-

 include(vcpkg_common_functions)

 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/flac-1.3.2)

 vcpkg_download_distfile(ARCHIVE

@@ -12,6 +7,17 @@ vcpkg_download_distfile(ARCHIVE
 

 vcpkg_extract_source_archive(${ARCHIVE})

 

+if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)

+    vcpkg_apply_patches(

+        SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/flac-1.3.2

+        PATCHES

+        "${CMAKE_CURRENT_LIST_DIR}/uwp-consolewidth.patch"

+        "${CMAKE_CURRENT_LIST_DIR}/uwp-loadlibrary.patch"

+        "${CMAKE_CURRENT_LIST_DIR}/uwp-createfile.patch"

+        "${CMAKE_CURRENT_LIST_DIR}/uwp-writeconsole.patch"

+        )

+endif()

+

 if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86)

     vcpkg_find_acquire_program(NASM)

     get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)

diff --git a/ports/libflac/uwp-consolewidth.patch b/ports/libflac/uwp-consolewidth.patch
new file mode 100644
index 000000000..87a15f663
--- /dev/null
+++ b/ports/libflac/uwp-consolewidth.patch
@@ -0,0 +1,16 @@
+diff --git a/src/share/win_utf8_io/win_utf8_io.c b/src/share/win_utf8_io/win_utf8_io.c
+index c61d27f..5b0e8f0 100644
+--- a/src/share/win_utf8_io/win_utf8_io.c
++++ b/src/share/win_utf8_io/win_utf8_io.c
+@@ -164,11 +164,6 @@ size_t strlen_utf8(const char *str)
+ int win_get_console_width(void)
+ {
+ 	int width = 80;
+-	CONSOLE_SCREEN_BUFFER_INFO csbi;
+-	HANDLE hOut = GetStdHandle(STD_OUTPUT_HANDLE);
+-	if(hOut != INVALID_HANDLE_VALUE && hOut != NULL)
+-		if (GetConsoleScreenBufferInfo(hOut, &csbi) != 0)
+-			width = csbi.dwSize.X;
+ 	return width;
+ }
+ 
diff --git a/ports/libflac/uwp-createfile.patch b/ports/libflac/uwp-createfile.patch
new file mode 100644
index 000000000..348e66b0a
--- /dev/null
+++ b/ports/libflac/uwp-createfile.patch
@@ -0,0 +1,38 @@
+diff --git a/src/libFLAC/windows_unicode_filenames.c b/src/libFLAC/windows_unicode_filenames.c
+index 2404e31..6d8bc74 100644
+--- a/src/libFLAC/windows_unicode_filenames.c
++++ b/src/libFLAC/windows_unicode_filenames.c
+@@ -185,17 +185,23 @@ int flac_internal_rename_utf8(const char *oldname, const char *newname)
+ 
+ HANDLE WINAPI flac_internal_CreateFile_utf8(const char *lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile)
+ {
+-	if (!utf8_filenames) {
+-		return CreateFileA(lpFileName, dwDesiredAccess, dwShareMode, lpSecurityAttributes, dwCreationDisposition, dwFlagsAndAttributes, hTemplateFile);
+-	} else {
+-		wchar_t *wname;
+-		HANDLE handle = INVALID_HANDLE_VALUE;
+-
+-		if ((wname = wchar_from_utf8(lpFileName)) != NULL) {
+-			handle = CreateFileW(wname, dwDesiredAccess, dwShareMode, lpSecurityAttributes, dwCreationDisposition, dwFlagsAndAttributes, hTemplateFile);
+-			free(wname);
+-		}
++	HANDLE handle = INVALID_HANDLE_VALUE;
+ 
++	if (!utf8_filenames)
+ 		return handle;
++
++	wchar_t *wname;
++
++	if ((wname = wchar_from_utf8(lpFileName)) != NULL)
++	{
++		CREATEFILE2_EXTENDED_PARAMETERS cfParams = {0};
++		cfParams.dwSize = sizeof(CREATEFILE2_EXTENDED_PARAMETERS);
++		cfParams.dwFileAttributes = dwFlagsAndAttributes & FILE_ATTRIBUTE_NORMAL;
++		cfParams.lpSecurityAttributes = lpSecurityAttributes;
++		cfParams.hTemplateFile = hTemplateFile;
++		handle = CreateFile2(wname, dwDesiredAccess, dwShareMode, dwCreationDisposition, &cfParams);
++		free(wname);
+ 	}
++
++	return handle;
+ }
diff --git a/ports/libflac/uwp-loadlibrary.patch b/ports/libflac/uwp-loadlibrary.patch
new file mode 100644
index 000000000..5d0b10df9
--- /dev/null
+++ b/ports/libflac/uwp-loadlibrary.patch
@@ -0,0 +1,13 @@
+diff --git a/src/share/win_utf8_io/win_utf8_io.c b/src/share/win_utf8_io/win_utf8_io.c
+index 5b0e8f0..15a76d4 100644
+--- a/src/share/win_utf8_io/win_utf8_io.c
++++ b/src/share/win_utf8_io/win_utf8_io.c
+@@ -110,7 +110,7 @@ int get_utf8_argv(int *argc, char ***argv)
+ 	char **utf8argv;
+ 	int ret, i;
+ 
+-	if ((handle = LoadLibrary("msvcrt.dll")) == NULL) return 1;
++	if ((handle = LoadPackagedLibrary("msvcrt.dll", 0)) == NULL) return 1;
+ 	if ((wgetmainargs = (wgetmainargs_t)GetProcAddress(handle, "__wgetmainargs")) == NULL) {
+ 		FreeLibrary(handle);
+ 		return 1;
diff --git a/ports/libflac/uwp-writeconsole.patch b/ports/libflac/uwp-writeconsole.patch
new file mode 100644
index 000000000..feef96305
--- /dev/null
+++ b/ports/libflac/uwp-writeconsole.patch
@@ -0,0 +1,39 @@
+diff --git a/src/share/win_utf8_io/win_utf8_io.c b/src/share/win_utf8_io/win_utf8_io.c
+index 15a76d4..bfcc9db 100644
+--- a/src/share/win_utf8_io/win_utf8_io.c
++++ b/src/share/win_utf8_io/win_utf8_io.c
+@@ -171,31 +171,13 @@ int win_get_console_width(void)
+ 
+ static int wprint_console(FILE *stream, const wchar_t *text, size_t len)
+ {
+-	DWORD out;
+-	int ret;
++	// disabled for UWP (https://docs.microsoft.com/en-us/uwp/win32-and-com/alternatives-to-windows-apis-uwp)
+ 
+-	do {
+-		if (stream == stdout) {
+-			HANDLE hOut = GetStdHandle(STD_OUTPUT_HANDLE);
+-			if (hOut == INVALID_HANDLE_VALUE || hOut == NULL || GetFileType(hOut) != FILE_TYPE_CHAR)
+-				break;
+-			if (WriteConsoleW(hOut, text, len, &out, NULL) == 0)
+-				return -1;
+-			return out;
+-		}
+-		if (stream == stderr) {
+-			HANDLE hErr = GetStdHandle(STD_ERROR_HANDLE);
+-			if (hErr == INVALID_HANDLE_VALUE || hErr == NULL || GetFileType(hErr) != FILE_TYPE_CHAR)
+-				break;
+-			if (WriteConsoleW(hErr, text, len, &out, NULL) == 0)
+-				return -1;
+-			return out;
+-		}
+-	} while(0);
++	int ret = fputws(text, stream);
+ 
+-	ret = fputws(text, stream);
+ 	if (ret < 0)
+ 		return ret;
++
+ 	return len;
+ }
+