mirror of
https://github.com/curl/curl.git
synced 2024-12-21 06:50:10 +08:00
0fd794df35
It affected cmake-unity shared-curltool curldebug mingw-w64 gcc builds
when building the `testdeps` target.
Apply the solution already used in `lib/base64.c` and `lib/dynbuf.c`
to fix it.
Also update an existing GHA CI job to test the issue fixed.
```
In file included from curl/lib/version_win32.c:35,
from curl/_bld/src/CMakeFiles/curl.dir/Unity/unity_0_c.c:145:
curl/lib/memdebug.h:52:14: error: redundant redeclaration of 'curl_dbg_logfile' [-Werror=redundant-decls]
52 | extern FILE *curl_dbg_logfile;
| ^~~~~~~~~~~~~~~~
In file included from curl/src/slist_wc.c:32,
from curl/_bld/src/CMakeFiles/curl.dir/Unity/unity_0_c.c:4:
curl/lib/memdebug.h:52:14: note: previous declaration of 'curl_dbg_logfile' with type 'FILE *' {aka 'struct _iobuf *'}
52 | extern FILE *curl_dbg_logfile;
| ^~~~~~~~~~~~~~~~
curl/lib/memdebug.h:55:44: error: redundant redeclaration of 'curl_dbg_malloc' [-Werror=redundant-decls]
55 | CURL_EXTERN ALLOC_FUNC ALLOC_SIZE(1) void *curl_dbg_malloc(size_t size,
| ^~~~~~~~~~~~~~~
curl/lib/memdebug.h:55:44: note: previous declaration of 'curl_dbg_malloc' with type 'void *(size_t, int, const char *)' {aka 'void *(long long unsigned int, int, const char *)'}
55 | CURL_EXTERN ALLOC_FUNC ALLOC_SIZE(1) void *curl_dbg_malloc(size_t size,
| ^~~~~~~~~~~~~~~
[...]
curl/lib/memdebug.h:110:17: error: redundant redeclaration of 'curl_dbg_fclose' [-Werror=redundant-decls]
110 | CURL_EXTERN int curl_dbg_fclose(FILE *file, int line, const char *source);
| ^~~~~~~~~~~~~~~
curl/lib/memdebug.h:110:17: note: previous declaration of 'curl_dbg_fclose' with type 'int(FILE *, int, const char *)' {aka 'int(struct _iobuf *, int, const char *)'}
110 | CURL_EXTERN int curl_dbg_fclose(FILE *file, int line, const char *source);
| ^~~~~~~~~~~~~~~
```
Ref: https://ci.appveyor.com/project/curlorg/curl/builds/49840554/job/a4aoet17e9qnqx1a#L362
After: https://ci.appveyor.com/project/curlorg/curl/builds/49843735/job/hbo2uah2vj0ns523
Ref: #13689 (CI testing this PR with `DEBUGBUILD`/`CURLDEBUG`/shared-static combinations)
Depends-on: #13694
Depends-on: #13800
Closes #13705
322 lines
10 KiB
C
322 lines
10 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Steve Holme, <steve_holme@hotmail.com>.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#if defined(_WIN32)
|
|
|
|
#include <curl/curl.h>
|
|
#include "version_win32.h"
|
|
#include "warnless.h"
|
|
|
|
/* The last 2 #include files should be in this order */
|
|
#ifdef BUILDING_LIBCURL
|
|
#include "curl_memory.h"
|
|
#endif
|
|
#include "memdebug.h"
|
|
|
|
/* This Unicode version struct works for VerifyVersionInfoW (OSVERSIONINFOEXW)
|
|
and RtlVerifyVersionInfo (RTLOSVERSIONINFOEXW) */
|
|
struct OUR_OSVERSIONINFOEXW {
|
|
ULONG dwOSVersionInfoSize;
|
|
ULONG dwMajorVersion;
|
|
ULONG dwMinorVersion;
|
|
ULONG dwBuildNumber;
|
|
ULONG dwPlatformId;
|
|
WCHAR szCSDVersion[128];
|
|
USHORT wServicePackMajor;
|
|
USHORT wServicePackMinor;
|
|
USHORT wSuiteMask;
|
|
UCHAR wProductType;
|
|
UCHAR wReserved;
|
|
};
|
|
|
|
/*
|
|
* curlx_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.
|
|
* buildVersion [in] - The build version number. If 0, this parameter is
|
|
* ignored.
|
|
* platform [in] - The optional platform identifier.
|
|
* 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 curlx_verify_windows_version(const unsigned int majorVersion,
|
|
const unsigned int minorVersion,
|
|
const unsigned int buildVersion,
|
|
const PlatformIdentifier platform,
|
|
const VersionCondition condition)
|
|
{
|
|
bool matched = FALSE;
|
|
|
|
#if defined(CURL_WINDOWS_APP)
|
|
(void)buildVersion;
|
|
|
|
/* We have no way to determine the Windows version from Windows apps,
|
|
so let's assume we're running on the target Windows version. */
|
|
const WORD fullVersion = MAKEWORD(minorVersion, majorVersion);
|
|
const WORD targetVersion = (WORD)_WIN32_WINNT;
|
|
|
|
switch(condition) {
|
|
case VERSION_LESS_THAN:
|
|
matched = targetVersion < fullVersion;
|
|
break;
|
|
|
|
case VERSION_LESS_THAN_EQUAL:
|
|
matched = targetVersion <= fullVersion;
|
|
break;
|
|
|
|
case VERSION_EQUAL:
|
|
matched = targetVersion == fullVersion;
|
|
break;
|
|
|
|
case VERSION_GREATER_THAN_EQUAL:
|
|
matched = targetVersion >= fullVersion;
|
|
break;
|
|
|
|
case VERSION_GREATER_THAN:
|
|
matched = targetVersion > fullVersion;
|
|
break;
|
|
}
|
|
|
|
if(matched && (platform == PLATFORM_WINDOWS)) {
|
|
/* we're always running on PLATFORM_WINNT */
|
|
matched = FALSE;
|
|
}
|
|
#elif !defined(_WIN32_WINNT) || !defined(_WIN32_WINNT_WIN2K) || \
|
|
(_WIN32_WINNT < _WIN32_WINNT_WIN2K)
|
|
OSVERSIONINFO osver;
|
|
|
|
memset(&osver, 0, sizeof(osver));
|
|
osver.dwOSVersionInfoSize = sizeof(osver);
|
|
|
|
/* Find out Windows version */
|
|
if(GetVersionEx(&osver)) {
|
|
/* Verify the Operating System version number */
|
|
switch(condition) {
|
|
case VERSION_LESS_THAN:
|
|
if(osver.dwMajorVersion < majorVersion ||
|
|
(osver.dwMajorVersion == majorVersion &&
|
|
osver.dwMinorVersion < minorVersion) ||
|
|
(buildVersion != 0 &&
|
|
(osver.dwMajorVersion == majorVersion &&
|
|
osver.dwMinorVersion == minorVersion &&
|
|
osver.dwBuildNumber < buildVersion)))
|
|
matched = TRUE;
|
|
break;
|
|
|
|
case VERSION_LESS_THAN_EQUAL:
|
|
if(osver.dwMajorVersion < majorVersion ||
|
|
(osver.dwMajorVersion == majorVersion &&
|
|
osver.dwMinorVersion < minorVersion) ||
|
|
(osver.dwMajorVersion == majorVersion &&
|
|
osver.dwMinorVersion == minorVersion &&
|
|
(buildVersion == 0 ||
|
|
osver.dwBuildNumber <= buildVersion)))
|
|
matched = TRUE;
|
|
break;
|
|
|
|
case VERSION_EQUAL:
|
|
if(osver.dwMajorVersion == majorVersion &&
|
|
osver.dwMinorVersion == minorVersion &&
|
|
(buildVersion == 0 ||
|
|
osver.dwBuildNumber == buildVersion))
|
|
matched = TRUE;
|
|
break;
|
|
|
|
case VERSION_GREATER_THAN_EQUAL:
|
|
if(osver.dwMajorVersion > majorVersion ||
|
|
(osver.dwMajorVersion == majorVersion &&
|
|
osver.dwMinorVersion > minorVersion) ||
|
|
(osver.dwMajorVersion == majorVersion &&
|
|
osver.dwMinorVersion == minorVersion &&
|
|
(buildVersion == 0 ||
|
|
osver.dwBuildNumber >= buildVersion)))
|
|
matched = TRUE;
|
|
break;
|
|
|
|
case VERSION_GREATER_THAN:
|
|
if(osver.dwMajorVersion > majorVersion ||
|
|
(osver.dwMajorVersion == majorVersion &&
|
|
osver.dwMinorVersion > minorVersion) ||
|
|
(buildVersion != 0 &&
|
|
(osver.dwMajorVersion == majorVersion &&
|
|
osver.dwMinorVersion == minorVersion &&
|
|
osver.dwBuildNumber > buildVersion)))
|
|
matched = TRUE;
|
|
break;
|
|
}
|
|
|
|
/* Verify the platform identifier (if necessary) */
|
|
if(matched) {
|
|
switch(platform) {
|
|
case PLATFORM_WINDOWS:
|
|
if(osver.dwPlatformId != VER_PLATFORM_WIN32_WINDOWS)
|
|
matched = FALSE;
|
|
break;
|
|
|
|
case PLATFORM_WINNT:
|
|
if(osver.dwPlatformId != VER_PLATFORM_WIN32_NT)
|
|
matched = FALSE;
|
|
break;
|
|
|
|
default: /* like platform == PLATFORM_DONT_CARE */
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
#else
|
|
ULONGLONG cm = 0;
|
|
struct OUR_OSVERSIONINFOEXW osver;
|
|
BYTE majorCondition;
|
|
BYTE minorCondition;
|
|
BYTE buildCondition;
|
|
BYTE spMajorCondition;
|
|
BYTE spMinorCondition;
|
|
DWORD dwTypeMask = VER_MAJORVERSION | VER_MINORVERSION |
|
|
VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR;
|
|
|
|
typedef LONG (APIENTRY *RTLVERIFYVERSIONINFO_FN)
|
|
(struct OUR_OSVERSIONINFOEXW *, ULONG, ULONGLONG);
|
|
static RTLVERIFYVERSIONINFO_FN pRtlVerifyVersionInfo;
|
|
static bool onetime = true; /* safe because first call is during init */
|
|
|
|
if(onetime) {
|
|
pRtlVerifyVersionInfo = CURLX_FUNCTION_CAST(RTLVERIFYVERSIONINFO_FN,
|
|
(GetProcAddress(GetModuleHandleA("ntdll"), "RtlVerifyVersionInfo")));
|
|
onetime = false;
|
|
}
|
|
|
|
switch(condition) {
|
|
case VERSION_LESS_THAN:
|
|
majorCondition = VER_LESS;
|
|
minorCondition = VER_LESS;
|
|
buildCondition = VER_LESS;
|
|
spMajorCondition = VER_LESS_EQUAL;
|
|
spMinorCondition = VER_LESS_EQUAL;
|
|
break;
|
|
|
|
case VERSION_LESS_THAN_EQUAL:
|
|
majorCondition = VER_LESS_EQUAL;
|
|
minorCondition = VER_LESS_EQUAL;
|
|
buildCondition = VER_LESS_EQUAL;
|
|
spMajorCondition = VER_LESS_EQUAL;
|
|
spMinorCondition = VER_LESS_EQUAL;
|
|
break;
|
|
|
|
case VERSION_EQUAL:
|
|
majorCondition = VER_EQUAL;
|
|
minorCondition = VER_EQUAL;
|
|
buildCondition = VER_EQUAL;
|
|
spMajorCondition = VER_GREATER_EQUAL;
|
|
spMinorCondition = VER_GREATER_EQUAL;
|
|
break;
|
|
|
|
case VERSION_GREATER_THAN_EQUAL:
|
|
majorCondition = VER_GREATER_EQUAL;
|
|
minorCondition = VER_GREATER_EQUAL;
|
|
buildCondition = VER_GREATER_EQUAL;
|
|
spMajorCondition = VER_GREATER_EQUAL;
|
|
spMinorCondition = VER_GREATER_EQUAL;
|
|
break;
|
|
|
|
case VERSION_GREATER_THAN:
|
|
majorCondition = VER_GREATER;
|
|
minorCondition = VER_GREATER;
|
|
buildCondition = VER_GREATER;
|
|
spMajorCondition = VER_GREATER_EQUAL;
|
|
spMinorCondition = VER_GREATER_EQUAL;
|
|
break;
|
|
|
|
default:
|
|
return FALSE;
|
|
}
|
|
|
|
memset(&osver, 0, sizeof(osver));
|
|
osver.dwOSVersionInfoSize = sizeof(osver);
|
|
osver.dwMajorVersion = majorVersion;
|
|
osver.dwMinorVersion = minorVersion;
|
|
osver.dwBuildNumber = buildVersion;
|
|
if(platform == PLATFORM_WINDOWS)
|
|
osver.dwPlatformId = VER_PLATFORM_WIN32_WINDOWS;
|
|
else if(platform == PLATFORM_WINNT)
|
|
osver.dwPlatformId = VER_PLATFORM_WIN32_NT;
|
|
|
|
cm = VerSetConditionMask(cm, VER_MAJORVERSION, majorCondition);
|
|
cm = VerSetConditionMask(cm, VER_MINORVERSION, minorCondition);
|
|
cm = VerSetConditionMask(cm, VER_SERVICEPACKMAJOR, spMajorCondition);
|
|
cm = VerSetConditionMask(cm, VER_SERVICEPACKMINOR, spMinorCondition);
|
|
|
|
if(platform != PLATFORM_DONT_CARE) {
|
|
cm = VerSetConditionMask(cm, VER_PLATFORMID, VER_EQUAL);
|
|
dwTypeMask |= VER_PLATFORMID;
|
|
}
|
|
|
|
/* Later versions of Windows have version functions that may not return the
|
|
real version of Windows unless the application is so manifested. We prefer
|
|
the real version always, so we use the Rtl variant of the function when
|
|
possible. Note though the function signatures have underlying fundamental
|
|
types that are the same, the return values are different. */
|
|
if(pRtlVerifyVersionInfo)
|
|
matched = !pRtlVerifyVersionInfo(&osver, dwTypeMask, cm);
|
|
else
|
|
matched = !!VerifyVersionInfoW((OSVERSIONINFOEXW *)&osver, dwTypeMask, cm);
|
|
|
|
/* Compare the build number separately. VerifyVersionInfo normally compares
|
|
major.minor in hierarchical order (eg 1.9 is less than 2.0) but does not
|
|
do the same for build (eg 1.9 build 222 is not less than 2.0 build 111).
|
|
Build comparison is only needed when build numbers are equal (eg 1.9 is
|
|
always less than 2.0 so build comparison is not needed). */
|
|
if(matched && buildVersion &&
|
|
(condition == VERSION_EQUAL ||
|
|
((condition == VERSION_GREATER_THAN_EQUAL ||
|
|
condition == VERSION_LESS_THAN_EQUAL) &&
|
|
curlx_verify_windows_version(majorVersion, minorVersion, 0,
|
|
platform, VERSION_EQUAL)))) {
|
|
|
|
cm = VerSetConditionMask(0, VER_BUILDNUMBER, buildCondition);
|
|
dwTypeMask = VER_BUILDNUMBER;
|
|
if(pRtlVerifyVersionInfo)
|
|
matched = !pRtlVerifyVersionInfo(&osver, dwTypeMask, cm);
|
|
else
|
|
matched = !!VerifyVersionInfoW((OSVERSIONINFOEXW *)&osver,
|
|
dwTypeMask, cm);
|
|
}
|
|
|
|
#endif
|
|
|
|
return matched;
|
|
}
|
|
|
|
#endif /* _WIN32 */
|