Commit 2031eca5 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

WCE-specific fix for cryptlib.c.

parent 6321c3a0

crypto/cryptlib.c

+6 −16
Original line number Diff line number Diff line
@@ -661,6 +661,8 @@ int OPENSSL_isservice(void) 
#endif

    else				return 0;

}

#else

int OPENSSL_isservice(void) { return 0; }

#endif



void OPENSSL_showfatal (const char *fmta,...)
@@ -669,6 +671,7 @@ void OPENSSL_showfatal (const char *fmta,...) 
  const TCHAR *fmt;

  HANDLE h;



#ifdef STD_ERROR_HANDLE	/* what a dirty trick! */

    if ((h=GetStdHandle(STD_ERROR_HANDLE)) != NULL &&

	GetFileType(h)!=FILE_TYPE_UNKNOWN)

    {	/* must be console application */
@@ -677,9 +680,10 @@ void OPENSSL_showfatal (const char *fmta,...) 
	va_end (ap);

	return;

    }

#endif



    if (sizeof(TCHAR)==sizeof(char))

	fmt=fmta;

	fmt=(const TCHAR *)fmta;

    else do

    { int    keepgoing;

      size_t len_0=strlen(fmta)+1,i;
@@ -730,21 +734,7 @@ void OPENSSL_showfatal (const char *fmta,...) 
    }

    else

#endif

    {	MSGBOXPARAMS         m;



	m.cbSize             = sizeof(m);

	m.hwndOwner          = NULL;

	m.lpszCaption        = _T("OpenSSL: FATAL");

	m.dwStyle            = MB_OK;

	m.hInstance          = NULL;

	m.lpszIcon           = IDI_ERROR;

	m.dwContextHelpId    = 0;

	m.lpfnMsgBoxCallback = NULL;

	m.dwLanguageId       = MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US);

	m.lpszText           = buf;



	MessageBoxIndirect (&m);

    }

	MessageBox (NULL,buf,_T("OpenSSL: FATAL"),MB_OK|MB_ICONSTOP|MB_TASKMODAL);

}

#else

void OPENSSL_showfatal (const char *fmta,...)

e_os.h

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ extern "C" { 
#  define NO_DIRENT



#  ifdef WINDOWS

#    ifndef _WIN32_WINNT

#    if !defined(_WIN32_WCE) && !defined(_WIN32_WINNT)

       /*

	* Defining _WIN32_WINNT here in e_os.h implies certain "discipline."

	* Most notably we ought to check for availability of each specific