merge core-8-branch

31 files changed, 412 insertions, 209 deletions

diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob
index c85b488..08e405d 100644
--- a/.fossil-settings/ignore-glob
+++ b/.fossil-settings/ignore-glob
@@ -44,5 +44,6 @@ unix/pkgs/*
 win/Debug*
 win/Release*
 win/pkgs/*
+win/coffbase.txt
 win/tcl.hpj
 win/nmhlp-out.txt
diff --git a/changes b/changes
index ec8beb1..f89704b 100644
--- a/changes
+++ b/changes
@@ -8234,7 +8234,7 @@ Dropped support for OS X versions less than 10.4 (Tiger) (fellows)
 
 2013-05-16 (platform support) mingw-4.0 (nijtmans)
 
-2013-05-19 (platform support) FreeBSD updates (gahr)
+2013-05-19 (platform support) FreeBSD updates (cerutti)
 
 2013-05-20 (bug fix)[3613567] access error temp file creation (keene)
 
@@ -8657,7 +8657,7 @@ improvements to regexp engine from Postgres (lane,porter,fellows,seltenreich)
 
 2016-05-21 (bug)[f7d4e] [namespace delete] performance (fellows)
 
-2016-06-02 (TIP 447) execution time verbosity option (gahr)
+2016-06-02 (TIP 447) execution time verbosity option (cerutti)
 => tcltest 2.4.0
 
 2016-06-16 (bug)[16828b] crash due to [vwait] trace undo fail (dah,porter)
@@ -8796,6 +8796,45 @@ improvements to regexp engine from Postgres (lane,porter,fellows,seltenreich)
 
 --- Released 8.6.7, August 9, 2017 --- http://core.tcl.tk/tcl/ for details
 
+2017-08-10 [array names -regexp] supports backrefs (goth)
+
+2017-08-10 Fix gcc build failures due to #pragma placement (cassoff,fellows)
+
+2017-08-29 (bug)[b50fb2] exec redir append stdout and stderr to file (coulter)
+
+2017-08-31 (bug)[2a9465] http state 100 continue handling broken (oehlmann)
+=> http 2.8.12
+
+2017-09-02 (bug)[0e4d88] replace command, delete trace kills namespace (porter)
+
+2017-10-19 (bug)[1a5655] [info * methods] includes mixins (fellows)
+
+2017-10-23 tzdata updated to Olson's tzdata2017c (jima)
+
+2017-10-24 (bug)[fc1409] segfault in method cloning, oo-15.15 (coulter,fellows)
+
+2017-11-03 (bug)[6f2f83] More robust [load] for ReactOS (werner)
+
+2017-11-08 (bug)[3298012] Stop crash when hash tables overflow 32 bits (porter)
+
+2017-11-14 (bug)[5d6de6] Close failing case of [package prefer stable] (kupries)
+
+2017-11-17 (bug)[fab924] Fix misleading [load] message on Windows (oehlmann)
+
+2017-12-05 (bug)[4f6a1e] Crash when ensemble map and list are same (sebres)
+
+2017-12-06 (bug)[ce3a21] file normalize failure when tail is empty (porter)
+
+2017-12-08 (new)[TIP 477] nmake build system reform (nadkarni)
+
+2017-12-19 (bug)[586e71] EvalObjv exception handling at level #0 (sebres,porter)
+
+--- Released 8.6.8, December 22, 2017 --- http://core.tcl.tk/tcl/ for details
+
+Changes to 8.7a1 include all changes to the 8.6 line through 8.6.7,
+plus the following, which focuses on the high-level feature changes
+in this changeset (new minor version) rather than bug fixes:
+
 2016-03-17 (bug)[0b8c38] socket accept callbacks always in global ns (porter)
         *** POTENTIAL INCOMPATIBILITY ***
 
@@ -8836,7 +8875,6 @@ improvements to regexp engine from Postgres (lane,porter,fellows,seltenreich)
 2017-06-23 (TIP 472) Support 0d as prefix of decimal numbers (iyer,griffin)
 
 2017-08-31 (bug)[2a9465] http state 100 continue handling broken (oehlmann)
-=> http 2.8.12
 
 2017-09-02 (bug)[0e4d88] replace command, delete trace kills namespace (porter)
 
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index ce46cd4..55bb24e 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -954,9 +954,11 @@ Tcl_CreateInterp(void)
 
     Tcl_SetVar2(interp, "tcl_patchLevel", NULL, TCL_PATCH_LEVEL, TCL_GLOBAL_ONLY);
     Tcl_SetVar2(interp, "tcl_version", NULL, TCL_VERSION, TCL_GLOBAL_ONLY);
+#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
     Tcl_TraceVar2(interp, "tcl_precision", NULL,
 	    TCL_GLOBAL_ONLY|TCL_TRACE_READS|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
 	    TclPrecTraceProc, NULL);
+#endif /* !TCL_NO_DEPRECATED */
     TclpSetVariables(interp);
 
 #ifdef TCL_THREADS
@@ -4607,7 +4609,7 @@ TEOV_Exception(
 	if (result == TCL_RETURN) {
 	    result = TclUpdateReturnInfo(iPtr);
 	}
-	if ((result != TCL_ERROR) && !allowExceptions) {
+	if ((result != TCL_OK) && (result != TCL_ERROR) && !allowExceptions) {
 	    ProcessUnexpectedResult(interp, result);
 	    result = TCL_ERROR;
 	}
@@ -4788,7 +4790,7 @@ TEOV_RunEnterTraces(
 {
     Interp *iPtr = (Interp *) interp;
     Command *cmdPtr = *cmdPtrPtr;
-    size_t newEpoch, cmdEpoch = cmdPtr->cmdEpoch;
+    unsigned int newEpoch, cmdEpoch = cmdPtr->cmdEpoch;
     int length, traceCode = TCL_OK;
     const char *command = TclGetStringFromObj(commandPtr, &length);
 
diff --git a/generic/tclCompile.h b/generic/tclCompile.h
index bd7aaab..f20ecfd 100644
--- a/generic/tclCompile.h
+++ b/generic/tclCompile.h
@@ -425,11 +425,11 @@ typedef struct ByteCode {
 				 * compiled. If the code is executed if a
 				 * different namespace, it must be
 				 * recompiled. */
-    size_t nsEpoch;		/* Value of nsPtr->resolverEpoch when this
+    unsigned int nsEpoch;	/* Value of nsPtr->resolverEpoch when this
 				 * ByteCode was compiled. Used to invalidate
 				 * code when new namespace resolution rules
 				 * are put into effect. */
-    int refCount;		/* Reference count: set 1 when created plus 1
+    unsigned int refCount;	/* Reference count: set 1 when created plus 1
 				 * for each execution of the code currently
 				 * active. This structure can be freed when
 				 * refCount becomes zero. */
diff --git a/generic/tclDisassemble.c b/generic/tclDisassemble.c
index d61ed42..e07080a 100644
--- a/generic/tclDisassemble.c
+++ b/generic/tclDisassemble.c
@@ -254,7 +254,7 @@ DisassembleByteCodeObj(
     Tcl_Obj *bufferObj, *fileObj;
 
     TclNewObj(bufferObj);
-    if (codePtr->refCount <= 0) {
+    if (!codePtr->refCount) {
 	return bufferObj;	/* Already freed. */
     }
 
@@ -312,7 +312,7 @@ DisassembleByteCodeObj(
 	int numCompiledLocals = procPtr->numCompiledLocals;
 
 	Tcl_AppendPrintfToObj(bufferObj,
-		"  Proc %p, refCt %d, args %d, compiled locals %d\n",
+		"  Proc %p, refCt %u, args %d, compiled locals %d\n",
 		procPtr, procPtr->refCount, procPtr->numArgs,
 		numCompiledLocals);
 	if (numCompiledLocals > 0) {
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index e1e26d3..46db12c 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -3609,7 +3609,7 @@ unilen(
 static void
 InitializeEncodingSearchPath(
     char **valuePtr,
-    size_t *lengthPtr,
+    unsigned int *lengthPtr,
     Tcl_Encoding *encodingPtr)
 {
     const char *bytes;
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c
index 580ea5c..e7bfbac 100644
--- a/generic/tclEnsemble.c
+++ b/generic/tclEnsemble.c
@@ -92,7 +92,7 @@ static const Tcl_ObjType ensembleCmdType = {
  */
 
 typedef struct {
-    size_t epoch;               /* Used to confirm when the data in this
+    unsigned int epoch;         /* Used to confirm when the data in this
                                  * really structure matches up with the
                                  * ensemble. */
     Command *token;             /* Reference to the command for which this
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 95664d0..f2cda0c 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -9476,9 +9476,9 @@ PrintByteCodeInfo(
     Proc *procPtr = codePtr->procPtr;
     Interp *iPtr = (Interp *) *codePtr->interpHandle;
 
-    fprintf(stdout, "\nExecuting ByteCode 0x%p, refCt %" TCL_LL_MODIFIER "u, epoch %" TCL_LL_MODIFIER "u, interp 0x%p (epoch %" TCL_LL_MODIFIER "u)\n",
-	    codePtr, (Tcl_WideInt)codePtr->refCount, (Tcl_WideInt)codePtr->compileEpoch, iPtr,
-	    (Tcl_WideInt)iPtr->compileEpoch);
+    fprintf(stdout, "\nExecuting ByteCode 0x%p, refCt %" TCL_LL_MODIFIER "u, epoch %u, interp 0x%p (epoch %u)\n",
+	    codePtr, (Tcl_WideInt)codePtr->refCount, codePtr->compileEpoch, iPtr,
+	    iPtr->compileEpoch);
 
     fprintf(stdout, "  Source: ");
     TclPrintSource(stdout, codePtr->source, 60);
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index 33bf0b3..175ea9c 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -355,7 +355,7 @@ declare 81 {
 #  declare 87 {
 #      void TclPlatformInit(Tcl_Interp *interp)
 #  }
-declare 88 {
+declare 88 {deprecated {}} {
     char *TclPrecTraceProc(ClientData clientData, Tcl_Interp *interp,
 	    const char *name1, const char *name2, int flags)
 }
diff --git a/generic/tclInt.h b/generic/tclInt.h
index ad1d9c6..2ba0493 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -265,7 +265,7 @@ typedef struct Namespace {
 				 * strings; values have type (Namespace *). If
 				 * NULL, there are no children. */
 #endif
-    size_t nsId;		/* Unique id for the namespace. */
+    unsigned long nsId;		/* Unique id for the namespace. */
     Tcl_Interp *interp;		/* The interpreter containing this
 				 * namespace. */
     int flags;			/* OR-ed combination of the namespace status
@@ -274,7 +274,7 @@ typedef struct Namespace {
 				 * frames for this namespace that are on the
 				 * Tcl call stack. The namespace won't be
 				 * freed until activationCount becomes zero. */
-    int refCount;		/* Count of references by namespaceName
+    unsigned int refCount;	/* Count of references by namespaceName
 				 * objects. The namespace can't be freed until
 				 * refCount becomes zero. */
     Tcl_HashTable cmdTable;	/* Contains all the commands currently
@@ -299,12 +299,12 @@ typedef struct Namespace {
 				 * registered using "namespace export". */
     int maxExportPatterns;	/* Mumber of export patterns for which space
 				 * is currently allocated. */
-    size_t cmdRefEpoch;		/* Incremented if a newly added command
+    unsigned int cmdRefEpoch;	/* Incremented if a newly added command
 				 * shadows a command for which this namespace
 				 * has already cached a Command* pointer; this
 				 * causes all its cached Command* pointers to
 				 * be invalidated. */
-    size_t resolverEpoch;	/* Incremented whenever (a) the name
+    unsigned int resolverEpoch;	/* Incremented whenever (a) the name
 				 * resolution rules change for this namespace
 				 * or (b) a newly added command shadows a
 				 * command that is compiled to bytecodes. This
@@ -331,7 +331,7 @@ typedef struct Namespace {
 				 * LookupCompiledLocal to resolve variable
 				 * references within the namespace at compile
 				 * time. */
-    size_t exportLookupEpoch;	/* Incremented whenever a command is added to
+    unsigned int exportLookupEpoch;	/* Incremented whenever a command is added to
 				 * a namespace, removed from a namespace or
 				 * the exports of a namespace are changed.
 				 * Allows TIP#112-driven command lists to be
@@ -432,7 +432,7 @@ typedef struct EnsembleConfig {
 				 * if the command has been deleted (or never
 				 * existed; the global namespace never has an
 				 * ensemble command.) */
-    size_t epoch;		/* The epoch at which this ensemble's table of
+    unsigned int epoch;		/* The epoch at which this ensemble's table of
 				 * exported commands is valid. */
     char **subcommandArrayPtr;	/* Array of ensemble subcommand names. At all
 				 * consistent points, this will have the same
@@ -545,7 +545,7 @@ typedef struct CommandTrace {
     struct CommandTrace *nextPtr;
 				/* Next in list of traces associated with a
 				 * particular command. */
-    int refCount;		/* Used to ensure this structure is not
+    size_t refCount;	/* Used to ensure this structure is not
 				 * deleted too early. Keeps track of how many
 				 * pieces of code have a pointer to this
 				 * structure. */
@@ -618,7 +618,7 @@ typedef struct Var {
 
 typedef struct VarInHash {
     Var var;
-    int refCount;		/* Counts number of active uses of this
+    unsigned int refCount;	/* Counts number of active uses of this
 				 * variable: 1 for the entry in the hash
 				 * table, 1 for each additional variable whose
 				 * linkPtr points here, 1 for each nested
@@ -950,7 +950,7 @@ typedef struct CompiledLocal {
 typedef struct Proc {
     struct Interp *iPtr;	/* Interpreter for which this command is
 				 * defined. */
-    int refCount;		/* Reference count: 1 if still present in
+    unsigned int refCount;	/* Reference count: 1 if still present in
 				 * command table plus 1 for each call to the
 				 * procedure that is currently active. This
 				 * structure can be freed when refCount
@@ -1067,7 +1067,7 @@ typedef struct AssocData {
  */
 
 typedef struct LocalCache {
-    int refCount;
+    unsigned int refCount;
     int numVars;
     Tcl_Obj *varName0;
 } LocalCache;
@@ -1229,7 +1229,7 @@ typedef struct CmdFrame {
 typedef struct CFWord {
     CmdFrame *framePtr;		/* CmdFrame to access. */
     int word;			/* Index of the word in the command. */
-    int refCount;		/* Number of times the word is on the
+    unsigned int refCount;	/* Number of times the word is on the
 				 * stack. */
 } CFWord;
 
@@ -1492,11 +1492,11 @@ typedef struct LiteralEntry {
 				 * NULL if end of chain. */
     Tcl_Obj *objPtr;		/* Points to Tcl object that holds the
 				 * literal's bytes and length. */
-    int refCount;		/* If in an interpreter's global literal
+    size_t refCount;		/* If in an interpreter's global literal
 				 * table, the number of ByteCode structures
 				 * that share the literal object; the literal
 				 * entry can be freed when refCount drops to
-				 * 0. If in a local literal table, -1. */
+				 * 0. If in a local literal table, (size_t)-1. */
     Namespace *nsPtr;		/* Namespace in which this literal is used. We
 				 * try to avoid sharing literal non-FQ command
 				 * names among different namespaces to reduce
@@ -1516,7 +1516,7 @@ typedef struct LiteralTable {
 				 * table. */
     int rebuildSize;		/* Enlarge table when numEntries gets to be
 				 * this large. */
-    int mask;			/* Mask value used in hashing function. */
+    unsigned int mask;		/* Mask value used in hashing function. */
 } LiteralTable;
 
 /*
@@ -1634,12 +1634,12 @@ typedef struct Command {
 				 * recreated). */
     Namespace *nsPtr;		/* Points to the namespace containing this
 				 * command. */
-    int refCount;		/* 1 if in command hashtable plus 1 for each
+    unsigned int refCount;	/* 1 if in command hashtable plus 1 for each
 				 * reference from a CmdName Tcl object
 				 * representing a command's name in a ByteCode
 				 * instruction sequence. This structure can be
 				 * freed when refCount becomes zero. */
-    size_t cmdEpoch;		/* Incremented to invalidate any references
+    unsigned int cmdEpoch;	/* Incremented to invalidate any references
 				 * that point to this command when it is
 				 * renamed, deleted, hidden, or exposed. */
     CompileProc *compileProc;	/* Procedure called to compile command. NULL
@@ -2384,7 +2384,7 @@ typedef enum TclEolTranslation {
  */
 
 typedef struct List {
-    int refCount;
+    unsigned int refCount;
     int maxElemCount;		/* Total number of element array slots. */
     int elemCount;		/* Current number of list elements. */
     int canonicalFlag;		/* Set if the string representation was
@@ -2626,7 +2626,7 @@ typedef Tcl_ObjCmdProc *TclObjCmdProcType;
  *----------------------------------------------------------------
  */
 
-typedef void (TclInitProcessGlobalValueProc)(char **valuePtr, size_t *lengthPtr,
+typedef void (TclInitProcessGlobalValueProc)(char **valuePtr, unsigned int *lengthPtr,
 	Tcl_Encoding *encodingPtr);
 
 /*
@@ -2638,9 +2638,9 @@ typedef void (TclInitProcessGlobalValueProc)(char **valuePtr, size_t *lengthPtr,
  */
 
 typedef struct ProcessGlobalValue {
-    size_t epoch;		/* Epoch counter to detect changes in the
+    unsigned int epoch;		/* Epoch counter to detect changes in the
 				 * master value. */
-    size_t numBytes;		/* Length of the master string. */
+    unsigned int numBytes;	/* Length of the master string. */
     char *value;		/* The master string value. */
     Tcl_Encoding encoding;	/* system encoding when master string was
 				 * initialized. */
@@ -2960,10 +2960,8 @@ MODULE_SCOPE char *	TclDStringAppendDString(Tcl_DString *dsPtr,
 MODULE_SCOPE Tcl_Obj *	TclDStringToObj(Tcl_DString *dsPtr);
 MODULE_SCOPE Tcl_Obj *const *	TclFetchEnsembleRoot(Tcl_Interp *interp,
 			    Tcl_Obj *const *objv, int objc, int *objcPtr);
-Tcl_Namespace * 	TclEnsureNamespace(
-			    Tcl_Interp *interp,
+MODULE_SCOPE Tcl_Namespace * 	TclEnsureNamespace(Tcl_Interp *interp,
 			    Tcl_Namespace *namespacePtr);
-
 MODULE_SCOPE void	TclFinalizeAllocSubsystem(void);
 MODULE_SCOPE void	TclFinalizeAsync(void);
 MODULE_SCOPE void	TclFinalizeDoubleConversion(void);
@@ -3125,7 +3123,7 @@ MODULE_SCOPE int	TclpThreadCreate(Tcl_ThreadId *idPtr,
 			    int stackSize, int flags);
 MODULE_SCOPE int	TclpFindVariable(const char *name, int *lengthPtr);
 MODULE_SCOPE void	TclpInitLibraryPath(char **valuePtr,
-			    size_t *lengthPtr, Tcl_Encoding *encodingPtr);
+			    unsigned int *lengthPtr, Tcl_Encoding *encodingPtr);
 MODULE_SCOPE void	TclpInitLock(void);
 MODULE_SCOPE void	TclpInitPlatform(void);
 MODULE_SCOPE void	TclpInitUnlock(void);
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index 5848bb3..bc8f7b8 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -233,7 +233,8 @@ EXTERN char *		TclpRealloc(char *ptr, unsigned int size);
 /* Slot 86 is reserved */
 /* Slot 87 is reserved */
 /* 88 */
-EXTERN char *		TclPrecTraceProc(ClientData clientData,
+TCL_DEPRECATED("")
+char *			TclPrecTraceProc(ClientData clientData,
 				Tcl_Interp *interp, const char *name1,
 				const char *name2, int flags);
 /* 89 */
@@ -743,7 +744,7 @@ typedef struct TclIntStubs {
     void (*reserved85)(void);
     void (*reserved86)(void);
     void (*reserved87)(void);
-    char * (*tclPrecTraceProc) (ClientData clientData, Tcl_Interp *interp, const char *name1, const char *name2, int flags); /* 88 */
+    TCL_DEPRECATED_API("") char * (*tclPrecTraceProc) (ClientData clientData, Tcl_Interp *interp, const char *name1, const char *name2, int flags); /* 88 */
     int (*tclPreventAliasLoop) (Tcl_Interp *interp, Tcl_Interp *cmdInterp, Tcl_Command cmd); /* 89 */
     void (*reserved90)(void);
     void (*tclProcCleanupProc) (Proc *procPtr); /* 91 */
diff --git a/generic/tclLiteral.c b/generic/tclLiteral.c
index 7acc9ad..003884d 100644
--- a/generic/tclLiteral.c
+++ b/generic/tclLiteral.c
@@ -186,7 +186,7 @@ TclCreateLiteral(
 {
     LiteralTable *globalTablePtr = &iPtr->literalTable;
     LiteralEntry *globalPtr;
-    int globalHash;
+    unsigned int globalHash;
     Tcl_Obj *objPtr;
 
     /*
@@ -393,7 +393,8 @@ TclRegisterLiteral(
     LiteralEntry *globalPtr, *localPtr;
     Tcl_Obj *objPtr;
     unsigned hash;
-    int localHash, objIndex, new;
+    unsigned int localHash;
+    int objIndex, new;
     Namespace *nsPtr;
 
     if (length < 0) {
@@ -537,7 +538,8 @@ TclHideLiteral(
 {
     LiteralEntry **nextPtrPtr, *entryPtr, *lPtr;
     LiteralTable *localTablePtr = &envPtr->localLitTable;
-    int localHash, length;
+    unsigned int localHash;
+    int length;
     const char *bytes;
     Tcl_Obj *newObjPtr;
 
@@ -556,7 +558,7 @@ TclHideLiteral(
     lPtr->objPtr = newObjPtr;
 
     bytes = TclGetStringFromObj(newObjPtr, &length);
-    localHash = (HashString(bytes, length) & localTablePtr->mask);
+    localHash = HashString(bytes, length) & localTablePtr->mask;
     nextPtrPtr = &localTablePtr->buckets[localHash];
 
     for (entryPtr=*nextPtrPtr ; entryPtr!=NULL ; entryPtr=*nextPtrPtr) {
@@ -612,7 +614,7 @@ TclAddLiteralObj(
     lPtr = &envPtr->literalArrayPtr[objIndex];
     lPtr->objPtr = objPtr;
     Tcl_IncrRefCount(objPtr);
-    lPtr->refCount = -1;	/* i.e., unused */
+    lPtr->refCount = (size_t)-1;	/* i.e., unused */
     lPtr->nextPtr = NULL;
 
     if (litPtrPtr) {
@@ -809,7 +811,8 @@ TclReleaseLiteral(
     LiteralTable *globalTablePtr;
     register LiteralEntry *entryPtr, *prevPtr;
     const char *bytes;
-    int length, index;
+    int length;
+    unsigned int index;
 
     if (iPtr == NULL) {
 	goto done;
@@ -828,15 +831,13 @@ TclReleaseLiteral(
     for (prevPtr=NULL, entryPtr=globalTablePtr->buckets[index];
 	    entryPtr!=NULL ; prevPtr=entryPtr, entryPtr=entryPtr->nextPtr) {
 	if (entryPtr->objPtr == objPtr) {
-	    entryPtr->refCount--;
-
 	    /*
 	     * If the literal is no longer being used by any ByteCode, delete
 	     * the entry then remove the reference corresponding to the global
 	     * literal table entry (decrement the ref count of the object).
 	     */
 
-	    if (entryPtr->refCount == 0) {
+	    if (entryPtr->refCount-- <= 1) {
 		if (prevPtr == NULL) {
 		    globalTablePtr->buckets[index] = entryPtr->nextPtr;
 		} else {
@@ -954,8 +955,8 @@ RebuildLiteralTable(
     register LiteralEntry *entryPtr;
     LiteralEntry **bucketPtr;
     const char *bytes;
-    unsigned int oldSize;
-    int count, index, length;
+    unsigned int oldSize, index;
+    int count, length;
 
     oldSize = tablePtr->numBuckets;
     oldBuckets = tablePtr->buckets;
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index d661856..f82d23d 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -32,7 +32,7 @@
  */
 
 typedef struct {
-    size_t numNsCreated;	/* Count of the number of namespaces created
+    unsigned long numNsCreated;	/* Count of the number of namespaces created
 				 * within the thread. This value is used as a
 				 * unique id for each namespace. Cannot be
 				 * per-interp because the nsId is used to
@@ -402,7 +402,7 @@ Tcl_PopCallFrame(
     }
     if (framePtr->numCompiledLocals > 0) {
 	TclDeleteCompiledLocalVars(iPtr, framePtr);
-	if (--framePtr->localCachePtr->refCount == 0) {
+	if (framePtr->localCachePtr->refCount-- <= 1) {
 	    TclFreeLocalCache(interp, framePtr->localCachePtr);
 	}
 	framePtr->localCachePtr = NULL;
@@ -916,6 +916,11 @@ Tcl_DeleteNamespace(
     Command *cmdPtr;
 
     /*
+     * Ensure that this namespace doesn't get deallocated in the meantime.
+     */
+    nsPtr->refCount++;
+
+    /*
      * Give anyone interested - notably TclOO - a chance to use this namespace
      * normally despite the fact that the namespace is going to go. Allows the
      * calling of destructors. Will only be called once (unless re-established
@@ -1047,16 +1052,7 @@ Tcl_DeleteNamespace(
 #endif
 	    Tcl_DeleteHashTable(&nsPtr->cmdTable);
 
-	    /*
-	     * If the reference count is 0, then discard the namespace.
-	     * Otherwise, mark it as "dead" so that it can't be used.
-	     */
-
-	    if (nsPtr->refCount == 0) {
-		NamespaceFree(nsPtr);
-	    } else {
-		nsPtr->flags |= NS_DEAD;
-	    }
+	    nsPtr ->flags |= NS_DEAD;
 	} else {
 	    /*
 	     * Restore the ::errorInfo and ::errorCode traces.
@@ -1073,6 +1069,7 @@ Tcl_DeleteNamespace(
 	    nsPtr->flags &= ~(NS_DYING|NS_KILLED);
 	}
     }
+    TclNsDecrRefCount(nsPtr);
 }
 
 /*
diff --git a/generic/tclOOBasic.c b/generic/tclOOBasic.c
index b2c06a7..d874cba 100644
--- a/generic/tclOOBasic.c
+++ b/generic/tclOOBasic.c
@@ -1206,22 +1206,10 @@ TclOOCopyObjectCmd(
 	o2Ptr = Tcl_CopyObjectInstance(interp, oPtr, NULL, NULL);
     } else {
 	const char *name, *namespaceName;
-	Tcl_DString buffer;
 
 	name = TclGetString(objv[2]);
-	Tcl_DStringInit(&buffer);
 	if (name[0] == '\0') {
 	    name = NULL;
-	} else if (name[0]!=':' || name[1]!=':') {
-	    Interp *iPtr = (Interp *) interp;
-
-	    if (iPtr->varFramePtr != NULL) {
-		Tcl_DStringAppend(&buffer,
-			iPtr->varFramePtr->nsPtr->fullName, -1);
-	    }
-	    TclDStringAppendLiteral(&buffer, "::");
-	    Tcl_DStringAppend(&buffer, name, -1);
-	    name = Tcl_DStringValue(&buffer);
 	}
 
 	/*
@@ -1243,7 +1231,6 @@ TclOOCopyObjectCmd(
 	}
 
 	o2Ptr = Tcl_CopyObjectInstance(interp, oPtr, name, namespaceName);
-	Tcl_DStringFree(&buffer);
     }
 
     if (o2Ptr == NULL) {
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 1a00011..4ec0a57 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -344,17 +344,17 @@ typedef struct ResolvedCmdName {
 				 * reference (not the namespace that contains
 				 * the referenced command). NULL if the name
 				 * is fully qualified.*/
-    size_t refNsId;		/* refNsPtr's unique namespace id. Used to
+    unsigned long refNsId;		/* refNsPtr's unique namespace id. Used to
 				 * verify that refNsPtr is still valid (e.g.,
 				 * it's possible that the cmd's containing
 				 * namespace was deleted and a new one created
 				 * at the same address). */
-    size_t refNsCmdEpoch;	/* Value of the referencing namespace's
+    unsigned int refNsCmdEpoch;	/* Value of the referencing namespace's
 				 * cmdRefEpoch when the pointer was cached.
 				 * Before using the cached pointer, we check
 				 * if the namespace's epoch was incremented;
 				 * if so, this cached pointer is invalid. */
-    size_t cmdEpoch;		/* Value of the command's cmdEpoch when this
+    unsigned int cmdEpoch; /* Value of the command's cmdEpoch when this
 				 * pointer was cached. Before using the cached
 				 * pointer, we check if the cmd's epoch was
 				 * incremented; if so, the cmd was renamed,
diff --git a/generic/tclProc.c b/generic/tclProc.c
index b89357c..70dc4dc 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -2380,7 +2380,7 @@ FreeLambdaInternalRep(
     Proc *procPtr = objPtr->internalRep.twoPtrValue.ptr1;
     Tcl_Obj *nsObjPtr = objPtr->internalRep.twoPtrValue.ptr2;
 
-    if (procPtr->refCount-- == 1) {
+    if (procPtr->refCount-- <= 1) {
 	TclProcCleanupProc(procPtr);
     }
     TclDecrRefCount(nsObjPtr);
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 544c28e..bd0971b 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -64,6 +64,7 @@ static int TclSockMinimumBuffersOld(int sock, int size)
 #   define TclGetStartupScriptPath 0
 #   define TclSetStartupScriptFileName 0
 #   define TclGetStartupScriptFileName 0
+#   define TclPrecTraceProc 0
 #   define TclpInetNtoa 0
 #   define TclWinGetServByName 0
 #   define TclWinGetSockOpt 0
@@ -110,7 +111,7 @@ static unsigned short TclWinNToHS(unsigned short ns) {
 }
 #define TclWinGetPlatformId winGetPlatformId
 static int
-TclWinGetPlatformId()
+TclWinGetPlatformId(void)
 {
     return 2; /* VER_PLATFORM_WIN32_NT */;
 }
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 51af016..15018de 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -3298,6 +3298,7 @@ Tcl_PrintDouble(
  *----------------------------------------------------------------------
  */
 
+#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
 	/* ARGSUSED */
 char *
 TclPrecTraceProc(
@@ -3355,6 +3356,7 @@ TclPrecTraceProc(
     *precisionPtr = prec;
     return NULL;
 }
+#endif /* !TCL_NO_DEPRECATED)*/
 
 /*
  *----------------------------------------------------------------------
@@ -4010,7 +4012,7 @@ TclSetProcessGlobalValue(
     Tcl_IncrRefCount(newValue);
     cacheMap = GetThreadHash(&pgvPtr->key);
     ClearHash(cacheMap);
-    hPtr = Tcl_CreateHashEntry(cacheMap, (void *)(pgvPtr->epoch), &dummy);
+    hPtr = Tcl_CreateHashEntry(cacheMap, (void *)(size_t)(pgvPtr->epoch), &dummy);
     Tcl_SetHashValue(hPtr, newValue);
     Tcl_MutexUnlock(&pgvPtr->mutex);
 }
@@ -4036,7 +4038,7 @@ TclGetProcessGlobalValue(
     Tcl_Obj *value = NULL;
     Tcl_HashTable *cacheMap;
     Tcl_HashEntry *hPtr;
-    size_t epoch = pgvPtr->epoch;
+    unsigned int epoch = pgvPtr->epoch;
 
     if (pgvPtr->encoding) {
 	Tcl_Encoding current = Tcl_GetEncoding(NULL, NULL);
@@ -4070,7 +4072,7 @@ TclGetProcessGlobalValue(
 	}
     }
     cacheMap = GetThreadHash(&pgvPtr->key);
-    hPtr = Tcl_FindHashEntry(cacheMap, (void *) (epoch));
+    hPtr = Tcl_FindHashEntry(cacheMap, (void *)(size_t)epoch);
     if (NULL == hPtr) {
 	int dummy;
 
@@ -4103,7 +4105,7 @@ TclGetProcessGlobalValue(
 
 	value = Tcl_NewStringObj(pgvPtr->value, pgvPtr->numBytes);
 	hPtr = Tcl_CreateHashEntry(cacheMap,
-		(void *)(pgvPtr->epoch), &dummy);
+		(void *)(size_t)(pgvPtr->epoch), &dummy);
 	Tcl_MutexUnlock(&pgvPtr->mutex);
 	Tcl_SetHashValue(hPtr, value);
 	Tcl_IncrRefCount(value);
diff --git a/library/init.tcl b/library/init.tcl
index 4424087..530ce58 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -619,8 +619,7 @@ proc auto_execok name {
     set auto_execs($name) ""
 
     set shellBuiltins [list assoc cls copy date del dir echo erase ftype \
-                           md mkdir mklink move rd ren rename rmdir start \
-                           time type ver vol]
+	    md mkdir mklink move rd ren rename rmdir start time type ver vol]
     if {[info exists env(PATHEXT)]} {
 	# Add an initial ; to have the {} extension check first.
 	set execExtensions [split ";$env(PATHEXT)" ";"]
@@ -654,10 +653,7 @@ proc auto_execok name {
 	set windir $env(WINDIR)
     }
     if {[info exists windir]} {
-	if {$tcl_platform(os) eq "Windows NT"} {
-	    append path "$windir/system32;"
-	}
-	append path "$windir/system;$windir;"
+	append path "$windir/system32;$windir/system;$windir;"
     }
 
     foreach var {PATH Path path} {
diff --git a/tests/basic.test b/tests/basic.test
index 7819241..d47613a 100644
--- a/tests/basic.test
+++ b/tests/basic.test
@@ -984,6 +984,16 @@ test basic-49.2 {Tcl_EvalEx: verify TCL_EVAL_GLOBAL operation} testevalex {
     set ::context
 } {global}
 
+test basic-50.1 {[586e71dce4] EvalObjv level #0 exception handling} -setup {
+    interp create slave
+    interp alias {} foo slave return
+} -body {
+    list [catch foo m] $m
+} -cleanup {
+    unset -nocomplain m
+    interp delete slave
+} -result {0 {}}
+
 # Clean up after expand tests
 unset noComp l1 l2 constraints
 rename l3 {}
diff --git a/tests/namespace.test b/tests/namespace.test
index 9fa9331..b9e6ead 100644
--- a/tests/namespace.test
+++ b/tests/namespace.test
@@ -196,6 +196,19 @@ test namespace-7.7 {Bug 1655305} -setup {
     interp delete slave
 } -result {}
 
+test namespace-7.8 {Bug ba1419303b4c} -setup {
+    namespace eval ns1 {
+	namespace ensemble create
+    }
+
+    trace add command ns1 delete {
+	namespace delete ns1
+    }
+} -body {
+    # No segmentation fault given --enable-symbols=mem. 
+    namespace delete ns1
+} -result {}
+
 test namespace-8.1 {TclTeardownNamespace, delete global namespace} {
     catch {interp delete test_interp}
     interp create test_interp
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 032b5ac..f3b9782 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -2050,9 +2050,7 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in $(M
 	cp -p $(TOP_DIR)/win/*.[ch] $(TOP_DIR)/win/*.ico $(TOP_DIR)/win/*.rc \
 		$(DISTDIR)/win
 	cp -p $(TOP_DIR)/win/*.bat $(DISTDIR)/win
-	cp -p $(TOP_DIR)/win/makefile.* $(DISTDIR)/win
-	cp -p $(TOP_DIR)/win/rules.vc $(DISTDIR)/win
-	cp -p $(TOP_DIR)/win/coffbase.txt $(DISTDIR)/win
+	cp -p $(TOP_DIR)/win/*.vc $(DISTDIR)/win
 	cp -p $(TOP_DIR)/win/tcl.hpj.in $(DISTDIR)/win
 	cp -p $(TOP_DIR)/win/tcl.ds* $(DISTDIR)/win
 	cp -p $(TOP_DIR)/win/README $(DISTDIR)/win
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index feeffa6..cc66569 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -39,11 +39,6 @@ DLLIMPORT extern __stdcall void FreeLibrary(void *);
 DLLIMPORT extern __stdcall void *GetProcAddress(void *, const char *);
 DLLIMPORT extern __stdcall void GetSystemInfo(void *);
 
-#define NUMPLATFORMS 4
-static const char *const platforms[NUMPLATFORMS] = {
-    "Win32s", "Windows 95", "Windows NT", "Windows CE"
-};
-
 #define NUMPROCESSORS 11
 static const char *const processors[NUMPROCESSORS] = {
     "intel", "mips", "alpha", "ppc", "shx", "arm", "ia64", "alpha64", "msil",
@@ -453,7 +448,7 @@ TclpInitPlatform(void)
 void
 TclpInitLibraryPath(
     char **valuePtr,
-    size_t *lengthPtr,
+    unsigned int *lengthPtr,
     Tcl_Encoding *encodingPtr)
 {
 #define LIBRARY_SIZE	    32
@@ -890,10 +885,7 @@ TclpSetVariables(
 
     GetSystemInfo(&sysInfo);
 
-    if (osInfo.dwPlatformId < NUMPLATFORMS) {
-	Tcl_SetVar2(interp, "tcl_platform", "os",
-		platforms[osInfo.dwPlatformId], TCL_GLOBAL_ONLY);
-    }
+    Tcl_SetVar2(interp, "tcl_platform", "os", "Windows NT", TCL_GLOBAL_ONLY);
     sprintf(buffer, "%d.%d", osInfo.dwMajorVersion, osInfo.dwMinorVersion);
     Tcl_SetVar2(interp, "tcl_platform", "osVersion", buffer, TCL_GLOBAL_ONLY);
     if (sysInfo.wProcessorArchitecture < NUMPROCESSORS) {
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 45abc01..980ab4d 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -217,7 +217,7 @@ printaddrinfo(
 static void
 InitializeHostName(
     char **valuePtr,
-    size_t *lengthPtr,
+    unsigned int *lengthPtr,
     Tcl_Encoding *encodingPtr)
 {
     const char *native = NULL;
diff --git a/win/coffbase.txt b/win/coffbase.txt
deleted file mode 100644
index 3314f26..0000000
--- a/win/coffbase.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-;

-; This file defines the virtual base addresses for the Dynamic Link Libraries

-; that are part of the Tcl system.  The first token on a line is the key (or name

-; of the DLL) and the second token is the virtual base address, in hexidecimal.

-; The third token is the maximum size of the DLL image file, including symbols.

-;

-; Using a specified "prefered load address" should speed loading time by avoiding

-; relocations (NT supported only).  It is assumed extension authors will contribute

-; their modules to this grand-master list.  You can use the dumpbin utility with

-; the /headers option to get the "size of image" data (already in hex).  If the

-; maximum size is too small a linker warning will occur.  Modules can overlap when

-; they're mutually exclusive.  This info is placed in the DLL's PE header by the

-; linker with the `-base:@$(TCLDIR)\win\coffbase.txt,<key>` option.

-

-tcl		0x10000000	0x00200000

-tcldde		0x10200000	0x00010000

-tclreg		0x10210000	0x00010000

-tk		0x10220000	0x00200000

-expect		0x10480000	0x00080000

-itcl		0x10500000	0x00080000

-itk		0x10580000	0x00080000

-bltlite		0x10600000	0x00080000

-blt		0x10680000	0x00080000

-iocpsock	0x10700000	0x00080000

-tls		0x10780000	0x00100000

-winico		0x10880000	0x00010000

-sample		0x108B0000	0x00010000

-tile		0x10900000	0x00080000

-memchan		0x109D0000	0x00010000

-tdom		0x109E0000	0x00080000

-tclvfs		0x10A70000	0x00010000

-tkvideo		0x10B00000	0x00010000

-tclsdl		0x10B20000	0x00080000

-vqtcl		0x10C00000	0x00010000

-tdbc		0x10C40000	0x00010000

-thread		0x10C80000	0x00020000

-nsf		0x10ca0000	0x00080000

-;

-; insert new packages here

-;

-snack		0x1E000000	0x00400000

-sound		0x1E400000	0x00400000

-snackogg	0x1E800000	0x00200000

diff --git a/win/nmakehlp.c b/win/nmakehlp.c
index 0439d1c..025bb99 100644
--- a/win/nmakehlp.c
+++ b/win/nmakehlp.c
@@ -39,7 +39,6 @@
 #endif
 
 
-
 /* protos */
 
 static int CheckForCompilerFeature(const char *option);
@@ -47,6 +46,7 @@ static int CheckForLinkerFeature(const char **options, int count);
 static int IsIn(const char *string, const char *substring);
 static int SubstituteFile(const char *substs, const char *filename);
 static int QualifyPath(const char *path);
+static int LocateDependency(const char *keyfile);
 static const char *GetVersionFromFile(const char *filename, const char *match, int numdots);
 static DWORD WINAPI ReadFromPipe(LPVOID args);
 
@@ -172,6 +172,18 @@ main(
 		return 2;
 	    }
 	    return QualifyPath(argv[2]);
+
+	case 'L':
+	    if (argc != 3) {
+		chars = snprintf(msg, sizeof(msg) - 1,
+		    "usage: %s -L keypath\n"
+		    "Emit the fully qualified path of directory containing keypath\n"
+		    "exitcodes: 0 == success, 1 == not found, 2 == error\n", argv[0]);
+		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars,
+		    &dwWritten, NULL);
+		return 2;
+	    }
+	    return LocateDependency(argv[2]);
 	}
     }
     chars = snprintf(msg, sizeof(msg) - 1,
@@ -701,6 +713,97 @@ QualifyPath(
 }
 
 /*
+ * Implements LocateDependency for a single directory. See that command
+ * for an explanation.
+ * Returns 0 if found after printing the directory.
+ * Returns 1 if not found but no errors.
+ * Returns 2 on any kind of error
+ * Basically, these are used as exit codes for the process.
+ */
+static int LocateDependencyHelper(const char *dir, const char *keypath)
+{
+    HANDLE hSearch;
+    char path[MAX_PATH+1];
+    int dirlen, keylen, ret;
+    WIN32_FIND_DATA finfo;
+
+    if (dir == NULL || keypath == NULL)
+	return 2; /* Have no real error reporting mechanism into nmake */
+    dirlen = strlen(dir);
+    if ((dirlen + 3) > sizeof(path))
+	return 2;
+    strncpy(path, dir, dirlen);
+    strncpy(path+dirlen, "\\*", 3);	/* Including terminating \0 */
+    keylen = strlen(keypath);
+
+#if 0 /* This function is not available in Visual C++ 6 */
+    /*
+     * Use numerics 0 -> FindExInfoStandard,
+     * 1 -> FindExSearchLimitToDirectories, 
+     * as these are not defined in Visual C++ 6
+     */
+    hSearch = FindFirstFileEx(path, 0, &finfo, 1, NULL, 0);
+#else
+    hSearch = FindFirstFile(path, &finfo);
+#endif
+    if (hSearch == INVALID_HANDLE_VALUE)
+	return 1; /* Not found */
+
+    /* Loop through all subdirs checking if the keypath is under there */
+    ret = 1; /* Assume not found */
+    do {
+	int sublen;
+	/*
+	 * We need to check it is a directory despite the 
+	 * FindExSearchLimitToDirectories in the above call. See SDK docs
+	 */
+	if ((finfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
+	    continue;
+	sublen = strlen(finfo.cFileName);
+	if ((dirlen+1+sublen+1+keylen+1) > sizeof(path))
+	    continue;		/* Path does not fit, assume not matched */
+	strncpy(path+dirlen+1, finfo.cFileName, sublen);
+	path[dirlen+1+sublen] = '\\';
+	strncpy(path+dirlen+1+sublen+1, keypath, keylen+1);
+	if (PathFileExists(path)) {
+	    /* Found a match, print to stdout */
+	    path[dirlen+1+sublen] = '\0';
+	    QualifyPath(path);
+	    ret = 0;
+	    break;
+	}
+    } while (FindNextFile(hSearch, &finfo));
+    FindClose(hSearch);
+    return ret;
+}
+
+/*
+ * LocateDependency --
+ *
+ *	Locates a dependency for a package.
+ *        keypath - a relative path within the package directory
+ *          that is used to confirm it is the correct directory.
+ *	The search path for the package directory is currently only
+ *      the parent and grandparent of the current working directory.
+ *      If found, the command prints 
+ *         name_DIRPATH=<full path of located directory>
+ *      and returns 0. If not found, does not print anything and returns 1.
+ */
+static int LocateDependency(const char *keypath)
+{
+    int i, ret;
+    static char *paths[] = {"..", "..\\..", "..\\..\\.."};
+    
+    for (i = 0; i < (sizeof(paths)/sizeof(paths[0])); ++i) {
+	ret = LocateDependencyHelper(paths[i], keypath);
+	if (ret == 0)
+	    return ret;
+    }
+    return ret;
+}
+
+
+/*
  * Local variables:
  *   mode: c
  *   c-basic-offset: 4
diff --git a/win/rules-ext.vc b/win/rules-ext.vc
index 3aba80d..531e070 100644
--- a/win/rules-ext.vc
+++ b/win/rules-ext.vc
@@ -28,21 +28,34 @@ macro to the name of the project makefile.
 !error The rules-ext.vc file is not intended for Tcl itself.

 !endif

 

+# We extract version numbers using the nmakehlp program. For now use

+# the local copy of nmakehlp. Once we locate Tcl, we will use that

+# one if it is newer.

+!if [$(CC) -nologo "nmakehlp.c" -link -subsystem:console > nul]

+!endif

+

 # First locate the Tcl directory that we are working with.

-!ifdef TCLDIR

+!if "$(TCLDIR)" != ""

 

 _RULESDIR = $(TCLDIR:/=\)

 

 !else

 

 # If an installation path is specified, that is also the Tcl directory.

-# Also, tk never builds against an installed Tcl, it needs Tcl sources

+# Also Tk never builds against an installed Tcl, it needs Tcl sources

 !if defined(INSTALLDIR) && "$(PROJECT)" != "tk"

 _RULESDIR=$(INSTALLDIR:/=\)

 !else

+# Locate Tcl sources

+!if [echo _RULESDIR = \> nmakehlp.out] \

+   || [nmakehlp -L generic\tcl.h >> nmakehlp.out]

 _RULESDIR = ..\..\tcl

+!else

+!include nmakehlp.out

 !endif

 

+!endif # defined(INSTALLDIR)....

+

 !endif # ifndef TCLDIR

 

 # Now look for the targets.vc file under the Tcl root. Note we check this

@@ -63,10 +76,6 @@ _RULESDIR = .
 

 !if exist("rules.vc") # The extension has its own copy

 

-# We extract version numbers using the nmakehlp program.

-!if [$(CC) -nologo "$(_RULESDIR)\nmakehlp.c" -link -subsystem:console > nul]

-!endif

-

 !if [echo TCL_RULES_MAJOR = \> versions.vc] \

    && [nmakehlp -V "$(_RULESDIR)\rules.vc" RULES_VERSION_MAJOR >> versions.vc]

 !endif

diff --git a/win/rules.vc b/win/rules.vc
index 9b917b6..2c61e2d 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -24,7 +24,7 @@ _RULES_VC = 1
 # For modifications that are not backward-compatible, you *must* change

 # the major version.

 RULES_VERSION_MAJOR = 1

-RULES_VERSION_MINOR = 0

+RULES_VERSION_MINOR = 1

 

 # The PROJECT macro must be defined by parent makefile.

 !if "$(PROJECT)" == ""

@@ -256,8 +256,13 @@ _TCL_H = ..\generic\tcl.h
 

 TCLINSTALL = 0 # Tk always builds against Tcl source, not an installed Tcl

 !if "$(TCLDIR)" == ""

-TCLDIR  = ../../tcl

+!if [echo TCLDIR = \> nmakehlp.out] \

+   || [nmakehlp -L generic\tcl.h >> nmakehlp.out]

+!error *** Could not locate Tcl source directory.

 !endif

+!include nmakehlp.out

+!endif # TCLDIR == ""

+

 _TCLDIR	= $(TCLDIR:/=\)

 _TCL_H  = $(_TCLDIR)\generic\tcl.h

 !if !exist("$(_TCL_H)")

@@ -285,21 +290,32 @@ TCLINSTALL	= 0
 _TCL_H          = $(_TCLDIR)\generic\tcl.h

 !endif

 

-!else  # TCLDIR is not defined

+!else  #  # Case 2(c) for extensions with TCLDIR undefined

+

+# Need to locate Tcl depending on whether it needs Tcl source or not.

+# If we don't, check the INSTALLDIR for an installed Tcl first

+

+!if exist("$(_INSTALLDIR)\include\tcl.h") && !$(NEED_TCL_SOURCE)

 

-!if exist("$(_INSTALLDIR)\include\tcl.h") # Case 2(c) for extensions with TCLDIR undefined

 TCLINSTALL	= 1

 TCLDIR          = $(_INSTALLDIR)\..

 # NOTE: we will be resetting _INSTALLDIR to _INSTALLDIR/lib for extensions

 # later so the \.. accounts for the /lib

 _TCLDIR		= $(_INSTALLDIR)\..

 _TCL_H          = $(_TCLDIR)\include\tcl.h

-!elseif exist("..\..\tcl\generic\tcl.h")

+

+!else # exist(...) && ! $(NEED_TCL_SOURCE)

+

+!if [echo _TCLDIR = \> nmakehlp.out] \

+   || [nmakehlp -L generic\tcl.h >> nmakehlp.out]

+!error *** Could not locate Tcl source directory.

+!endif

+!include nmakehlp.out

 TCLINSTALL      = 0

-TCLDIR          = ..\..\tcl

-_TCLDIR         = $(TCLDIR)

+TCLDIR         = $(_TCLDIR)

 _TCL_H          = $(_TCLDIR)\generic\tcl.h

-!endif

+

+!endif # exist(...) && ! $(NEED_TCL_SOURCE)

 

 !endif # TCLDIR

 

@@ -325,17 +341,30 @@ _TK_H          = $(_TKDIR)\generic\tk.h
 

 !else # TKDIR not defined

 

-!if exist("$(_INSTALLDIR)\..\include\tk.h")

+# Need to locate Tcl depending on whether it needs Tcl source or not.

+# If we don't, check the INSTALLDIR for an installed Tcl first

+

+!if exist("$(_INSTALLDIR)\include\tk.h") && !$(NEED_TK_SOURCE)

+

 TKINSTALL      = 1

+# NOTE: we will be resetting _INSTALLDIR to _INSTALLDIR/lib for extensions

+# later so the \.. accounts for the /lib

 _TKDIR         = $(_INSTALLDIR)\..

 _TK_H          = $(_TKDIR)\include\tk.h

 TKDIR          = $(_TKDIR)

-!elseif exist("$(_TCLDIR)\include\tk.h")

-TKINSTALL      = 1

-_TKDIR         = $(_TCLDIR)

-_TK_H          = $(_TKDIR)\include\tk.h

-TKDIR          = $(_TKDIR)

+

+!else # exist("$(_INSTALLDIR)\include\tk.h") && !$(NEED_TK_SOURCE)

+

+!if [echo _TKDIR = \> nmakehlp.out] \

+   || [nmakehlp -L generic\tk.h >> nmakehlp.out]

+!error *** Could not locate Tk source directory.

 !endif

+!include nmakehlp.out

+TKINSTALL      = 0

+TKDIR          = $(_TKDIR)

+_TK_H          = $(_TKDIR)\generic\tk.h

+

+!endif # exist("$(_INSTALLDIR)\include\tk.h") && !$(NEED_TK_SOURCE)

 

 !endif # TKDIR

 

@@ -365,7 +394,7 @@ MSG = ^
 

 

 # If INSTALLDIR set to tcl installation root dir then reset to the

-# lib dir for installing extensions 

+# lib dir for installing extensions

 !if exist("$(_INSTALLDIR)\include\tcl.h")

 _INSTALLDIR=$(_INSTALLDIR)\lib

 !endif

@@ -506,7 +535,6 @@ NMAKEHLPC = $(_TCLDIR)\win\nmakehlp.c
 

 # We always build nmakehlp even if it exists since we do not know

 # what source it was built from.

-!message *** Using $(NMAKEHLPC)

 !if [$(cc32) -nologo "$(NMAKEHLPC)" -link -subsystem:console > nul]

 !endif

 

@@ -518,7 +546,7 @@ NMAKEHLPC = $(_TCLDIR)\win\nmakehlp.c
 # The following macros are set:

 # OPTIMIZATIONS - the compiler flags to be used for optimized builds

 # DEBUGFLAGS - the compiler flags to be used for debug builds

-# LINKERFLAGS - Flags passed to the linker 

+# LINKERFLAGS - Flags passed to the linker

 #

 # Note that these are the compiler settings *available*, not those

 # that will be *used*. The latter depends on the OPTS macro settings

@@ -561,7 +589,6 @@ FPOPTS  = $(FPOPTS) -QI0f
 OPTIMIZATIONS = $(FPOPTS)

 

 !if [nmakehlp -c -O2]

-!message *** Compiler has 'Optimizations'

 OPTIMIZING = 1

 OPTIMIZATIONS   = $(OPTIMIZATIONS) -O2

 !else

@@ -1034,7 +1061,7 @@ STUBPREFIX      = $(PROJECT)stub
 # Set up paths to various Tcl executables and libraries needed by extensions

 !if $(DOING_TCL)

 

-TCLSHNAME       = $(PROJECT)sh$(TCL_VERSION)$(SUFX).exe

+TCLSHNAME       = $(PROJECT)sh$(VERSION)$(SUFX).exe

 TCLSH		= $(OUT_DIR)\$(TCLSHNAME)

 TCLIMPLIB	= $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib

 TCLLIBNAME	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)

@@ -1048,12 +1075,24 @@ TCL_INCLUDES    = -I"$(WINDIR)" -I"$(GENERICDIR)"
 

 !if $(TCLINSTALL) # Building against an installed Tcl

 

+# When building extensions, we need to locate tclsh. Depending on version

+# of Tcl we are building against, this may or may not have a "t" suffix.

+# Try various possibilities in turn.

 TCLSH		= $(_TCLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX).exe

 !if !exist("$(TCLSH)") && $(TCL_THREADS)

 TCLSH           = $(_TCLDIR)\bin\tclsh$(TCL_VERSION)t$(SUFX).exe

 !endif

+!if !exist("$(TCLSH)")

+TCLSH           = $(_TCLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX:t=).exe

+!endif

+

 TCLSTUBLIB	= $(_TCLDIR)\lib\tclstub$(TCL_VERSION).lib

 TCLIMPLIB	= $(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX).lib

+# When building extensions, may be linking against Tcl that does not add

+# "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility.

+!if !exist("$(TCLIMPLIB)")

+TCLIMPLIB	= $(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX:t=).lib

+!endif

 TCL_LIBRARY	= $(_TCLDIR)\lib

 TCLREGLIB	= $(_TCLDIR)\lib\tclreg13$(SUFX:t=).lib

 TCLDDELIB	= $(_TCLDIR)\lib\tcldde14$(SUFX:t=).lib

@@ -1066,8 +1105,16 @@ TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)$(SUFX).exe
 !if !exist($(TCLSH)) && $(TCL_THREADS)

 TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)t$(SUFX).exe

 !endif

+!if !exist($(TCLSH))

+TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)$(SUFX:t=).exe

+!endif

 TCLSTUBLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub$(TCL_VERSION).lib

 TCLIMPLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX).lib

+# When building extensions, may be linking against Tcl that does not add

+# "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility.

+!if !exist("$(TCLIMPLIB)")

+TCLIMPLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX:t=).lib

+!endif

 TCL_LIBRARY	= $(_TCLDIR)\library

 TCLREGLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg13$(SUFX:t=).lib

 TCLDDELIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde14$(SUFX:t=).lib

@@ -1111,11 +1158,23 @@ TK_INCLUDES    = -I"$(WINDIR)" -I"$(GENERICDIR)"
 WISH		= $(_TKDIR)\bin\$(WISHNAME)

 TKSTUBLIB	= $(_TKDIR)\lib\$(TKSTUBLIBNAME)

 TKIMPLIB	= $(_TKDIR)\lib\$(TKIMPLIBNAME)

+# When building extensions, may be linking against Tk that does not add

+# "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility.

+!if !exist("$(TKIMPLIB)")

+TKIMPLIBNAME	= tk$(TK_VERSION)$(SUFX:t=).lib

+TKIMPLIB	= $(_TKDIR)\lib\$(TKIMPLIBNAME)

+!endif

 TK_INCLUDES     = -I"$(_TKDIR)\include"

 !else # Building against Tk sources

 WISH		= $(_TKDIR)\win\$(BUILDDIRTOP)\$(WISHNAME)

 TKSTUBLIB	= $(_TKDIR)\win\$(BUILDDIRTOP)\$(TKSTUBLIBNAME)

 TKIMPLIB	= $(_TKDIR)\win\$(BUILDDIRTOP)\$(TKIMPLIBNAME)

+# When building extensions, may be linking against Tk that does not add

+# "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility.

+!if !exist("$(TKIMPLIB)")

+TKIMPLIBNAME	= tk$(TK_VERSION)$(SUFX:t=).lib

+TKIMPLIB	= $(_TKDIR)\win\$(BUILDDIRTOP)\$(TKIMPLIBNAME)

+!endif

 TK_INCLUDES     = -I"$(_TKDIR)\generic" -I"$(_TKDIR)\win" -I"$(_TKDIR)\xlib"

 !endif # TKINSTALL

 tklibs = "$(TKSTUBLIB)" "$(TKIMPLIB)"

@@ -1124,8 +1183,8 @@ tklibs = "$(TKSTUBLIB)" "$(TKIMPLIB)"
 !endif # $(DOING_TK) || $(NEED_TK)

 

 # Various output paths

-PRJIMPLIB	= $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib

-PRJLIBNAME	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)

+PRJIMPLIB	= $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX:t=).lib

+PRJLIBNAME	= $(PROJECT)$(VERSION)$(SUFX:t=).$(EXT)

 PRJLIB		= $(OUT_DIR)\$(PRJLIBNAME)

 

 PRJSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib

@@ -1262,7 +1321,7 @@ USE_WIDECHAR_API = 0
 !endif

 

 !if $(USE_WIDECHAR_API)

-COMPILERFLAGS = $(COMPILERFLAGS) /DUNICODE /D_UNICODE 

+COMPILERFLAGS = $(COMPILERFLAGS) /DUNICODE /D_UNICODE

 !endif

 

 # Like the TEA system only set this non empty for non-Tk extensions

@@ -1272,7 +1331,7 @@ COMPILERFLAGS = $(COMPILERFLAGS) /DUNICODE /D_UNICODE
 PKGNAMEFLAGS = -DPACKAGE_NAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \

                -DPACKAGE_TCLNAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \

                -DPACKAGE_VERSION="\"$(DOTVERSION)\"" \

-               -DMODULE_SCOPE=extern 

+               -DMODULE_SCOPE=extern

 !endif

 

 # crt picks the C run time based on selected OPTS

@@ -1365,7 +1424,7 @@ pkgcflags_nostubs = $(appcflags_nostubs) $(PKGNAMEFLAGS) -DBUILD_$(PROJECT)
 # compiled with another VC version. Check for this and fix accordingly.

 stubscflags = $(cflags) $(PKGNAMEFLAGS) $(PRJ_DEFINES) $(OPTDEFINES) -Zl -DSTATIC_BUILD $(INCLUDES)

 

-# Link flags 

+# Link flags

 

 !if $(DEBUG)

 ldebug	= -debug -debugtype:cv

@@ -1381,25 +1440,13 @@ ldebug	= $(ldebug) -debug -debugtype:cv
 ldebug= $(ldebug) -profile

 !endif

 

-### Declarations common to all linker versions 

+### Declarations common to all linker versions

 lflags	= -nologo -machine:$(MACHINE) $(LINKERFLAGS) $(ldebug)

 

 !if $(MSVCRT) && !($(DEBUG) && !$(UNCHECKED)) && $(VCVERSION) >= 1900

 lflags	= $(lflags) -nodefaultlib:libucrt.lib

 !endif

 

-# Old linkers (Visual C++ 6 in particular) will link for fast loading

-# on Win98. Since we do not support Win98 any more, we specify nowin98

-# as recommended for NT and later. However, this is only required by

-# IX86 on older compilers and only needed if we are not doing a static build.

-

-!if "$(MACHINE)" == "IX86" && !$(STATIC_BUILD)

-!if [nmakehlp -l -opt:nowin98 $(LINKER_TESTFLAGS)]

-# Align sections for PE size savings.

-lflags	= $(lflags) -opt:nowin98

-!endif

-!endif

-

 dlllflags = $(lflags) -dll

 conlflags = $(lflags) -subsystem:console

 guilflags = $(lflags) -subsystem:windows

@@ -1444,9 +1491,9 @@ RESCMD  = $(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" \
 	    -DCOMMAVERSION=$(DOTVERSION:.=,),0 \

 	    -DDOTVERSION=\"$(DOTVERSION)\" \

 	    -DVERSION=\"$(VERSION)\" \

-	    -DSUFX=\"$(SUFX)\" \

-            -DPROJECT=\"$(PROJECT)\" \

-            -DPRJLIBNAME=\"$(PRJLIBNAME)\" 

+	    -DSUFX=\"$(SUFX:t=)\" \

+	    -DPROJECT=\"$(PROJECT)\" \

+	    -DPRJLIBNAME=\"$(PRJLIBNAME)\"

 

 !ifndef DEFAULT_BUILD_TARGET

 DEFAULT_BUILD_TARGET = $(PROJECT)

@@ -1518,13 +1565,12 @@ default-clean:
 	@if exist $(WINDIR)\versions.vc del $(WINDIR)\versions.vc

 	@if exist $(WINDIR)\version.vc del $(WINDIR)\version.vc

 

-default-hose:

+default-hose: default-clean

 	@echo Hosing $(OUT_DIR)\* ...

 	@if exist $(OUT_DIR)\nul $(RMDIR) $(OUT_DIR)

 

+# Only for backward compatibility

 default-distclean: default-hose

-	@if exist $(WINDIR)\nmakehlp.exe del $(WINDIR)\nmakehlp.exe

-	@if exist $(WINDIR)\nmakehlp.obj del $(WINDIR)\nmakehlp.obj

 

 default-setup:

 	@if not exist $(OUT_DIR)\nul mkdir $(OUT_DIR)

@@ -1544,7 +1590,7 @@ default-shell: default-setup $(PROJECT)
 	@if exist $(LIBDIR) for %f in ("$(LIBDIR)\*.tcl") do @$(COPY) %f "$(OUT_DIR)"

 	$(DEBUGGER) $(TCLSH)

 

-# Generation of Windows version resource 

+# Generation of Windows version resource

 !ifdef RCFILE

 

 # Note: don't use $** in below rule because there may be other dependencies

@@ -1583,7 +1629,7 @@ BEGIN
             VALUE "OriginalFilename", PRJLIBNAME

             VALUE "FileVersion",      DOTVERSION

             VALUE "ProductName",      "Package " PROJECT " for Tcl"

-            VALUE "ProductVersion",   DOTVERSION 

+            VALUE "ProductVersion",   DOTVERSION

         END

     END

     BLOCK "VarFileInfo"

@@ -1679,11 +1725,16 @@ TCLNMAKECONFIG = "$(OUT_DIR)\tcl.nmake"
 # Display stats being used.

 #----------------------------------------------------------

 

+!if !$(DOING_TCL)

+!message *** Building against Tcl at '$(_TCLDIR)'

+!endif

+!if !$(DOING_TK) && $(NEED_TK)

+!message *** Building against Tk at '$(_TKDIR)'

+!endif

 !message *** Intermediate directory will be '$(TMP_DIR)'

 !message *** Output directory will be '$(OUT_DIR)'

+!message *** Installation, if selected, will be in '$(_INSTALLDIR)'

 !message *** Suffix for binaries will be '$(SUFX)'

-!message *** Optional defines are '$(OPTDEFINES)'

-!message *** Compiler version $(VCVER). Target machine is $(MACHINE)

-!message *** Host architecture is $(NATIVE_ARCH)

+!message *** Compiler version $(VCVER). Target $(MACHINE), host $(NATIVE_ARCH).

 

 !endif # ifdef _RULES_VC

diff --git a/win/targets.vc b/win/targets.vc
index ca227d8..7f1d388 100644
--- a/win/targets.vc
+++ b/win/targets.vc
@@ -36,17 +36,63 @@ $(PRJLIB): $(PRJ_OBJS) $(RESFILE)
        -@del $*.exp

 !endif

 

-!ifndef DISABLE_STANDARD_TARGETS

+!if "$(PRJ_HEADERS)" != "" && "$(PRJ_OBJS)" != ""

+$(PRJ_OBJS): $(PRJ_HEADERS)

+!endif

+

+# If parent makefile has defined stub objects, add their installation

+# to the default install

+!if "$(PRJ_STUBOBJS)" != ""

+default-install: default-install-stubs

+!endif

+

+# Unlike the other default targets, these cannot be in rules.vc because

+# the executed command depends on existence of macro PRJ_HEADERS_PUBLIC

+# that the parent makefile will not define until after including rules-ext.vc

+!if "$(PRJ_HEADERS_PUBLIC)" != ""

+default-install: default-install-headers

+default-install-headers:

+	@echo Installing headers to '$(INCLUDE_INSTALL_DIR)'

+	@for %f in ($(PRJ_HEADERS_PUBLIC)) do @$(COPY) %f "$(INCLUDE_INSTALL_DIR)"

+!endif

+

+!if "$(DISABLE_STANDARD_TARGETS)" == ""

 DISABLE_STANDARD_TARGETS = 0

 !endif

 

+!if "$(DISABLE_TARGET_setup)" == ""

+DISABLE_TARGET_setup = 0

+!endif

+!if "$(DISABLE_TARGET_install)" == ""

+DISABLE_TARGET_install = 0

+!endif

+!if "$(DISABLE_TARGET_clean)" == ""

+DISABLE_TARGET_clean = 0

+!endif

+!if "$(DISABLE_TARGET_test)" == ""

+DISABLE_TARGET_test = 0

+!endif

+!if "$(DISABLE_TARGET_shell)" == ""

+DISABLE_TARGET_shell = 0

+!endif

+

 !if !$(DISABLE_STANDARD_TARGETS)

+!if !$(DISABLE_TARGET_setup)

 setup: default-setup

+!endif

+!if !$(DISABLE_TARGET_install)

 install: default-install

+!endif

+!if !$(DISABLE_TARGET_clean)

 clean: default-clean

 realclean: hose

 hose: default-hose

 distclean: realclean default-distclean

+!endif

+!if !$(DISABLE_TARGET_test)

 test: default-test

+!endif

+!if !$(DISABLE_TARGET_shell)

 shell: default-shell

 !endif

+!endif # DISABLE_STANDARD_TARGETS

diff --git a/win/tclWinInit.c b/win/tclWinInit.c
index 9d37a41..dc8bba7 100644
--- a/win/tclWinInit.c
+++ b/win/tclWinInit.c
@@ -182,7 +182,7 @@ TclpInitPlatform(void)
 void
 TclpInitLibraryPath(
     char **valuePtr,
-    size_t *lengthPtr,
+    unsigned int *lengthPtr,
     Tcl_Encoding *encodingPtr)
 {
 #define LIBRARY_SIZE	    64
@@ -345,7 +345,7 @@ AppendEnvironment(
 static void
 InitializeDefaultLibraryDir(
     char **valuePtr,
-    size_t *lengthPtr,
+    unsigned int *lengthPtr,
     Tcl_Encoding *encodingPtr)
 {
     HMODULE hModule = TclWinGetTclInstance();
@@ -396,7 +396,7 @@ InitializeDefaultLibraryDir(
 static void
 InitializeSourceLibraryDir(
     char **valuePtr,
-    size_t *lengthPtr,
+    unsigned int *lengthPtr,
     Tcl_Encoding *encodingPtr)
 {
     HMODULE hModule = TclWinGetTclInstance();
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index ee6be96..1c004838 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -360,7 +360,7 @@ printaddrinfolist(
 void
 InitializeHostName(
     char **valuePtr,
-    size_t *lengthPtr,
+    unsigned int *lengthPtr,
     Tcl_Encoding *encodingPtr)
 {
     TCHAR tbuf[MAX_COMPUTERNAME_LENGTH + 1];