romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-24 20:27:18 +03:00
Code Issues Projects Releases Packages Wiki Activity

tidy-up: rename CURL_WINDOWS_APP to CURL_WINDOWS_UWP

Browse source 
Rename internal macro to make its purpose more obvious.

After this patch `grep -i uwp` shows all the code related to UWP.

Ref: https://curl.se/mail/lib-2024-09/0014.html
Closes #14881
This commit is contained in:
Viktor Szakats 2024-09-12 13:58:53 +02:00
parent 445fb81237
commit bc2f72b9ae
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
20 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/asyn-thread.c
View file

@ -286,7 +286,7 @@ static CURLcode getaddrinfo_complete(struct Curl_easy *data)
* and wait on it.
*/
static
#if defined(_WIN32_WCE) || defined(CURL_WINDOWS_APP)
#if defined(_WIN32_WCE) || defined(CURL_WINDOWS_UWP)
DWORD
#else
unsigned int
@ -354,7 +354,7 @@ CURL_STDCALL getaddrinfo_thread(void *arg)
* gethostbyname_thread() resolves a name and then exits.
*/
static
#if defined(_WIN32_WCE) || defined(CURL_WINDOWS_APP)
#if defined(_WIN32_WCE) || defined(CURL_WINDOWS_UWP)
DWORD
#else
unsigned int

2
lib/config-win32.h
View file

@ -475,7 +475,7 @@ Vista
#endif
/* Define to use the Windows crypto library. */
#if !defined(CURL_WINDOWS_APP)
#if !defined(CURL_WINDOWS_UWP)
#define USE_WIN32_CRYPTO
#endif

2
lib/curl_setup.h
View file

@ -109,7 +109,7 @@
# include <winapifamily.h>
# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \
!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
# define CURL_WINDOWS_APP
# define CURL_WINDOWS_UWP
# endif
# endif
#endif

6
lib/curl_threads.c
View file

@ -103,7 +103,7 @@ int Curl_thread_join(curl_thread_t *hnd)
#elif defined(USE_THREADS_WIN32)
curl_thread_t Curl_thread_create(
#if defined(_WIN32_WCE) || defined(CURL_WINDOWS_APP)
#if defined(_WIN32_WCE) || defined(CURL_WINDOWS_UWP)
DWORD
#else
unsigned int
@ -111,14 +111,14 @@ curl_thread_t Curl_thread_create(
(CURL_STDCALL *func) (void *),
void *arg)
{
#if defined(_WIN32_WCE) || defined(CURL_WINDOWS_APP)
#if defined(_WIN32_WCE) || defined(CURL_WINDOWS_UWP)
typedef HANDLE curl_win_thread_handle_t;
#else
typedef uintptr_t curl_win_thread_handle_t;
#endif
curl_thread_t t;
curl_win_thread_handle_t thread_handle;
#if defined(_WIN32_WCE) || defined(CURL_WINDOWS_APP)
#if defined(_WIN32_WCE) || defined(CURL_WINDOWS_UWP)
thread_handle = CreateThread(NULL, 0, func, arg, 0, NULL);
#else
thread_handle = _beginthreadex(NULL, 0, func, arg, 0, NULL);

2
lib/curl_threads.h
View file

@ -53,7 +53,7 @@
#if defined(USE_THREADS_POSIX) || defined(USE_THREADS_WIN32)
curl_thread_t Curl_thread_create(
#if defined(_WIN32_WCE) || defined(CURL_WINDOWS_APP)
#if defined(_WIN32_WCE) || defined(CURL_WINDOWS_UWP)
DWORD
#else
unsigned int

2
lib/getenv.c
View file

@ -31,7 +31,7 @@
static char *GetEnv(const char *variable)
{
#if defined(_WIN32_WCE) || defined(CURL_WINDOWS_APP) || \
#if defined(_WIN32_WCE) || defined(CURL_WINDOWS_UWP) || \
defined(__ORBIS__) || defined(__PROSPERO__) /* PlayStation 4 and 5 */
(void)variable;
return NULL;

2
lib/rand.c
View file

@ -49,7 +49,7 @@
#ifdef _WIN32
#if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x600 && \
!defined(CURL_WINDOWS_APP)
!defined(CURL_WINDOWS_UWP)
# define HAVE_WIN_BCRYPTGENRANDOM
# include <bcrypt.h>
# ifdef _MSC_VER

2
lib/system_win32.c
View file

@ -175,7 +175,7 @@ typedef HMODULE (APIENTRY *LOADLIBRARYEX_FN)(LPCTSTR, HANDLE, DWORD);
*/
HMODULE Curl_load_library(LPCTSTR filename)
{
#ifndef CURL_WINDOWS_APP
#ifndef CURL_WINDOWS_UWP
HMODULE hModule = NULL;
LOADLIBRARYEX_FN pLoadLibraryEx = NULL;

2
lib/version_win32.c
View file

@ -79,7 +79,7 @@ bool curlx_verify_windows_version(const unsigned int majorVersion,
{
bool matched = FALSE;
#if defined(CURL_WINDOWS_APP)
#if defined(CURL_WINDOWS_UWP)
/* We have no way to determine the Windows version from Windows apps,
so let's assume we are running on the target Windows version. */
const WORD fullVersion = MAKEWORD(minorVersion, majorVersion);

4
lib/vtls/schannel.c
View file

@ -2732,7 +2732,7 @@ static void schannel_checksum(const unsigned char *input,
DWORD provType,
const unsigned int algId)
{
#ifdef CURL_WINDOWS_APP
#ifdef CURL_WINDOWS_UWP
(void)input;
(void)inputlen;
(void)provType;
@ -2952,7 +2952,7 @@ const struct Curl_ssl Curl_ssl_schannel = {
#ifdef HAS_MANUAL_VERIFY_API
SSLSUPP_CAINFO_BLOB |
#endif
#ifndef CURL_WINDOWS_APP
#ifndef CURL_WINDOWS_UWP
SSLSUPP_PINNEDPUBKEY |
#endif
SSLSUPP_TLS13_CIPHERSUITES |

2
lib/vtls/schannel_int.h
View file

@ -31,7 +31,7 @@
#include "vtls.h"
#if (defined(__MINGW32__) || defined(CERT_CHAIN_REVOCATION_CHECK_CHAIN)) \
&& !defined(CURL_WINDOWS_APP)
&& !defined(CURL_WINDOWS_UWP)
#define HAS_MANUAL_VERIFY_API
#endif

2
lib/vtls/schannel_verify.c
View file

@ -346,7 +346,7 @@ static DWORD cert_get_name_string(struct Curl_easy *data,
DWORD length)
{
DWORD actual_length = 0;
#if defined(CURL_WINDOWS_APP)
#if defined(CURL_WINDOWS_UWP)
(void)data;
(void)cert_context;
(void)host_names;