From 68a252b7d9b1335f2236481163d17395a08c3327 Mon Sep 17 00:00:00 2001 From: hobbs Date: Wed, 6 Sep 2000 22:37:23 +0000 Subject: * win/tclWinLoad.c (TclpLoadFile): added special message for ERROR_PROC_NOT_FOUND exception in loading a dll. * win/tclWinError.c: changed ERROR_PROC_NOT_FOUND to map from ESRCH (POSIX: no such process) to EINVAL because there is no good mapping for "procedure not found". --- ChangeLog | 6 ++++++ win/tclWinError.c | 4 ++-- win/tclWinLoad.c | 10 +++++++--- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 70a4cb2..ab097ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2000-09-06 Jeff Hobbs + * win/tclWinLoad.c (TclpLoadFile): added special message for + ERROR_PROC_NOT_FOUND exception in loading a dll. + * win/tclWinError.c: changed ERROR_PROC_NOT_FOUND to map from + ESRCH (POSIX: no such process) to EINVAL because there is no good + mapping for "procedure not found". + * README: * generic/tcl.h: * library/tcltest1.0/tcltest.tcl: diff --git a/win/tclWinError.c b/win/tclWinError.c index 7786334..1bc66cd 100644 --- a/win/tclWinError.c +++ b/win/tclWinError.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclWinError.c,v 1.3 1999/04/16 00:48:08 stanton Exp $ + * RCS: @(#) $Id: tclWinError.c,v 1.4 2000/09/06 22:37:24 hobbs Exp $ */ #include "tclWinInt.h" @@ -147,7 +147,7 @@ static char errorTable[] = { EINVAL, /* 124 */ EINVAL, /* 125 */ EINVAL, /* 126 */ - ESRCH, /* ERROR_PROC_NOT_FOUND 127 */ + EINVAL, /* ERROR_PROC_NOT_FOUND 127 */ ECHILD, /* ERROR_WAIT_NO_CHILDREN 128 */ ECHILD, /* ERROR_CHILD_NOT_COMPLETE 129 */ EBADF, /* ERROR_DIRECT_ACCESS_HANDLE 130 */ diff --git a/win/tclWinLoad.c b/win/tclWinLoad.c index 360b629..8afbefe 100644 --- a/win/tclWinLoad.c +++ b/win/tclWinLoad.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclWinLoad.c,v 1.5 2000/02/10 09:53:57 hobbs Exp $ + * RCS: @(#) $Id: tclWinLoad.c,v 1.6 2000/09/06 22:37:24 hobbs Exp $ */ #include "tclWinInt.h" @@ -87,8 +87,12 @@ TclpLoadFile(interp, fileName, sym1, sym2, proc1Ptr, proc2Ptr, clientDataPtr) case ERROR_MOD_NOT_FOUND: case ERROR_DLL_NOT_FOUND: Tcl_AppendResult(interp, "this library or a dependent library", - " could not be found in library path", (char *) - NULL); + " could not be found in library path", + (char *) NULL); + break; + case ERROR_PROC_NOT_FOUND: + Tcl_AppendResult(interp, "could not find specified procedure", + (char *) NULL); break; case ERROR_INVALID_DLL: Tcl_AppendResult(interp, "this library or a dependent library", -- cgit v0.12