Commit 910b3a81 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Avoid Windows 8 Getversion deprecated errors. 

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 a4cc3c80)
parent 24a47191

apps/apps.c

+1 −1
Original line number Diff line number Diff line
@@ -2772,7 +2772,7 @@ double app_tminterval(int stop,int usertime) 


	if (proc==NULL)

		{

		if (GetVersion() < 0x80000000)

		if (check_winnt())

			proc = OpenProcess(PROCESS_QUERY_INFORMATION,FALSE,

						GetCurrentProcessId());

		if (proc==NULL) proc = (HANDLE)-1;

crypto/bio/bss_log.c

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static int MS_CALLBACK slg_puts(BIO *bp, const char *str) 


static void xopenlog(BIO* bp, char* name, int level)

{

	if (GetVersion() < 0x80000000)

	if (check_winnt())

		bp->ptr = RegisterEventSourceA(NULL,name);

	else

		bp->ptr = NULL;

crypto/cryptlib.c

+1 −1
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ void OPENSSL_showfatal (const char *fmta,...) 


#if defined(_WIN32_WINNT) && _WIN32_WINNT>=0x0333

    /* this -------------v--- guards NT-specific calls */

    if (GetVersion() < 0x80000000 && OPENSSL_isservice() > 0)

    if (check_winnt() && OPENSSL_isservice() > 0)

    {	HANDLE h = RegisterEventSource(0,_T("OPENSSL"));

	const TCHAR *pmsg=buf;

	ReportEvent(h,EVENTLOG_ERROR_TYPE,0,0,0,1,0,&pmsg,0);

crypto/rand/rand_win.c

+1 −1
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ static void readscreen(void) 
  int		y;		/* y-coordinate of screen lines to grab */

  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;



  /* Create a screen DC and a memory DC compatible to screen DC */

e_os.h

+7 −0
Original line number Diff line number Diff line
@@ -371,6 +371,13 @@ static unsigned int _strlen31(const char *str) 
#    define DEFAULT_HOME  "C:"

#  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 */



#  ifdef OPENSSL_SYS_VMS