3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

[physfs] Fix Win10 GetUserProfileDirectory() problem

Browse Source 
Fixes GetUserProfileDirectory issue on Win10 build 1809(+?)
See: https://hg.icculus.org/icculus/physfs/rev/ece6769c0676
This commit is contained in:
past-due 2018-11-28 18:33:10 -05:00
parent d562441fc9
commit 1225d80d11
3 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/physfs/CONTROL
View File

@ -1,4 +1,4 @@
Source: physfs
Version: 3.0.1
Version: 3.0.1-1
Description: a library to provide abstract access to various archives
Build-Depends: zlib

25
ports/physfs/physfs.3.0.1.GetUserProfileDirectory.patch Normal file
View File

@ -0,0 +1,25 @@
diff -r a29fef4a20fd -r ece6769c0676 src/physfs_platform_windows.c
--- a/src/physfs_platform_windows.c Wed May 16 19:54:51 2018 -0400
+++ b/src/physfs_platform_windows.c Wed Oct 03 22:40:57 2018 -0400
@@ -566,7 +566,6 @@
else
{
DWORD psize = 0;
- WCHAR dummy = 0;
LPWSTR wstr = NULL;
BOOL rc = 0;
@@ -575,7 +574,7 @@
* psize. Also note that the second parameter can't be
* NULL or the function fails.
*/
- rc = pGetDir(accessToken, &dummy, &psize);
+ rc = pGetDir(accessToken, NULL, &psize);
GOTO_IF(rc, PHYSFS_ERR_OS_ERROR, done); /* should have failed! */
/* Allocate memory for the profile directory */

8
ports/physfs/portfile.cmake
View File

@ -6,7 +6,13 @@ vcpkg_download_distfile(ARCHIVE
FILENAME "physfs-${PHYSFS_VERSION}.tar.bz2"
SHA512 ddf3b075ccb506da5e9a1ce96001be402752b9b777c2e816a85d48aff3626ff0886ea43eb07bd300fe3a9f59b9a002f54d822c51d483a4ee94b38378534c1879
)
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
REF ${PHYSFS_VERSION}
PATCHES
physfs.3.0.1.GetUserProfileDirectory.patch # Fixes GetUserProfileDirectory issue on Win10 build 1809(+?); See: https://hg.icculus.org/icculus/physfs/rev/ece6769c0676
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PHYSFS_STATIC)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PHYSFS_SHARED)