@@ -1,17 +0,0 @@

---- iconv/srclib/stdio-write.c.orig    2013-08-15 11:50:20.508093720 +0200

-+++ iconv/srclib/stdio-write.c 2013-08-15 11:51:36.344096864 +0200

-@@ -20,6 +20,14 @@

- /* Specification.  */

- #include <stdio.h>

- 

-+#ifdef _WIN32

-+#include <winapifamily.h>

-+

-+#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

-+#define GetFileType(h) FILE_TYPE_UNKNOWN

-+#endif

-+#endif

-+

- /* Replace these functions only if module 'nonblocking' or module 'sigpipe' is

-    requested.  */

- #if GNULIB_NONBLOCKING || GNULIB_SIGPIPE

​

@@ -1,47 +0,0 @@

---- libxml2/xmlIO.c.orig   2018-03-07 15:31:01.821589739 +0100

-+++ libxml2/xmlIO.c    2018-03-07 15:31:21.717589238 +0100

-@@ -3709,44 +3709,7 @@

-  */

- char *

- xmlParserGetDirectory(const char *filename) {

--    char *ret = NULL;

--    char dir1024;

--    char *cur;

--

--#ifdef _WIN32_WCE  /* easy way by now ... wince does not have dirs! */

-     return NULL;

--#endif

--

--    if (xmlInputCallbackInitialized == 0)

--  xmlRegisterDefaultInputCallbacks();

--

--    if (filename == NULL) return(NULL);

--

--#if defined(_WIN32) && !defined(__CYGWIN__)

--#   define IS_XMLPGD_SEP(ch) ((ch=='/')||(ch=='\\'))

--#else

--#   define IS_XMLPGD_SEP(ch) (ch=='/')

--#endif

--

--    strncpy(dir, filename, 1023);

--    dir1023 = 0;

--    cur = &dirstrlen(dir);

--    while (cur > dir) {

--         if (IS_XMLPGD_SEP(*cur)) break;

--   cur --;

--    }

--    if (IS_XMLPGD_SEP(*cur)) {

--        if (cur == dir) dir1 = 0;

--  else *cur = 0;

--  ret = xmlMemStrdup(dir);

--    } else {

--        if (getcwd(dir, 1024) != NULL) {

--      dir1023 = 0;

--      ret = xmlMemStrdup(dir);

--  }

--    }

--    return(ret);

--#undef IS_XMLPGD_SEP

- }

- 

- /****************************************************************

​

@@ -1,70 +0,0 @@

---- orc/configure.ac.orig  2016-06-20 13:07:27.584543779 +0000

-+++ orc/configure.ac   2016-06-20 13:14:21.920651349 +0000

-@@ -90,20 +90,7 @@

-   AS_COMPILER_FLAG(-Werror, ERROR_CFLAGS="-Werror")

- fi

- 

--case "${host_os}" in

--  nobody_is_using_this_currently)

--    AC_DEFINE(HAVE_CODEMEM_MALLOC, 1, Use malloc to allocate code for execution)

--    ;;

--  mingw*|pw32*|cygwin*)

--    AC_DEFINE(HAVE_CODEMEM_VIRTUALALLOC, 1, Use VirtualAlloc to allocate code for execution)

--    ;;

--  linux*|darwin*|solaris*|netbsd*|freebsd*|openbsd*|kfreebsd*|dragonfly*|gnu*)

--    AC_DEFINE(HAVE_CODEMEM_MMAP, 1, Use mmap to allocate code for execution)

--    ;;

--  *)

--    AC_ERROR(no code allocation backend)

--    ;;

--esac

-+AC_CHECK_FUNCS(VirtualAlloc mmap)

- 

- case "${host_os}" in

-   mingw*|pw32*|cygwin*)

---- orc/orc/orccodemem.c.orig  2016-06-20 16:43:22.126619599 +0200

-+++ orc/orc/orccodemem.c   2016-06-20 16:45:03.370771546 +0200

-@@ -11,10 +11,10 @@

- #include <sys/types.h>

- #include <sys/stat.h>

- #include <fcntl.h>

--#ifdef HAVE_CODEMEM_MMAP

-+#ifdef HAVE_MMAP

- #include <sys/mman.h>

- #endif

--#ifdef HAVE_CODEMEM_VIRTUALALLOC

-+#ifdef HAVE_VIRTUALALLOC

- #include <windows.h>

- #endif

- 

-@@ -190,7 +190,7 @@

-   }

- }

- 

--#ifdef HAVE_CODEMEM_MMAP

-+#ifdef HAVE_MMAP

- int

- orc_code_region_allocate_codemem_dual_map (OrcCodeRegion *region,

-     const char *dir, int force_unlink)

-@@ -285,9 +285,7 @@

-       "and $TMPDIR and $HOME are mounted noexec (bad).");

- }

- 

--#endif

--

--#ifdef HAVE_CODEMEM_VIRTUALALLOC

-+#elif defined(HAVE_VIRTUALALLOC)

- void

- orc_code_region_allocate_codemem (OrcCodeRegion *region)

- {

-@@ -295,9 +293,7 @@

-   region->exec_ptr = region->write_ptr;

-   region->size = SIZE;

- }

--#endif

--

--#ifdef HAVE_CODEMEM_MALLOC

-+#else

- void

- orc_code_region_allocate_codemem (OrcCodeRegion *region)

- {

​

@@ -143,7 +143,7 @@

 ../modules/plugins.dat: vlc-cache-gen$(EXEEXT)

    $(AM_V_at)rm -f ../modules/plugins.dat

    $(AM_V_GEN)if test "$(build)" = "$(host)"; then \

-       ./vlc-cache-gen$(EXEEXT) `realpath ../modules` ; \

+       ./vlc-cache-gen$(EXEEXT) `cd "../modules" ; pwd -P` ; \

    else \

        echo "Cross-compilation: cache generation skipped!" ; \

    fi

​

@@ -521,9 +521,6 @@

 /* host which ran configure */

 #mesondefine VLC_COMPILE_HOST

-/* Define to 1 if building for Windows Store. */

-#mesondefine VLC_WINSTORE_APP

-

 #ifdef _WIN32

 /* Define to limit the scope of <windows.h>. */

​

@@ -423,7 +423,6 @@

     LDFLAGS="${LDFLAGS} -lwindowsappcompat"

     VLC_ADD_LIBS(libvlccore, -lruntimeobject)

     AC_LIBOBJ(gai_strerror)

-    AC_DEFINE(VLC_WINSTORE_APP, 1, Define to 1 if building for Windows Store.)

   ,)

   AC_SUBST(LIBCOM)

   AC_SUBST(LIBCOMCXXFLAGS)

​

@@ -1,1 +1,1 @@

-2c931ef7d38ade88a96041e0012605a5d25ec484bb2134f58310cf1a2c7212a869797cef99e2e751c8a6b3c473ba1f8762d4a5d41466d38cb5e31bf664a25f55  AMF-1.4.26.tar.gz

+43d7d3c05cb385cc5b0b76562dae3f8d5fb0123300291019ddce1032eec55a664290bd9b0552073d3a5cc7036886a015d9edb1f17e2f0f8ffd07acf57360ec18  AMF-1.4.29.tar.gz

​

@@ -1,6 +1,6 @@

 # AMF

-AMF_VERSION := 1.4.26

+AMF_VERSION := 1.4.29

 AMF_URL := $(GITHUB)/GPUOpen-LibrariesAndSDKs/AMF/archive/refs/tags/v$(AMF_VERSION).tar.gz

 ifeq ($(ARCH),x86_64)

​

@@ -4,7 +4,7 @@

 ARIBB25_URL := $(VIDEOLAN)/aribb25/$(ARIBB25_VERSION)/aribb25-$(ARIBB25_VERSION).tar.gz

 ifdef HAVE_WIN32

-ifndef HAVE_WINSTORE

+ifndef HAVE_WINSTORE # aribb25 uses ANSI strings in WIDE APIs

 PKGS += aribb25

 endif

 endif

​

@@ -6,7 +6,7 @@

 ifndef HAVE_IOS

 ifndef HAVE_ANDROID

-ifndef HAVE_WINSTORE

+ifndef HAVE_WINSTORE # FIXME uses some fordbidden SetErrorModes, GetModuleFileName in fileio.cpp

 PKGS += asdcplib

 endif

 endif

​

@@ -1,1 +1,1 @@

-1d2fd02fb2669de7f38ecfa0fe79e3c89da93e09c3cf6bf7b7b811a4808a06fd702da27ba1d9223c9a8a943198e7961b06c808a07e17d6cc6ba2ce70fd802300  libass-0.16.0.tar.gz

+29c3f82e8d68ffc403941805202c4756b65cf48aeadbe9ae5e307ee4f52a5e4d916330ad26ec322aa92ddc72a4f01633033f9f628dbb8d8653a74b3e6eb7f735  libass-0.17.1.tar.gz

​

@@ -1,5 +1,5 @@

 # ASS

-ASS_VERSION := 0.16.0

+ASS_VERSION := 0.17.1

 ASS_URL := $(GITHUB)/libass/libass/releases/download/$(ASS_VERSION)/libass-$(ASS_VERSION).tar.gz

 PKGS += ass

@@ -9,26 +9,21 @@

 ifdef HAVE_ANDROID

 WITH_FONTCONFIG = 0

-WITH_HARFBUZZ = 1

 ifeq ($(ANDROID_ABI), x86)

 WITH_ASS_ASM = 0

 endif

 else

 ifdef HAVE_DARWIN_OS

 WITH_FONTCONFIG = 0

-WITH_HARFBUZZ = 1

 else

 ifdef HAVE_WIN32

 WITH_FONTCONFIG = 0

-WITH_HARFBUZZ = 1

 WITH_DWRITE = 1

 else

 ifdef HAVE_EMSCRIPTEN

 WITH_FONTCONFIG = 0

-WITH_HARFBUZZ = 1

 else

 WITH_FONTCONFIG = 1

-WITH_HARFBUZZ = 1

 endif

 endif

 endif

@@ -44,7 +39,7 @@

    $(call pkg_static,"libass.pc.in")

    $(MOVE)

-DEPS_ass = freetype2 $(DEPS_freetype2) fribidi $(DEPS_fribidi) iconv $(DEPS_iconv)

+DEPS_ass = freetype2 $(DEPS_freetype2) fribidi $(DEPS_fribidi) iconv $(DEPS_iconv) harfbuzz $(DEPS_harfbuzz)

 ASS_CONF = --disable-test

 ifneq ($(WITH_FONTCONFIG), 0)

@@ -57,12 +52,6 @@

 ASS_CONF += --enable-directwrite

 endif

-ifneq ($(WITH_HARFBUZZ), 0)

-DEPS_ass += harfbuzz $(DEPS_harfbuzz)

-else

-ASS_CONF += --disable-harfbuzz

-endif

-

 ifeq ($(WITH_ASS_ASM), 0)

 ASS_CONF += --disable-asm

 endif

​

@@ -4,7 +4,7 @@

 ifndef HAVE_DARWIN_OS

 ifndef HAVE_LINUX # see VLC Trac 17251

-ifndef HAVE_WINSTORE

+ifndef HAVE_WINSTORE # FIXME uses ANSI calls improperly

 PKGS += caca

 endif

 endif

​

@@ -24,10 +24,10 @@

 FXC2_CXX=aarch64-w64-mingw32-g++

 FXC2_DLL=dll/d3dcompiler_47_arm64.dll

 else ifeq ($(ARCH),x86_64)

-FXC2_CXX=$(CXX)

+FXC2_CXX=$(CXX:uwp-g++=-g++)

 FXC2_DLL=dll/d3dcompiler_47.dll

 else ifeq ($(ARCH),i386)

-FXC2_CXX=$(CXX)

+FXC2_CXX=$(CXX:uwp-g++=-g++)

 FXC2_DLL=dll/d3dcompiler_47_32.dll

 else ifeq ($(shell command -v x86_64-w64-mingw32-g++ >/dev/null 2>&1 || echo FAIL),)

 FXC2_CXX=x86_64-w64-mingw32-g++

​

@@ -1,38 +1,42 @@

---- gcrypt/random/rndw32.c.orig    2020-03-03 13:49:52.000000000 +0100

-+++ gcrypt/random/rndw32.c 2022-10-12 09:50:46.728155400 +0200

-@@ -338,7 +355,11 @@ read_mbm_data (void (*add)(const void*,

+From 9e794b8b2065d233e21f378217705df6985f6a18 Mon Sep 17 00:00:00 2001

+From: Steve Lhomme <robux4@ycbcr.xyz>

+Date: Fri, 19 Jun 2020 10:40:06 +0200

+Subject: PATCH 7/8 random: don't use API's that are forbidden in UWP apps to

+ init the random generator

+

+---

+ random/rndw32.c | 30 +++++++++++++++++++++++++-----

+ 1 file changed, 25 insertions(+), 5 deletions(-)

+

+diff --git a/random/rndw32.c b/random/rndw32.c

+index b3f63d20..02d20cc3 100644

+--- a/random/rndw32.c

++++ b/random/rndw32.c

+@@ -338,6 +338,7 @@ read_mbm_data (void (*add)(const void*, size_t, enum random_origins),

    HANDLE hMBMData;

    SharedData *mbmDataPtr;

-+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

++#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)

    hMBMData = OpenFileMapping (FILE_MAP_READ, FALSE, "$M$B$M$5$S$D$" );

-+#else /* !WINAPI_PARTITION_DESKTOP */

-+  hMBMData = NULL;

-+#endif /* !WINAPI_PARTITION_DESKTOP */

    if (hMBMData)

      {

-       mbmDataPtr = (SharedData*)MapViewOfFile (hMBMData, FILE_MAP_READ,0,0,0);

-@@ -439,8 +460,12 @@ registry_poll (void (*add)(const void*,

-           if ( debug_me )

-             log_debug ("rndw32#slow_gatherer_nt: get perf data\n" );

- 

-+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

-           status = RegQueryValueEx (HKEY_PERFORMANCE_DATA, "Global", NULL,

-                                     NULL, (LPBYTE) pPerfData, &dwSize);

-+#else /* !WINAPI_PARTITION_DESKTOP */

-+          status = ERROR_NO_DATA;

-+#endif /* !WINAPI_PARTITION_DESKTOP */

-           if (status == ERROR_SUCCESS)

-             {

-               if (!memcmp (pPerfData->Signature, L"PERF", 8))

-@@ -473,12 +498,14 @@ registry_poll (void (*add)(const void*,

-       xfree (pPerfData);

+@@ -352,6 +353,7 @@ read_mbm_data (void (*add)(const void*, size_t, enum random_origins),

+         }

+       CloseHandle (hMBMData);

      }

++#endif /* WINAPI_PARTITION_DESKTOP */

+ }

-+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

-   /* Although this isn't documented in the Win32 API docs, it's necessary

-      to explicitly close the HKEY_PERFORMANCE_DATA key after use (it's

-      implicitly opened on the first call to RegQueryValueEx()).  If this

+ 

+@@ -360,6 +362,7 @@ static void

+ registry_poll (void (*add)(const void*, size_t, enum random_origins),

+                enum random_origins requester)

+ {

++#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)

+   static int cbPerfData = PERFORMANCE_BUFFER_SIZE;

+   int iterations;

+   DWORD dwSize, status;

+@@ -479,6 +482,7 @@ registry_poll (void (*add)(const void*, size_t, enum random_origins),

       isn't done then any system components which provide performance data

       can't be removed or changed while the handle remains active.  */

    RegCloseKey (HKEY_PERFORMANCE_DATA);

@@ -40,111 +44,117 @@

  }

-@@ -501,6 +528,7 @@ slow_gatherer ( void (*add)(const void*,

+@@ -497,6 +501,7 @@ slow_gatherer ( void (*add)(const void*, size_t, enum random_origins),

+ 

+   if ( !is_initialized )

+     {

++#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)

+       HKEY hKey;

        if ( debug_me )

-         log_debug ("rndw32#slow_gatherer: init toolkit\n" );

-+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

-       /* Find out whether this is an NT server or workstation if necessary */

-       if (RegOpenKeyEx (HKEY_LOCAL_MACHINE,

-                         "SYSTEM\\CurrentControlSet\\Control\\ProductOptions",

-@@ -550,6 +578,7 @@ slow_gatherer ( void (*add)(const void*,

-               log_debug ("rndw32: No NETAPI found\n" );

-             }

+@@ -566,6 +571,10 @@ slow_gatherer ( void (*add)(const void*, size_t, enum random_origins),

+           if (!pNtQuerySystemInformation || !pNtQueryInformationProcess)

+             hNTAPI = NULL;

+         }

++#else /* !WINAPI_PARTITION_DESKTOP */

++      hNetAPI32 = NULL;

++      hNTAPI = NULL;

++#endif /* !WINAPI_PARTITION_DESKTOP */

+ 

+ 

+       is_initialized = 1;

+@@ -595,6 +604,7 @@ slow_gatherer ( void (*add)(const void*, size_t, enum random_origins),

+       }

+   }

+ 

++#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)

+   /* Get disk I/O statistics for all the hard drives.  100 is an

+      arbitrary failsafe limit.  */

+   for (drive_no = 0; drive_no < 100 ; drive_no++)

+@@ -629,6 +639,7 @@ slow_gatherer ( void (*add)(const void*, size_t, enum random_origins),

          }

+       CloseHandle (hDevice);

+     }

 +#endif /* WINAPI_PARTITION_DESKTOP */

-       /* Initialize the NT kernel native API function pointers if necessary */

-       hNTAPI = GetModuleHandle ("NTDll.dll");

-@@ -794,10 +823,12 @@ _gcry_rndw32_gather_random (void (*add)(

-       if ((s = getenv ("GCRYPT_RNDW32_DBG")) && atoi (s) > 0)

-         debug_me = 1;

+   /* In theory we should be using the Win32 performance query API to obtain

+      unpredictable data from the system, however this is so unreliable (see

+@@ -788,6 +799,7 @@ _gcry_rndw32_gather_random (void (*add)(const void*, size_t,

+ 

+   if (!is_initialized)

+     {

++#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)

+       OSVERSIONINFO osvi = { sizeof( osvi ) };

+       const char *s;

-+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

-       GetVersionEx( &osvi );

+@@ -798,7 +810,9 @@ _gcry_rndw32_gather_random (void (*add)(const void*, size_t,

        if (osvi.dwPlatformId != VER_PLATFORM_WIN32_NT)

          log_fatal ("can only run on a Windows NT platform\n" );

        system_is_w2000 = (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0);

-+#endif /* WINAPI_PARTITION_DESKTOP */

- 

+-

++#else /* !WINAPI_PARTITION_DESKTOP */

++      system_is_w2000 = 0;

++#endif /* !WINAPI_PARTITION_DESKTOP */

        init_system_rng ();

        is_initialized = 1;

-@@ -856,22 +887,28 @@ _gcry_rndw32_gather_random_fast (void (*

+     }

+@@ -856,14 +870,11 @@ _gcry_rndw32_gather_random_fast (void (*add)(const void*, size_t,

                          ADDINT((SIZE_T)aptr);                      \

                        } while (0)

-+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

++#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)

      ADDPTR ( GetActiveWindow ());

      ADDPTR ( GetCapture ());

      ADDPTR ( GetClipboardOwner ());

      ADDPTR ( GetClipboardViewer ());

-+#endif /* WINAPI_PARTITION_DESKTOP */

-     ADDPTR ( GetCurrentProcess ());

-     ADDINT ( GetCurrentProcessId ());

-     ADDPTR ( GetCurrentThread ());

-     ADDINT ( GetCurrentThreadId ());

-+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

+-    ADDPTR ( GetCurrentProcess ());

+-    ADDINT ( GetCurrentProcessId ());

+-    ADDPTR ( GetCurrentThread ());

+-    ADDINT ( GetCurrentThreadId ());

      ADDPTR ( GetDesktopWindow ());

      ADDPTR ( GetFocus ());

      ADDINT ( GetInputState ());

-     ADDINT ( GetMessagePos ());

-     ADDINT ( GetMessageTime ());

+@@ -872,6 +883,11 @@ _gcry_rndw32_gather_random_fast (void (*add)(const void*, size_t,

      ADDPTR ( GetOpenClipboardWindow ());

-+#endif /* WINAPI_PARTITION_DESKTOP */

      ADDPTR ( GetProcessHeap ());

-+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

      ADDPTR ( GetProcessWindowStation ());

 +#endif /* WINAPI_PARTITION_DESKTOP */

++    ADDPTR ( GetCurrentProcess ());

++    ADDINT ( GetCurrentProcessId ());

++    ADDPTR ( GetCurrentThread ());

++    ADDINT ( GetCurrentThreadId ());

      /* Following function in some cases stops returning events, and cannot

         be used as an entropy source.  */

      /*ADDINT ( GetQueueStatus (QS_ALLEVENTS));*/

-@@ -883,6 +920,7 @@ _gcry_rndw32_gather_random_fast (void (*

- #undef ADDPTR

-   }

+@@ -885,6 +901,7 @@ _gcry_rndw32_gather_random_fast (void (*add)(const void*, size_t,

-+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

    /* Get multiword system information: Current caret position, current

       mouse cursor position.  */

++#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)

    {

-@@ -893,6 +931,7 @@ _gcry_rndw32_gather_random_fast (void (*

-     GetCursorPos (&point);

-     (*add) ( &point, sizeof (point), origin );

-   }

​

@@ -1,7 +1,7 @@

-From 1b09aa078628e93c0f95f0d5e20e708f81068bf5 Mon Sep 17 00:00:00 2001

+From 0673f231f333179d4698877ec40cdf43bf5b77c1 Mon Sep 17 00:00:00 2001

 From: Steve Lhomme <robux4@ycbcr.xyz>

 Date: Fri, 19 Jun 2020 10:37:50 +0200

-Subject: PATCH 8/9 random: only use wincrypt in UWP builds if WINSTORECOMPAT

+Subject: PATCH 5/5 random: only use wincrypt in UWP builds if WINSTORECOMPAT

  is set

 This is a compatibility library to use older APIs that are forbidden in UWP apps.

@@ -9,39 +9,53 @@

 bcrypt is supposed to be used instead of wincrypt but is only available since

 Vista.

 ---

- random/rndw32.c | 17 +++++++++++++++++

+ random/rndw32.c | 22 ++++++++++++++++++++--

  src/Makefile.am |  4 +++-

- 2 files changed, 20 insertions(+), 1 deletion(-)

+ 2 files changed, 23 insertions(+), 3 deletions(-)

 diff --git a/random/rndw32.c b/random/rndw32.c

-index 45d1e7e7..8b0a38fa 100644

+index 02d20cc3..f1b559e9 100644

 --- a/random/rndw32.c

 +++ b/random/rndw32.c

-@@ -98,6 +98,9 @@

+@@ -97,7 +97,11 @@

+ #define SIZEOF_DISK_PERFORMANCE_STRUCT 256

  /* We don't include wincrypt.h so define it here.  */

- #define HCRYPTPROV  HANDLE

 +#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) && defined(WINSTORECOMPAT)

 +#include <wincrypt.h>

++#else

+ #define HCRYPTPROV  HANDLE

 +#endif

  /* When we query the performance counters, we allocate an initial buffer and

-@@ -260,6 +263,7 @@ init_system_rng (void)

+@@ -114,7 +118,7 @@

+ 

+ /* Intel Chipset CSP type and name */

+ #define PROV_INTEL_SEC  22

+-#define INTEL_DEF_PROV  "Intel Hardware Cryptographic Service Provider"

++#define INTEL_DEF_PROV  TEXT("Intel Hardware Cryptographic Service Provider")

+ 

+ 

+ 

+@@ -258,8 +262,9 @@ static void

+ init_system_rng (void)

+ {

    system_rng_available = 0;

-   hRNGProv = NULL;

+-  hRNGProv = NULL;

++  hRNGProv = (HCRYPTPROV)NULL;

 +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

    hAdvAPI32 = GetModuleHandle ("AdvAPI32.dll");

    if (!hAdvAPI32)

      return;

-@@ -275,6 +279,19 @@ init_system_rng (void)

+@@ -275,6 +280,19 @@ init_system_rng (void)

       This isn't exported by name, so we have to get it by ordinal.  */

    pRtlGenRandom = (RTLGENRANDOM)

      GetProcAddress (hAdvAPI32, "SystemFunction036");

 +#elif defined(WINSTORECOMPAT)

 +  hAdvAPI32 = NULL;

-+  pCryptAcquireContext = CryptAcquireContextA;

++  pCryptAcquireContext = CryptAcquireContextW;

 +  pCryptGenRandom = CryptGenRandom;

 +  pCryptReleaseContext = CryptReleaseContext;

 +  pRtlGenRandom = NULL;

@@ -56,20 +70,20 @@

    /* Try and connect to the PIII RNG CSP.  The AMD 768 southbridge (from

       the 760 MP chipset) also has a hardware RNG, but there doesn't appear

 diff --git a/src/Makefile.am b/src/Makefile.am

-index 3cc4a552..a22acd41 100644

+index aa3548f6..154b35c7 100644

 --- a/src/Makefile.am

 +++ b/src/Makefile.am

-@@ -127,6 +127,10 @@ libgcrypt_la_LIBADD = $(gcrypt_res) \

+@@ -126,7 +126,9 @@ libgcrypt_la_LIBADD = $(gcrypt_res) \

+   ../random/librandom.la \

    ../mpi/libmpi.la \

    ../compat/libcompat.la $(DL_LIBS) $(GPG_ERROR_LIBS)

- 

+-

 +if HAVE_W32_SYSTEM

 +libgcrypt_la_LIBADD += -lbcrypt

 +endif

-+

  dumpsexp_SOURCES = dumpsexp.c

  dumpsexp_CFLAGS = $(arch_gpg_error_cflags)

 -- 

-2.26.0.windows.1

+2.37.3.windows.1

​

@@ -1,6 +1,17 @@

---- libgcrypt-1.7.3/Makefile.am.orig   2016-08-24 15:10:23.181783280 +0200

-+++ libgcrypt-1.7.3/Makefile.am    2016-08-24 15:11:19.813780757 +0200

-@@ -31,8 +31,8 @@

+From 35d4dd642c955f5aa006ad8d105105a15ff14921 Mon Sep 17 00:00:00 2001

+From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>

+Date: Fri, 11 Sep 2015 16:43:11 +0200

+Subject: PATCH 1/5 disable tests compilation

+

+---

+ Makefile.am | 4 ++--

+ 1 file changed, 2 insertions(+), 2 deletions(-)

+

+diff --git a/Makefile.am b/Makefile.am

+index 77355d1a..737f32ad 100644

+--- a/Makefile.am

++++ b/Makefile.am

+@@ -41,8 +41,8 @@ doc =

  endif

@@ -11,3 +22,6 @@

  EXTRA_DIST = autogen.sh autogen.rc README.GIT LICENSES                   \

               ChangeLog-2011 build-aux/ChangeLog-2011 doc/ChangeLog-2011    \

+-- 

+2.37.3.windows.1

+

​

@@ -1,14 +1,25 @@

---- libgcrypt/configure.ac.old 2017-04-20 16:49:00.239092950 +0200

-+++ libgcrypt/configure.ac 2017-04-20 16:57:18.205011934 +0200

-@@ -215,7 +215,6 @@

- print_egd_notice=no

+From 54a245738b12ad8985935de0ffea24980ce48db9 Mon Sep 17 00:00:00 2001

+From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>

+Date: Thu, 20 Apr 2017 17:26:02 +0200

+Subject: PATCH 2/5 Fix pthread detection

+

+---

+ configure.ac | 8 +++-----

+ 1 file changed, 3 insertions(+), 5 deletions(-)

+

+diff --git a/configure.ac b/configure.ac

+index 6ea38f53..781f3163 100644

+--- a/configure.ac

++++ b/configure.ac

+@@ -239,7 +239,6 @@ LIBGCRYPT_THREAD_MODULES=""

+ # Other definitions.

  have_w32_system=no

  have_w32ce_system=no

 -have_pthread=no

  # Setup some stuff depending on host.

-@@ -751,10 +750,9 @@

+@@ -828,10 +827,9 @@ AC_SUBST(PTH_LIBS)

  # Check whether pthreads is available

  #

  if test "$have_w32_system" != yes; then

@@ -22,3 +33,6 @@

  fi

+-- 

+2.37.3.windows.1

+

​

@@ -1,6 +1,6 @@

 # GCRYPT

 GCRYPT_VERSION := 1.10.1

-GCRYPT_URL := https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2

+GCRYPT_URL := $(GNUGPG)/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2

 PKGS += gcrypt

 ifeq ($(call need_pkg,"libgcrypt"),)

​

@@ -2,7 +2,7 @@

 GETTEXT_VERSION := 0.21

 GETTEXT_URL := $(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz

-ifndef HAVE_WINSTORE

+ifndef HAVE_WINSTORE # FIXME uses sys/socket.h improperly

 PKGS += gettext

 endif

 ifneq ($(filter gnu%,$(subst -, ,$(HOST))),)

​

@@ -0,0 +1,73 @@

+From 8425c77fe89d66cd8d5411d0ccd14c688de1416a Mon Sep 17 00:00:00 2001

+From: Steve Lhomme <robux4@ycbcr.xyz>

+Date: Tue, 16 May 2023 09:40:34 +0200

+Subject: PATCH Use CreateFile2 in UWP builds

+

+CreateFileA and CreateFileW are forbidden calls in UWP.

+CreateFile2 is close enough, some parameters are passed in a structure

+and it requires a WCHAR filename. Given the original stat uses the

+"multibyte code page currently in use" 1, the char should be converted

+using CP_ACP 2.

+

+1 https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/stat-functions

+2 https://learn.microsoft.com/en-us/windows/win32/api/stringapiset/nf-stringapiset-multibytetowidechar#parameters

+---

+ lib/stat.c | 35 +++++++++++++++++++++++++++++++++++

+ 1 file changed, 35 insertions(+)

+

+diff --git a/gl/stat.c b/gl/stat.c

+index 7987e26583..f0e95a27dc 100644

+--- a/gl/stat.c

++++ b/gl/stat.c

+@@ -197,6 +197,7 @@ rpl_stat (char const *name, struct stat *buf)

+     {

+       /* Approach based on the file.  */

+ 

++# if !defined WINAPI_FAMILY || WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

+       /* Open a handle to the file.

+          CreateFile

+          <https://docs.microsoft.com/en-us/windows/desktop/api/fileapi/nf-fileapi-createfilea>

+@@ -212,6 +213,40 @@ rpl_stat (char const *name, struct stat *buf)

+                        filesystem operations.  */

+                     FILE_FLAG_BACKUP_SEMANTICS /* | FILE_FLAG_POSIX_SEMANTICS */,

+                     NULL);

++# else

++      /* Only CreateFile2 is available in UWP builds.

++         <https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfile2>

++         <https://learn.microsoft.com/en-us/uwp/win32-and-com/win32-apis#apis-from-api-ms-win-core-file-l1-2-1dll>  */

++      HANDLE h = INVALID_HANDLE_VALUE;

++      int wlen = MultiByteToWideChar (CP_ACP, 0, rname, -1, NULL, 0);

++      if (wlen > 0)

++        {

++          WCHAR *wrname = malloca (wlen * sizeof (WCHAR));

++          if (wrname != NULL)

++            {

++              MultiByteToWideChar (CP_ACP, 0, rname, -1, wrname, wlen);

++

++              CREATEFILE2_EXTENDED_PARAMETERS createExParams;

++              createExParams.dwSize = sizeof(CREATEFILE2_EXTENDED_PARAMETERS);

++              createExParams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL;

++              /* FILE_FLAG_POSIX_SEMANTICS (treat file names that differ only

++                  in case as different) makes sense only when applied to *all*

++                  filesystem operations.  */

++              createExParams.dwFileFlags = FILE_FLAG_BACKUP_SEMANTICS;

++              createExParams.dwSecurityQosFlags = 0;

++              createExParams.lpSecurityAttributes = NULL;

++              createExParams.hTemplateFile = NULL;

++

++              h =

++                CreateFile2 (wrname,

++                             FILE_READ_ATTRIBUTES,

++                             FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,

++                             OPEN_EXISTING,

++                             &createExParams);

++              freea(wrname);

++            }

++        }

++# endif

+       if (h != INVALID_HANDLE_VALUE)

+         {

+           ret = _gl_fstat_by_handle (h, rname, buf);

+-- 

+2.37.3.windows.1

+

​

@@ -1,7 +1,7 @@

 # GnuTLS

 GNUTLS_VERSION := 3.6.16

-GNUTLS_URL := https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-$(GNUTLS_VERSION).tar.xz

+GNUTLS_URL := $(GNUGPG)/gnutls/v3.6/gnutls-$(GNUTLS_VERSION).tar.xz

 ifdef BUILD_NETWORK

 ifndef HAVE_DARWIN_OS

@@ -47,6 +47,9 @@

    $(APPLY) $(SRC)/gnutls/0001-windows-Avoid-Wint-conversion-errors.patch

+   # use CreateFile2 instead of CreateFile in UWP

+   $(APPLY) $(SRC)/gnutls/0001-Use-CreateFile2-in-UWP-builds.patch

+

    $(UPDATE_AUTOCONFIG)

    $(MOVE)

@@ -71,11 +74,6 @@

 ifdef HAVE_ANDROID

 GNUTLS_ENV := gl_cv_header_working_stdint_h=yes

 endif

-ifdef HAVE_WINSTORE

-ifeq ($(ARCH),x86_64)

-   GNUTLS_CONF += --disable-hardware-acceleration

-endif

-endif

 ifdef HAVE_WIN32

    GNUTLS_CONF += --without-idn

 ifeq ($(ARCH),aarch64)

​

@@ -0,0 +1,11 @@

+--- libgpg-error/src/mkheader.c.orig   2023-05-12 13:24:34.270562700 +0200

++++ libgpg-error/src/mkheader.c    2023-05-15 08:26:10.678024100 +0200

+@@ -518,7 +518,7 @@ write_special (const char *fname, int ln

+     }

+   else if (!strcmp (tag, "include:os-add"))

+     {

+-      if (!strcmp (host_os, "mingw32"))

++      if (!strcmp (host_os, "mingw32") || !strcmp (host_os, "mingw32uwp") || !strcmp (host_os, "mingw32ucrt"))

+         {

+           include_file (fname, lnr, "w32-add.h", write_line);

+         }

​

@@ -1,6 +1,6 @@

 # GPGERROR

 GPGERROR_VERSION := 1.27

-GPGERROR_URL := https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2

+GPGERROR_URL := $(GNUGPG)/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2

 $(TARBALLS)/libgpg-error-$(GPGERROR_VERSION).tar.bz2:

    $(call download_pkg,$(GPGERROR_URL),gpg-error)

@@ -28,6 +28,10 @@

    cp -f -- "$(SRC)/gpg-error/lock-obj-pub.posix.h" \

        "$(UNPACK_DIR)/src/lock-obj-pub.native.h"

 endif

+   # gpg-error doesn't know about mingw32uwp but it's the same as mingw32

+   cp -f -- "$(UNPACK_DIR)/src/syscfg/lock-obj-pub.mingw32.h" \

+       "$(UNPACK_DIR)/src/syscfg/lock-obj-pub.mingw32uwp.h"

+   $(APPLY) $(SRC)/gpg-error/gpg-error-uwp-fix.patch

    $(MOVE)

 GPGERROR_CONF := \

​

@@ -0,0 +1,73 @@

+From 8425c77fe89d66cd8d5411d0ccd14c688de1416a Mon Sep 17 00:00:00 2001

+From: Steve Lhomme <robux4@ycbcr.xyz>

+Date: Tue, 16 May 2023 09:40:34 +0200

+Subject: PATCH Use CreateFile2 in UWP builds

+

+CreateFileA and CreateFileW are forbidden calls in UWP.

+CreateFile2 is close enough, some parameters are passed in a structure

+and it requires a WCHAR filename. Given the original stat uses the

+"multibyte code page currently in use" 1, the char should be converted

+using CP_ACP 2.

+

+1 https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/stat-functions

+2 https://learn.microsoft.com/en-us/windows/win32/api/stringapiset/nf-stringapiset-multibytetowidechar#parameters

+---

+ lib/stat.c | 35 +++++++++++++++++++++++++++++++++++

+ 1 file changed, 35 insertions(+)

+

+diff --git a/srclib/stat.c b/srclib/stat.c

+index 7987e26583..f0e95a27dc 100644

+--- a/srclib/stat.c

++++ b/srclib/stat.c

+@@ -197,6 +197,7 @@ rpl_stat (char const *name, struct stat *buf)

+     {

+       /* Approach based on the file.  */

+ 

++# if !defined WINAPI_FAMILY || WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

+       /* Open a handle to the file.

+          CreateFile

+          <https://docs.microsoft.com/en-us/windows/desktop/api/fileapi/nf-fileapi-createfilea>

+@@ -212,6 +213,40 @@ rpl_stat (char const *name, struct stat *buf)

+                        filesystem operations.  */

+                     FILE_FLAG_BACKUP_SEMANTICS /* | FILE_FLAG_POSIX_SEMANTICS */,

+                     NULL);

++# else

++      /* Only CreateFile2 is available in UWP builds.

++         <https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfile2>

++         <https://learn.microsoft.com/en-us/uwp/win32-and-com/win32-apis#apis-from-api-ms-win-core-file-l1-2-1dll>  */

++      HANDLE h = INVALID_HANDLE_VALUE;

++      int wlen = MultiByteToWideChar (CP_ACP, 0, rname, -1, NULL, 0);

++      if (wlen > 0)

++        {

++          WCHAR *wrname = malloca (wlen * sizeof (WCHAR));

++          if (wrname != NULL)

++            {

++              MultiByteToWideChar (CP_ACP, 0, rname, -1, wrname, wlen);

++

++              CREATEFILE2_EXTENDED_PARAMETERS createExParams;

++              createExParams.dwSize = sizeof(CREATEFILE2_EXTENDED_PARAMETERS);

++              createExParams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL;

++              /* FILE_FLAG_POSIX_SEMANTICS (treat file names that differ only

++                  in case as different) makes sense only when applied to *all*

++                  filesystem operations.  */

++              createExParams.dwFileFlags = FILE_FLAG_BACKUP_SEMANTICS;

++              createExParams.dwSecurityQosFlags = 0;

++              createExParams.lpSecurityAttributes = NULL;

++              createExParams.hTemplateFile = NULL;

++

++              h =

++                CreateFile2 (wrname,

++                             FILE_READ_ATTRIBUTES,

++                             FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,

++                             OPEN_EXISTING,

++                             &createExParams);

++              freea(wrname);

++            }

++        }

++# endif

+       if (h != INVALID_HANDLE_VALUE)

+         {

+           ret = _gl_fstat_by_handle (h, rname, buf);

+-- 

+2.37.3.windows.1

+

​

@@ -0,0 +1,41 @@

+From c934bfdfc343fbb4d84e59a339cde57b30779581 Mon Sep 17 00:00:00 2001

+From: Steve Lhomme <robux4@ycbcr.xyz>

+Date: Thu, 4 Jun 2020 10:15:38 +0200

+Subject: PATCH do not call GetHandleInformation() in Winstore apps

+

+The API is forbidden 1 and HANDLE_FLAG_INHERIT would never be set as exec()

+is not allowed either 2.

+

+1 https://docs.microsoft.com/en-us/windows/win32/api/handleapi/nf-handleapi-gethandleinformation

+2 https://docs.microsoft.com/en-us/cpp/cppcx/crt-functions-not-supported-in-universal-windows-platform-apps

+---

+ lib/fcntl.c | 13 +++++++++++++

+ 1 file changed, 13 insertions(+)

+

+diff --git a/srclib/fcntl.c b/srclib/fcntl.c

+index e220800845..c95322b2d4 100644

+--- a/srclib/fcntl.c

++++ b/srclib/fcntl.c

+@@ -45,6 +45,19 @@

+ #  include <io.h>

+ # endif

+ 

++# if defined WINAPI_FAMILY && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

++/* GetHandleInformation is not available in UWP, the flags it would provide

++   are also not available, so we just return 0.

++   <https://docs.microsoft.com/en-us/windows/win32/api/handleapi/nf-handleapi-gethandleinformation>

++   <https://learn.microsoft.com/en-us/uwp/win32-and-com/win32-apis> */

++static inline BOOL GetHandleInformation(HANDLE h, DWORD *pf)

++{

++  *pf = 0;

++  return TRUE;

++}

++#  define HANDLE_FLAG_INHERIT          (1)

++# endif /*  WINAPI_PARTITION_DESKTOP */

++

+ /* Upper bound on getdtablesize().  See lib/getdtablesize.c.  */

+ # define OPEN_MAX_MAX 0x10000

+ 

+-- 

+2.37.3.windows.1

+

​

@@ -1,1 +1,1 @@

-365dac0b34b4255a0066e8033a8b3db4bdb94b9b57a9dca17ebf2d779139fe935caf51a465d17fd8ae229ec4b926f3f7025264f37243432075e5583925bb77b7  libiconv-1.16.tar.gz

+18a09de2d026da4f2d8b858517b0f26d853b21179cf4fa9a41070b2d140030ad9525637dc4f34fc7f27abca8acdc84c6751dfb1d426e78bf92af4040603ced86  libiconv-1.17.tar.gz

\ No newline at end of file

​

@@ -1,5 +1,5 @@

 # libiconv

-LIBICONV_VERSION := 1.16

+LIBICONV_VERSION := 1.17

 LIBICONV_URL := $(GNU)/libiconv/libiconv-$(LIBICONV_VERSION).tar.gz

 PKGS += iconv

@@ -22,8 +22,15 @@

 iconv: libiconv-$(LIBICONV_VERSION).tar.gz .sum-iconv

    $(UNPACK)

-   $(APPLY) $(SRC)/iconv/win32.patch

    $(APPLY) $(SRC)/iconv/bins.patch

+

+   # use CreateFile2 instead of CreateFile in UWP

+   $(APPLY) $(SRC)/iconv/0001-Use-CreateFile2-in-UWP-builds.patch

+

+   # fix forbidden UWP call which can't be upstreamed as they won't

+   # differentiate for winstore, only _WIN32_WINNT

+   $(APPLY) $(SRC)/iconv/0001-do-not-call-GetHandleInformation-in-Winstore-apps.patch

+

    $(UPDATE_AUTOCONFIG)

    cd $(UNPACK_DIR) && cp config.guess config.sub build-aux \

                     && mv config.guess config.sub libcharset/build-aux

​

@@ -0,0 +1,16 @@

+--- libarchive/libarchive/archive_digest.c.orig    2022-04-08 13:40:26.000000000 +0200

++++ libarchive/libarchive/archive_digest.c 2023-05-12 15:35:03.525598300 +0200

+@@ -30,6 +30,13 @@

+ #include "archive.h"

+ #include "archive_digest_private.h"

+ 

++#ifdef WINSTORECOMPAT

++WINIMPM WINBOOL WINAPI CryptCreateHash (HCRYPTPROV hProv, ALG_ID Algid, HCRYPTKEY hKey, DWORD dwFlags, HCRYPTHASH *phHash);

++WINIMPM WINBOOL WINAPI CryptHashData (HCRYPTHASH hHash, CONST BYTE *pbData, DWORD dwDataLen, DWORD dwFlags);

++WINIMPM WINBOOL WINAPI CryptGetHashParam (HCRYPTHASH hHash, DWORD dwParam, BYTE *pbData, DWORD *pdwDataLen, DWORD dwFlags);

++WINIMPM WINBOOL WINAPI CryptDestroyHash (HCRYPTHASH hHash);

++#endif

++

+ /* In particular, force the configure probe to break if it tries

+  * to test a combination of OpenSSL and libmd. */

+ #if defined(ARCHIVE_CRYPTO_OPENSSL) && defined(ARCHIVE_CRYPTO_LIBMD)

​

@@ -31,6 +31,8 @@

 ifdef HAVE_WINSTORE

    $(APPLY) $(SRC)/libarchive/winrt.patch

 endif

+   # fallback to Winstore Compat versions of Crypt API's

+   $(APPLY) $(SRC)/libarchive/libarchive-winstorecompat-crypt.patch

    $(call pkg_static,"build/pkgconfig/libarchive.pc.in")

    $(MOVE)

​

@@ -481,17 +481,6 @@

  #if !defined(__BORLANDC__) && !defined(__WATCOMC__)

  #define setmode       _setmode

  #endif

-@@ -122,8 +124,10 @@

- #define   umask       _umask

- #endif

- #endif

-+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

- #define   waitpid     __la_waitpid

- #define   write       __la_write

-+#endif

- 

- #if !defined(__WATCOMC__)

- 

 @@ -276,8 +280,10 @@ extern int     __la_stat(const char *path, struct stat *st);

  extern pid_t   __la_waitpid(HANDLE child, int *status, int option);

  extern ssize_t     __la_write(int fd, const void *buf, size_t nbytes);

​

@@ -0,0 +1,51 @@

+From a95e2ee2056317383d885574464f64dcc5509ce4 Mon Sep 17 00:00:00 2001

+From: Johannes Kauffmann <johanneskauffmann@hotmail.com>

+Date: Wed, 7 Sep 2022 00:54:00 +0200

+Subject: PATCH Avoid relying on implicit function declarations

+

+smb_ntlm.c includes stdlib.h transitively via config.h -> compat.h.

+This means that defining _CRT_RAND_S in smb_ntlm.c (before including

+config.h itself) does not have the desired effect of pulling in the

+rand_s() function declaration.

+

+To fix this (and the Wimplicit-function-declaration warning, which has

+become an error in Clang 16), define _CRT_RAND_S before including

+stdlib.h.

+---

+ compat/compat.h | 4 ++++

+ src/smb_ntlm.c  | 4 ----

+ 2 files changed, 4 insertions(+), 4 deletions(-)

+

+diff --git a/compat/compat.h b/compat/compat.h

+index eadfae8..014298c 100644

+--- a/compat/compat.h

++++ b/compat/compat.h

+@@ -31,6 +31,10 @@

+ #ifndef BDSM_COMPAT_H

+ # define BDSM_COMPAT_H

+ 

++#ifdef _WIN32

++# define _CRT_RAND_S    /* needed before including stdlib.h !!! */

++#endif

++

+ #include <stdlib.h>

+ #if !defined HAVE_STRLCPY && !defined HAVE_LIBBSD

+ size_t strlcpy(char *dst, const char *src, size_t siz);

+diff --git a/src/smb_ntlm.c b/src/smb_ntlm.c

+index 998afd3..c55d169 100644

+--- a/src/smb_ntlm.c

++++ b/src/smb_ntlm.c

+@@ -32,10 +32,6 @@

+ # include "config.h"

+ #endif

+ 

+-#ifdef _WIN32

+-# define _CRT_RAND_S

+-#endif

+-

+ #include <assert.h>

+ #include <ctype.h>

+ #include <wctype.h>

+-- 

+2.37.3.windows.1

+

​

@@ -14,6 +14,7 @@

 libdsm: libdsm-$(LIBDSM_VERSION).tar.xz .sum-libdsm

    $(UNPACK)

+   $(APPLY) $(SRC)/libdsm/0001-Avoid-relying-on-implicit-function-declarations.patch

    $(MOVE)

 DEPS_libdsm = libtasn1 $(DEPS_libtasn1) iconv $(DEPS_iconv)

​

@@ -0,0 +1,73 @@

+From 8425c77fe89d66cd8d5411d0ccd14c688de1416a Mon Sep 17 00:00:00 2001

+From: Steve Lhomme <robux4@ycbcr.xyz>

+Date: Tue, 16 May 2023 09:40:34 +0200

+Subject: PATCH Use CreateFile2 in UWP builds

+

+CreateFileA and CreateFileW are forbidden calls in UWP.

+CreateFile2 is close enough, some parameters are passed in a structure

+and it requires a WCHAR filename. Given the original stat uses the

+"multibyte code page currently in use" 1, the char should be converted

+using CP_ACP 2.

+

+1 https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/stat-functions

+2 https://learn.microsoft.com/en-us/windows/win32/api/stringapiset/nf-stringapiset-multibytetowidechar#parameters

+---

+ lib/stat.c | 35 +++++++++++++++++++++++++++++++++++

+ 1 file changed, 35 insertions(+)

+

+diff --git a/src/gl/stat.c b/src/gl/stat.c

+index 7987e26583..f0e95a27dc 100644

+--- a/src/gl/stat.c

++++ b/src/gl/stat.c

+@@ -197,6 +197,7 @@ rpl_stat (char const *name, struct stat *buf)

+     {

+       /* Approach based on the file.  */

+ 

++# if !defined WINAPI_FAMILY || WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)