Commit 7f3df804 authored by Marco Deckel's avatar Marco Deckel Committed by Daniel Stenberg
Browse files

win: Basic support for Universal Windows Platform apps

Closes #820
parent a78c61a4
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -130,6 +130,9 @@ tcpkeepalive(struct Curl_easy *data,
      infof(data, "Failed to set SIO_KEEPALIVE_VALS on fd %d: %d\n",
            (int)sockfd, WSAGetLastError());
    }
#elif defined(CURL_WINDOWS_APP)
    (void)majorVersion;
    detectOsState = DETECT_OS_VISTA_OR_LATER;
#else
#ifdef TCP_KEEPIDLE
    optval = curlx_sltosi(data->set.tcp_keepidle);
+10 −0
Original line number Diff line number Diff line
@@ -747,4 +747,14 @@ endings either CRLF or LF so 't' is appropriate.
#  endif
#endif /* DONT_USE_RECV_BEFORE_SEND_WORKAROUNDS */

/* Detect Windows App environment which has a restricted access
 * to the Win32 APIs. */
# if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0602)
#  include <winapifamily.h>
#  if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \
     !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
#    define CURL_WINDOWS_APP
#  endif
# endif

#endif /* HEADER_CURL_SETUP_H */
+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@
static
char *GetEnv(const char *variable)
{
#ifdef _WIN32_WCE
#if defined(_WIN32_WCE) || defined(CURL_WINDOWS_APP)
  (void)variable;
  return NULL;
#else
#ifdef WIN32
+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static void MD5_Final(unsigned char digest[16], MD5_CTX *ctx)
  CC_MD5_Final(digest, ctx);
}

#elif defined(_WIN32)
#elif defined(_WIN32) && !defined(CURL_WINDOWS_APP)

#include <wincrypt.h>
#include "curl_memory.h"