cemu-project/vcpkg
1
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2024-11-23 11:19:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[libsndfile] patches applied with #ifdef instead

Browse Source
This commit is contained in:
Aybe 2017-11-21 04:39:13 +01:00
parent 295bb9f454
commit 72fdd294b0
4 changed files with 63 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ports/libsndfile/portfile.cmake
View File

@ -19,14 +19,11 @@ 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/libsndfile-6830c421899e32f8d413a903a21a9b6cf384d369
PATCHES
"${CMAKE_CURRENT_LIST_DIR}/uwp-createfile.patch"
"${CMAKE_CURRENT_LIST_DIR}/uwp-getfilesize.patch"
)
endif()
vcpkg_apply_patches(
SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libsndfile-6830c421899e32f8d413a903a21a9b6cf384d369
PATCHES
"${CMAKE_CURRENT_LIST_DIR}/uwp-createfile-getfilesize.patch"
)
if (VCPKG_CRT_LINKAGE STREQUAL "dynamic")
set(CRT_LIB_STATIC 0)

58
ports/libsndfile/uwp-createfile-getfilesize.patch Normal file
View File

@ -0,0 +1,58 @@
diff --git a/src/file_io.c b/src/file_io.c
index 7cf8f0c..47351bc 100644
--- a/src/file_io.c
+++ b/src/file_io.c
@@ -787,6 +787,19 @@ psf_open_handle (PSF_FILE * pfile)
return NULL ;
} ;
+#if defined (WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
+ if (!pfile->use_wchar)
+ return NULL;
+
+ CREATEFILE2_EXTENDED_PARAMETERS cfParams = {0};
+ cfParams.dwSize = sizeof(CREATEFILE2_EXTENDED_PARAMETERS);
+ cfParams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL;
+
+ handle = CreateFile2(pfile->path.wc, dwDesiredAccess, dwShareMode, dwCreationDistribution, &cfParams);
+
+ if (handle == INVALID_HANDLE_VALUE)
+ return NULL;
+#else
if (pfile->use_wchar)
handle = CreateFileW (
pfile->path.wc, /* pointer to name of the file */
@@ -812,6 +825,7 @@ psf_open_handle (PSF_FILE * pfile)
return NULL ;
return handle ;
+#endif
} /* psf_open_handle */
/* USE_WINDOWS_API */ static void
@@ -1104,7 +1118,16 @@ psf_is_pipe (SF_PRIVATE *psf)
/* USE_WINDOWS_API */ sf_count_t
psf_get_filelen_handle (HANDLE handle)
-{ sf_count_t filelen ;
+{
+#if defined (WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
+ LARGE_INTEGER size;
+
+ if (!GetFileSizeEx(handle, &size) && GetLastError() != NO_ERROR)
+ return (sf_count_t) -1 ;
+
+ return size.QuadPart;
+#else
+ sf_count_t filelen ;
DWORD dwFileSizeLow, dwFileSizeHigh, dwError = NO_ERROR ;
dwFileSizeLow = GetFileSize (handle, &dwFileSizeHigh) ;
@@ -1118,6 +1141,7 @@ psf_get_filelen_handle (HANDLE handle)
filelen = dwFileSizeLow + ((__int64) dwFileSizeHigh << 32) ;
return filelen ;
+#endif
} /* psf_get_filelen_handle */
/* USE_WINDOWS_API */ void

39
ports/libsndfile/uwp-createfile.patch
View File

@ -1,39 +0,0 @@
diff --git a/src/file_io.c b/src/file_io.c
index 7cf8f0c..a47ce6b 100644
--- a/src/file_io.c
+++ b/src/file_io.c
@@ -787,26 +787,14 @@ psf_open_handle (PSF_FILE * pfile)
return NULL ;
} ;
- if (pfile->use_wchar)
- handle = CreateFileW (
- pfile->path.wc, /* pointer to name of the file */
- dwDesiredAccess, /* access (read-write) mode */
- dwShareMode, /* share mode */
- 0, /* pointer to security attributes */
- dwCreationDistribution, /* how to create */
- FILE_ATTRIBUTE_NORMAL, /* file attributes (could use FILE_FLAG_SEQUENTIAL_SCAN) */
- NULL /* handle to file with attributes to copy */
- ) ;
- else
- handle = CreateFile (
- pfile->path.c, /* pointer to name of the file */
- dwDesiredAccess, /* access (read-write) mode */
- dwShareMode, /* share mode */
- 0, /* pointer to security attributes */
- dwCreationDistribution, /* how to create */
- FILE_ATTRIBUTE_NORMAL, /* file attributes (could use FILE_FLAG_SEQUENTIAL_SCAN) */
- NULL /* handle to file with attributes to copy */
- ) ;
+ if (!pfile->use_wchar)
+ return NULL;
+
+ CREATEFILE2_EXTENDED_PARAMETERS cfParams = {0};
+ cfParams.dwSize = sizeof(CREATEFILE2_EXTENDED_PARAMETERS);
+ cfParams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL;
+
+ handle = CreateFile2(pfile->path.wc, dwDesiredAccess, dwShareMode, dwCreationDistribution, &cfParams);
if (handle == INVALID_HANDLE_VALUE)
return NULL ;

29
ports/libsndfile/uwp-getfilesize.patch
View File

@ -1,29 +0,0 @@
diff --git a/src/file_io.c b/src/file_io.c
index a47ce6b..4b38455 100644
--- a/src/file_io.c
+++ b/src/file_io.c
@@ -1093,19 +1093,16 @@ psf_is_pipe (SF_PRIVATE *psf)
/* USE_WINDOWS_API */ sf_count_t
psf_get_filelen_handle (HANDLE handle)
{ sf_count_t filelen ;
- DWORD dwFileSizeLow, dwFileSizeHigh, dwError = NO_ERROR ;
+ DWORD dwError = NO_ERROR ;
+ LARGE_INTEGER size;
- dwFileSizeLow = GetFileSize (handle, &dwFileSizeHigh) ;
-
- if (dwFileSizeLow == 0xFFFFFFFF)
- dwError = GetLastError () ;
+ if (!GetFileSizeEx(handle, &size))
+ dwError = GetLastError();
if (dwError != NO_ERROR)
return (sf_count_t) -1 ;
- filelen = dwFileSizeLow + ((__int64) dwFileSizeHigh << 32) ;
-
- return filelen ;
+ return size.QuadPart;
} /* psf_get_filelen_handle */
/* USE_WINDOWS_API */ void