Attachment "1366195.patch" to
ticket [1366195fff]
added by
dgp
2006-04-05 22:57:25.
Index: library/dde/pkgIndex.tcl
===================================================================
RCS file: /cvsroot/tcl/tcl/library/dde/pkgIndex.tcl,v
retrieving revision 1.16
diff -u -r1.16 pkgIndex.tcl
--- library/dde/pkgIndex.tcl 6 Oct 2004 16:37:18 -0000 1.16
+++ library/dde/pkgIndex.tcl 5 Apr 2006 15:55:39 -0000
@@ -1,7 +1,7 @@
if {![package vsatisfies [package provide Tcl] 8]} {return}
if {[string compare $::tcl_platform(platform) windows]} {return}
if {[info exists ::tcl_platform(debug)]} {
- package ifneeded dde 1.3.1 [list load [file join $dir tcldde13g.dll] dde]
+ package ifneeded dde 1.3.2 [list load [file join $dir tcldde13g.dll] dde]
} else {
- package ifneeded dde 1.3.1 [list load [file join $dir tcldde13.dll] dde]
+ package ifneeded dde 1.3.2 [list load [file join $dir tcldde13.dll] dde]
}
Index: library/reg/pkgIndex.tcl
===================================================================
RCS file: /cvsroot/tcl/tcl/library/reg/pkgIndex.tcl,v
retrieving revision 1.18
diff -u -r1.18 pkgIndex.tcl
--- library/reg/pkgIndex.tcl 6 Oct 2004 17:09:27 -0000 1.18
+++ library/reg/pkgIndex.tcl 5 Apr 2006 15:55:40 -0000
@@ -1,9 +1,9 @@
if {![package vsatisfies [package provide Tcl] 8]} {return}
if {[string compare $::tcl_platform(platform) windows]} {return}
if {[info exists ::tcl_platform(debug)]} {
- package ifneeded registry 1.1.5 \
+ package ifneeded registry 1.1.6 \
[list load [file join $dir tclreg11g.dll] registry]
} else {
- package ifneeded registry 1.1.5 \
+ package ifneeded registry 1.1.6 \
[list load [file join $dir tclreg11.dll] registry]
}
Index: win/configure
===================================================================
RCS file: /cvsroot/tcl/tcl/win/configure,v
retrieving revision 1.81
diff -u -r1.81 configure
--- win/configure 10 Dec 2005 01:36:47 -0000 1.81
+++ win/configure 5 Apr 2006 15:55:44 -0000
@@ -1273,13 +1273,13 @@
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
#------------------------------------------------------------------------
Index: win/configure.in
===================================================================
RCS file: /cvsroot/tcl/tcl/win/configure.in,v
retrieving revision 1.86
diff -u -r1.86 configure.in
--- win/configure.in 13 Oct 2005 18:30:10 -0000 1.86
+++ win/configure.in 5 Apr 2006 15:55:44 -0000
@@ -22,13 +22,13 @@
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
#------------------------------------------------------------------------
Index: win/tclWinDde.c
===================================================================
RCS file: /cvsroot/tcl/tcl/win/tclWinDde.c,v
retrieving revision 1.29
diff -u -r1.29 tclWinDde.c
--- win/tclWinDde.c 13 Dec 2005 22:43:18 -0000 1.29
+++ win/tclWinDde.c 5 Apr 2006 15:55:44 -0000
@@ -81,7 +81,7 @@
* 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 @@
}
}
}
+ Tcl_DStringSetLength(&dString,
+ offset + strlen(Tcl_DStringValue(&dString)+offset));
}
/*
Index: win/tclWinInit.c
===================================================================
RCS file: /cvsroot/tcl/tcl/win/tclWinInit.c,v
retrieving revision 1.69
diff -u -r1.69 tclWinInit.c
--- win/tclWinInit.c 8 Feb 2006 21:41:28 -0000 1.69
+++ win/tclWinInit.c 5 Apr 2006 15:55:44 -0000
@@ -470,7 +470,9 @@
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);
}
Index: win/tclWinReg.c
===================================================================
RCS file: /cvsroot/tcl/tcl/win/tclWinReg.c,v
retrieving revision 1.35
diff -u -r1.35 tclWinReg.c
--- win/tclWinReg.c 13 Dec 2005 22:43:18 -0000 1.35
+++ win/tclWinReg.c 5 Apr 2006 15:55:44 -0000
@@ -238,7 +238,7 @@
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");
}
/*
Index: win/tclWinSock.c
===================================================================
RCS file: /cvsroot/tcl/tcl/win/tclWinSock.c,v
retrieving revision 1.53
diff -u -r1.53 tclWinSock.c
--- win/tclWinSock.c 27 Mar 2006 18:08:51 -0000 1.53
+++ win/tclWinSock.c 5 Apr 2006 15:55:45 -0000
@@ -2564,6 +2564,8 @@
if (winSock.gethostname(Tcl_DStringValue(&ds),
Tcl_DStringLength(&ds)) == 0) {
Tcl_DStringSetLength(&ds, 0);
+ } else {
+ Tcl_DStringSetLength(&ds, strlen(Tcl_DStringValue(&ds)));
}
}
