generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid Windows 8 Getversion deprecated errors.

Browse Source 
Windows 8 SDKs complain that GetVersion() is deprecated.

We only use GetVersion like this:

	(GetVersion() < 0x80000000)

which checks if the Windows version is NT based. Use a macro check_winnt()
which uses GetVersion() on older SDK versions and true otherwise.
(cherry picked from commit a4cc3c8041104896d51ae12ef7b678c31808ce52)
This commit is contained in:
Dr. Stephen Henson 2014-02-25 12:11:22 +00:00
parent a948732e1c
commit 0f9bcf3319
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/apps.c
View File

@ -3114,7 +3114,7 @@ double app_tminterval(int stop,int usertime)
if (proc==NULL) if (proc==NULL)
{ {
if (GetVersion() < 0x80000000) if (check_winnt())
proc = OpenProcess(PROCESS_QUERY_INFORMATION,FALSE, proc = OpenProcess(PROCESS_QUERY_INFORMATION,FALSE,
GetCurrentProcessId()); GetCurrentProcessId());
if (proc==NULL) proc = (HANDLE)-1; if (proc==NULL) proc = (HANDLE)-1;

2
crypto/bio/bss_log.c
View File

@ -245,7 +245,7 @@ static int MS_CALLBACK slg_puts(BIO *bp, const char *str)
static void xopenlog(BIO* bp, char* name, int level) static void xopenlog(BIO* bp, char* name, int level)
{ {
if (GetVersion() < 0x80000000) if (check_winnt())
bp->ptr = RegisterEventSourceA(NULL,name); bp->ptr = RegisterEventSourceA(NULL,name);
else else
bp->ptr = NULL; bp->ptr = NULL;

2
crypto/cryptlib.c
View File

@ -909,7 +909,7 @@ void OPENSSL_showfatal (const char *fmta,...)
#if defined(_WIN32_WINNT) && _WIN32_WINNT>=0x0333 #if defined(_WIN32_WINNT) && _WIN32_WINNT>=0x0333
/* this -------------v--- guards NT-specific calls */ /* this -------------v--- guards NT-specific calls */
if (GetVersion() < 0x80000000 && OPENSSL_isservice() > 0) if (check_winnt() && OPENSSL_isservice() > 0)
{ HANDLE h = RegisterEventSource(0,_T("OPENSSL")); { HANDLE h = RegisterEventSource(0,_T("OPENSSL"));
const TCHAR *pmsg=buf; const TCHAR *pmsg=buf;
ReportEvent(h,EVENTLOG_ERROR_TYPE,0,0,0,1,0,&pmsg,0); ReportEvent(h,EVENTLOG_ERROR_TYPE,0,0,0,1,0,&pmsg,0);

2
crypto/rand/rand_win.c
View File

@ -750,7 +750,7 @@ static void readscreen(void)
int y; /* y-coordinate of screen lines to grab */ int y; /* y-coordinate of screen lines to grab */
int n = 16; /* number of screen lines to grab at a time */ int n = 16; /* number of screen lines to grab at a time */
if (GetVersion() < 0x80000000 && OPENSSL_isservice()>0) if (check_winnt() && OPENSSL_isservice()>0)
return; return;
/* Create a screen DC and a memory DC compatible to screen DC */ /* Create a screen DC and a memory DC compatible to screen DC */

7
e_os.h
View File

@ -371,6 +371,13 @@ static unsigned int _strlen31(const char *str)
# define DEFAULT_HOME "C:" # define DEFAULT_HOME "C:"
# endif # endif
/* Avoid Windows 8 SDK GetVersion deprecated problems */
#if defined(_MSC_VER) && _MSC_VER>=1800
# define check_winnt() (1)
#else
# define check_winnt() (GetVersion() < 0x80000000)
#endif
#else /* The non-microsoft world */ #else /* The non-microsoft world */
# ifdef OPENSSL_SYS_VMS # ifdef OPENSSL_SYS_VMS