Fix the call to FormatMessage under Windows.
This commit is contained in:
parent
e4540c3d0d
commit
a9dfef0f55
15
t-dll.cc
15
t-dll.cc
|
|
@ -17,7 +17,7 @@
|
||||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||||
*/
|
*/
|
||||||
#ifdef HAVE_CVS_IDENT
|
#ifdef HAVE_CVS_IDENT
|
||||||
#ident "$Id: t-dll.cc,v 1.99 2002/11/03 22:44:19 steve Exp $"
|
#ident "$Id: t-dll.cc,v 1.100 2002/11/05 02:12:35 steve Exp $"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
# include "config.h"
|
# include "config.h"
|
||||||
|
|
@ -36,7 +36,8 @@
|
||||||
|
|
||||||
inline ivl_dll_t ivl_dlopen(const char *name)
|
inline ivl_dll_t ivl_dlopen(const char *name)
|
||||||
{
|
{
|
||||||
return (ivl_dll_t) LoadLibrary(name);
|
ivl_dll_t res = (ivl_dll_t) LoadLibrary(name);
|
||||||
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -53,14 +54,15 @@ inline void ivl_dlclose(ivl_dll_t dll)
|
||||||
|
|
||||||
const char *dlerror(void)
|
const char *dlerror(void)
|
||||||
{
|
{
|
||||||
static char msg[255];
|
static char msg[256];
|
||||||
|
unsigned long err = GetLastError();
|
||||||
FormatMessage(
|
FormatMessage(
|
||||||
FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
|
FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
|
||||||
NULL,
|
NULL,
|
||||||
GetLastError(),
|
err,
|
||||||
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
|
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
|
||||||
(LPTSTR) &msg,
|
(LPTSTR) &msg,
|
||||||
0,
|
sizeof(msg) - 1,
|
||||||
NULL
|
NULL
|
||||||
);
|
);
|
||||||
return msg;
|
return msg;
|
||||||
|
|
@ -1979,6 +1981,9 @@ extern const struct target tgt_dll = { "dll", &dll_target_obj };
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* $Log: t-dll.cc,v $
|
* $Log: t-dll.cc,v $
|
||||||
|
* Revision 1.100 2002/11/05 02:12:35 steve
|
||||||
|
* Fix the call to FormatMessage under Windows.
|
||||||
|
*
|
||||||
* Revision 1.99 2002/11/03 22:44:19 steve
|
* Revision 1.99 2002/11/03 22:44:19 steve
|
||||||
* Cast for gcc convenience.
|
* Cast for gcc convenience.
|
||||||
*
|
*
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue