mirror of
https://github.com/moparisthebest/curl
synced 2024-12-21 07:38:49 -05:00
win32: Introduced centralised verify windows version function
This commit is contained in:
parent
584d0121c3
commit
6020ce5fa7
@ -24,9 +24,6 @@
|
|||||||
|
|
||||||
#if defined(WIN32)
|
#if defined(WIN32)
|
||||||
|
|
||||||
#if defined(USE_WINDOWS_SSPI) || (!defined(CURL_DISABLE_TELNET) && \
|
|
||||||
defined(USE_WINSOCK))
|
|
||||||
|
|
||||||
#include <curl/curl.h>
|
#include <curl/curl.h>
|
||||||
#include "system_win32.h"
|
#include "system_win32.h"
|
||||||
|
|
||||||
@ -34,6 +31,10 @@
|
|||||||
#include "curl_memory.h"
|
#include "curl_memory.h"
|
||||||
#include "memdebug.h"
|
#include "memdebug.h"
|
||||||
|
|
||||||
|
#if defined(USE_WINDOWS_SSPI) || (!defined(CURL_DISABLE_TELNET) && \
|
||||||
|
defined(USE_WINSOCK))
|
||||||
|
|
||||||
|
|
||||||
#if !defined(LOAD_WITH_ALTERED_SEARCH_PATH)
|
#if !defined(LOAD_WITH_ALTERED_SEARCH_PATH)
|
||||||
#define LOAD_WITH_ALTERED_SEARCH_PATH 0x00000008
|
#define LOAD_WITH_ALTERED_SEARCH_PATH 0x00000008
|
||||||
#endif
|
#endif
|
||||||
@ -56,6 +57,41 @@ typedef HMODULE (APIENTRY *LOADLIBRARYEX_FN)(LPCTSTR, HANDLE, DWORD);
|
|||||||
# define LOADLIBARYEX "LoadLibraryExA"
|
# define LOADLIBARYEX "LoadLibraryExA"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif /* USE_WINDOWS_SSPI || (!CURL_DISABLE_TELNET && USE_WINSOCK) */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Curl_verify_windows_version()
|
||||||
|
*
|
||||||
|
* This is used to verify if we are running on a specific windows version.
|
||||||
|
*
|
||||||
|
* Parameters:
|
||||||
|
*
|
||||||
|
* majorVersion [in] - The major version number.
|
||||||
|
* minorVersion [in] - The minor version number.
|
||||||
|
* platform [in] - The optional platform identifer.
|
||||||
|
* condition [in] - The test condition used to specifier whether we are
|
||||||
|
* checking a version less then, equal to or greater than
|
||||||
|
* what is specified in the major and minor version
|
||||||
|
* numbers.
|
||||||
|
*
|
||||||
|
* Returns TRUE if matched; otherwise FALSE.
|
||||||
|
*/
|
||||||
|
bool Curl_verify_windows_version(const unsigned int majorVersion,
|
||||||
|
const unsigned int minorVersion,
|
||||||
|
const PlatformIdentifier platform,
|
||||||
|
const VersionCondition condition)
|
||||||
|
{
|
||||||
|
(void) majorVersion;
|
||||||
|
(void) minorVersion;
|
||||||
|
(void) platform;
|
||||||
|
(void) condition;
|
||||||
|
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(USE_WINDOWS_SSPI) || (!defined(CURL_DISABLE_TELNET) && \
|
||||||
|
defined(USE_WINSOCK))
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Curl_load_library()
|
* Curl_load_library()
|
||||||
*
|
*
|
||||||
|
@ -26,6 +26,28 @@
|
|||||||
|
|
||||||
#if defined(WIN32)
|
#if defined(WIN32)
|
||||||
|
|
||||||
|
/* Version condition */
|
||||||
|
typedef enum {
|
||||||
|
VERSION_LESS_THAN,
|
||||||
|
VERSION_LESS_THAN_EQUAL,
|
||||||
|
VERSION_EQUAL,
|
||||||
|
VERSION_GREATER_THAN_EQUAL,
|
||||||
|
VERSION_GREATER_THAN
|
||||||
|
} VersionCondition;
|
||||||
|
|
||||||
|
/* Platform identifier */
|
||||||
|
typedef enum {
|
||||||
|
PLATFORM_DONT_CARE,
|
||||||
|
PLATFORM_WINDOWS,
|
||||||
|
PLATFORM_WINNT
|
||||||
|
} PlatformIdentifier;
|
||||||
|
|
||||||
|
/* This is used to verify if we are running on a specific windows version */
|
||||||
|
bool Curl_verify_windows_version(const unsigned int majorVersion,
|
||||||
|
const unsigned int minorVersion,
|
||||||
|
const PlatformIdentifier platform,
|
||||||
|
const VersionCondition condition);
|
||||||
|
|
||||||
#if defined(USE_WINDOWS_SSPI) || (!defined(CURL_DISABLE_TELNET) && \
|
#if defined(USE_WINDOWS_SSPI) || (!defined(CURL_DISABLE_TELNET) && \
|
||||||
defined(USE_WINSOCK))
|
defined(USE_WINSOCK))
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user