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

WCE-specific fix for cryptlib.c [from HEAD].

Browse Source
This commit is contained in:
Andy Polyakov 2005-08-02 22:21:07 +00:00
parent 77ef1a989d
commit 93cf2b17bf
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
crypto/cryptlib.c
View File

@ -661,6 +661,8 @@ int OPENSSL_isservice(void)
#endif #endif
else return 0; else return 0;
} }
#else
int OPENSSL_isservice(void) { return 0; }
#endif #endif
void OPENSSL_showfatal (const char *fmta,...) void OPENSSL_showfatal (const char *fmta,...)
@ -669,6 +671,7 @@ void OPENSSL_showfatal (const char *fmta,...)
const TCHAR *fmt; const TCHAR *fmt;
HANDLE h; HANDLE h;
#ifdef STD_ERROR_HANDLE /* what a dirty trick! */
if ((h=GetStdHandle(STD_ERROR_HANDLE)) != NULL && if ((h=GetStdHandle(STD_ERROR_HANDLE)) != NULL &&
GetFileType(h)!=FILE_TYPE_UNKNOWN) GetFileType(h)!=FILE_TYPE_UNKNOWN)
{ /* must be console application */ { /* must be console application */
@ -677,9 +680,10 @@ void OPENSSL_showfatal (const char *fmta,...)
va_end (ap); va_end (ap);
return; return;
} }
#endif
if (sizeof(TCHAR)==sizeof(char)) if (sizeof(TCHAR)==sizeof(char))
fmt=fmta; fmt=(const TCHAR *)fmta;
else do else do
{ int keepgoing; { int keepgoing;
size_t len_0=strlen(fmta)+1,i; size_t len_0=strlen(fmta)+1,i;
@ -730,21 +734,7 @@ void OPENSSL_showfatal (const char *fmta,...)
} }
else else
#endif #endif
{ MSGBOXPARAMS m; MessageBox (NULL,buf,_T("OpenSSL: FATAL"),MB_OK|MB_ICONSTOP|MB_TASKMODAL);
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);
}
} }
#else #else
void OPENSSL_showfatal (const char *fmta,...) void OPENSSL_showfatal (const char *fmta,...)

2
e_os.h
View File

@ -245,7 +245,7 @@ extern "C" {
# define NO_DIRENT # define NO_DIRENT
# ifdef WINDOWS # ifdef WINDOWS
# ifndef _WIN32_WINNT # if !defined(_WIN32_WCE) && !defined(_WIN32_WINNT)
/* /*
* Defining _WIN32_WINNT here in e_os.h implies certain "discipline." * Defining _WIN32_WINNT here in e_os.h implies certain "discipline."
* Most notably we ought to check for availability of each specific * Most notably we ought to check for availability of each specific