* win/tclWinInit.c: More careful calls to Tcl_DStringSetLength()

        * win/tclWinSock.c:     to avoid creating invalid DString states.
        * win/tclWinDde.c:      Bump to version 1.3.2.  [RFE 1366195]
        * library/dde/pkgIndex.tcl:

        * library/reg/pkgIndex.tcl:     Bump to registry 1.1.6
        * win/tclWinReg.c:

        * win/configure.in:     Bump package version numbers.
        * win/configure:        autoconf 2.59

6 files changed, 17 insertions, 11 deletions

diff --git a/win/configure b/win/configure
index eeb01c5..2594fff 100755
--- a/win/configure
+++ b/win/configure
@@ -1273,13 +1273,13 @@ VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
 TCL_DDE_VERSION=1.3
 TCL_DDE_MAJOR_VERSION=1
 TCL_DDE_MINOR_VERSION=3
-TCL_DDE_PATCH_LEVEL=""
+TCL_DDE_PATCH_LEVEL="2"
 DDEVER=$TCL_DDE_MAJOR_VERSION$TCL_DDE_MINOR_VERSION
 
 TCL_REG_VERSION=1.1
 TCL_REG_MAJOR_VERSION=1
 TCL_REG_MINOR_VERSION=1
-TCL_REG_PATCH_LEVEL=""
+TCL_REG_PATCH_LEVEL="6"
 REGVER=$TCL_REG_MAJOR_VERSION$TCL_REG_MINOR_VERSION
 
 #------------------------------------------------------------------------
diff --git a/win/configure.in b/win/configure.in
index d2088ad..37a3214 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -3,7 +3,7 @@
 # generate the file "configure", which is run during Tcl installation
 # to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.86 2005/10/13 18:30:10 dgp Exp $
+# RCS: @(#) $Id: configure.in,v 1.87 2006/04/05 16:32:44 dgp Exp $
 
 AC_INIT(../generic/tcl.h)
 AC_PREREQ(2.59)
@@ -22,13 +22,13 @@ VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
 TCL_DDE_VERSION=1.3
 TCL_DDE_MAJOR_VERSION=1
 TCL_DDE_MINOR_VERSION=3
-TCL_DDE_PATCH_LEVEL=""
+TCL_DDE_PATCH_LEVEL="2"
 DDEVER=$TCL_DDE_MAJOR_VERSION$TCL_DDE_MINOR_VERSION
 
 TCL_REG_VERSION=1.1
 TCL_REG_MAJOR_VERSION=1
 TCL_REG_MINOR_VERSION=1
-TCL_REG_PATCH_LEVEL=""
+TCL_REG_PATCH_LEVEL="6"
 REGVER=$TCL_REG_MAJOR_VERSION$TCL_REG_MINOR_VERSION
 
 #------------------------------------------------------------------------
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index 0171810..5c38115 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.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: tclWinDde.c,v 1.29 2005/12/13 22:43:18 kennykb Exp $
+ * RCS: @(#) $Id: tclWinDde.c,v 1.30 2006/04/05 16:32:44 dgp Exp $
  */
 
 #include "tclInt.h"
@@ -81,7 +81,7 @@ static DWORD ddeInstance;	/* The application instance handle given to us
 				 * by DdeInitialize. */
 static int ddeIsServer = 0;
 
-#define TCL_DDE_VERSION		"1.3.1"
+#define TCL_DDE_VERSION		"1.3.2"
 #define TCL_DDE_PACKAGE_NAME	"dde"
 #define TCL_DDE_SERVICE_NAME	"TclEval"
 #define TCL_DDE_EXECUTE_RESULT	"$TCLEVAL$EXECUTE$RESULT"
@@ -377,6 +377,8 @@ DdeSetServerName(
 		}
 	    }
 	}
+	Tcl_DStringSetLength(&dString,
+		offset + strlen(Tcl_DStringValue(&dString)+offset));
     }
 
     /*
diff --git a/win/tclWinInit.c b/win/tclWinInit.c
index f85448c..4703164 100644
--- a/win/tclWinInit.c
+++ b/win/tclWinInit.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: tclWinInit.c,v 1.69 2006/02/08 21:41:28 dgp Exp $
+ * RCS: @(#) $Id: tclWinInit.c,v 1.70 2006/04/05 16:32:44 dgp Exp $
  */
 
 #include "tclWinInt.h"
@@ -470,7 +470,9 @@ Tcl_GetEncodingNameFromEnvironment(
     Tcl_DString *bufPtr)
 {
     Tcl_DStringInit(bufPtr);
+    Tcl_DStringSetLength(&bufPtr, 2+TCL_INTEGER_SPACE);
     wsprintfA(Tcl_DStringValue(bufPtr), "cp%d", GetACP());
+    Tcl_DStringSetLength(&bufPtr, strlen(Tcl_DStringValue(bufPtr)));
     return Tcl_DStringValue(bufPtr);
 }
 
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index d7d442a..5b7c2ea 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWinReg.c,v 1.35 2005/12/13 22:43:18 kennykb Exp $
+ * RCS: @(#) $Id: tclWinReg.c,v 1.36 2006/04/05 16:32:44 dgp Exp $
  */
 
 #include "tclInt.h"
@@ -238,7 +238,7 @@ Registry_Init(
     cmd = Tcl_CreateObjCommand(interp, "registry", RegistryObjCmd,
 	(ClientData)interp, DeleteCmd);
     Tcl_SetAssocData(interp, REGISTRY_ASSOC_KEY, NULL, (ClientData)cmd);
-    return Tcl_PkgProvide(interp, "registry", "1.1.5");
+    return Tcl_PkgProvide(interp, "registry", "1.1.6");
 }
 
 /*
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index c2bfc2c..488618d 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWinSock.c,v 1.53 2006/03/27 18:08:51 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclWinSock.c,v 1.54 2006/04/05 16:32:45 dgp Exp $
  */
 
 #include "tclWinInt.h"
@@ -2564,6 +2564,8 @@ InitializeHostName(
 	if (winSock.gethostname(Tcl_DStringValue(&ds),
 		Tcl_DStringLength(&ds)) == 0) {
 	    Tcl_DStringSetLength(&ds, 0);
+	} else {
+	    Tcl_DStringSetLength(&ds, strlen(Tcl_DStringValue(&ds)));
 	}
     }