diff options
| author | Marco Deckel <marco.deckel@gmail.com> | 2016-08-21 13:44:33 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2016-08-21 13:56:22 +0200 |
| commit | 7f3df8040858bc604b4b7ec9e6e3544e7184c9ca (patch) | |
| tree | d9d6ef48c4249a45807cce4556b3ff67f6be9375 | |
| parent | a78c61a4bf5b7eb90b0945d94568b7b3b1f23c6e (diff) | |
| download | gnurl-7f3df8040858bc604b4b7ec9e6e3544e7184c9ca.tar.gz gnurl-7f3df8040858bc604b4b7ec9e6e3544e7184c9ca.tar.bz2 gnurl-7f3df8040858bc604b4b7ec9e6e3544e7184c9ca.zip | |
win: Basic support for Universal Windows Platform apps
Closes #820
| -rw-r--r-- | lib/connect.c | 3 | ||||
| -rw-r--r-- | lib/curl_setup.h | 10 | ||||
| -rw-r--r-- | lib/getenv.c | 3 | ||||
| -rw-r--r-- | lib/md5.c | 2 |
4 files changed, 16 insertions, 2 deletions
diff --git a/lib/connect.c b/lib/connect.c index 0047f9a0b..7f8c0870a 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -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); diff --git a/lib/curl_setup.h b/lib/curl_setup.h index e585ea6a5..9f29b2e9a 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h @@ -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 */ diff --git a/lib/getenv.c b/lib/getenv.c index 50bb79f53..89d181de3 100644 --- a/lib/getenv.c +++ b/lib/getenv.c @@ -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 @@ -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" |