diff options
| -rw-r--r-- | win/README | 20 | ||||
| -rw-r--r-- | win/README.binary | 22 | ||||
| -rw-r--r-- | win/configure.in | 8 | ||||
| -rw-r--r-- | win/makefile.vc | 6 | ||||
| -rw-r--r-- | win/tclWinReg.c | 24 | ||||
| -rw-r--r-- | win/tclWinSerial.c | 4 |
6 files changed, 50 insertions, 34 deletions
@@ -1,10 +1,10 @@ -Tcl 8.2 for Windows +Tcl 8.3 for Windows by Scott Stanton Scriptics Corporation scott.stanton@scriptics.com -RCS: @(#) $Id: README,v 1.13 1999/07/22 21:50:56 redman Exp $ +RCS: @(#) $Id: README,v 1.14 1999/10/05 22:47:04 hobbs Exp $ 1. Introduction --------------- @@ -21,11 +21,11 @@ The information in this file is maintained on the web at: In order to compile Tcl for Windows, you need the following items: - Tcl 8.2 Source Distribution (plus any patches) + Tcl 8.3 Source Distribution (plus any patches) Visual C++ 2.x/4.x/5.x -In practice, the 8.2 release is built with Visual C++ 5.0 +In practice, this release is built with Visual C++ 5.0 In the "win" subdirectory of the source release, you will find "makefile.vc". This is the makefile Visual C++ compiler. You should @@ -39,18 +39,18 @@ find them. Tcl looks in one of three places for the library files: 1) The path specified in the environment variable "TCL_LIBRARY". - 2) In the lib\tcl8.2 directory under the installation directory + 2) In the lib\tcl8.3 directory under the installation directory as specified in the registry: - HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.2 + HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.3 3) Relative to the directory containing the current .exe. - Tcl will look for a directory "..\lib\tcl8.2" relative to the + Tcl will look for a directory "..\lib\tcl8.3" relative to the directory containing the currently running .exe. -Note that in order to run tclsh82.exe, you must ensure that tcl82.dll -and tclpip82.dll are on your path, in the system directory, or in the -directory containing tclsh82.exe. +Note that in order to run tclsh83.exe, you must ensure that tcl83.dll +and tclpip83.dll are on your path, in the system directory, or in the +directory containing tclsh83.exe. Note: Tcl no longer provides support for Win32s. diff --git a/win/README.binary b/win/README.binary index f036b3a..24e7190 100644 --- a/win/README.binary +++ b/win/README.binary @@ -1,11 +1,11 @@ -Tcl/Tk 8.2 for Windows, Binary Distribution +Tcl/Tk 8.3 for Windows, Binary Distribution -RCS: @(#) $Id: README.binary,v 1.11 1999/08/21 19:41:30 hobbs Exp $ +RCS: @(#) $Id: README.binary,v 1.12 1999/10/05 22:47:04 hobbs Exp $ 1. Introduction --------------- -This directory contains the binary distribution of Tcl/Tk 8.2.0 for +This directory contains the binary distribution of Tcl/Tk 8.3a1 for Windows. It was compiled with Microsoft Visual C++ 5.0 using Win32 API, so that it will run under Windows NT, Windows 95, and Windows 98. @@ -25,14 +25,14 @@ Tcl community by Scriptics Corporation. The official home for Tcl and Tk on the Web is at: http://www.scriptics.com -The home page for the Tcl/Tk 8.2 release is - http://www.scriptics.com/software/8.2.html +The home page for the Tcl/Tk 8.3 release is + http://www.scriptics.com/software/8.3.html -Information about new features in Tcl/Tk 8.2 can be found at - http://www.scriptics.com/software/whatsnew82.html +Information about new features in Tcl/Tk 8.3 can be found at + http://www.scriptics.com/software/whatsnew83.html Detailed release notes can be found at - http://www.scriptics.com/software/relnotes/tcl8.2.0 + http://www.scriptics.com/software/relnotes/tcl8.3a1 Information about Tcl itself can be found at http://www.scriptics.com/scripting/ @@ -47,7 +47,7 @@ There are notes about compiling Tcl at --------------- The binary release is distributed as a self-extracting archive called -tcl82.exe. The setup program which will prompt you for an +tcl83.exe. The setup program which will prompt you for an installation directory. It will create the installation heirarchy under the specified directory, and install a wish application icon under the program manager group of your choice. @@ -64,8 +64,8 @@ this release, you will need to use the appropriate .lib file for your compiler. In the lib directory of the installation directory, there are library files for the Microsoft Visual C++ compiler: - tcl82.lib - tk82.lib + tcl83.lib + tk83.lib 5. Building dynamically loadable extensions -------------------------------------------- diff --git a/win/configure.in b/win/configure.in index a25b8a7..7c24c20 100644 --- a/win/configure.in +++ b/win/configure.in @@ -2,14 +2,14 @@ # generate the file "configure", which is run during Tcl installation # to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.13 1999/08/10 23:16:27 redman Exp $ +# RCS: @(#) $Id: configure.in,v 1.14 1999/10/05 22:47:05 hobbs Exp $ AC_INIT(../generic/tcl.h) -TCL_VERSION=8.2 +TCL_VERSION=8.3 TCL_MAJOR_VERSION=8 -TCL_MINOR_VERSION=2 -TCL_PATCH_LEVEL=".0" +TCL_MINOR_VERSION=3 +TCL_PATCH_LEVEL="a1" VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION #-------------------------------------------------------------------- diff --git a/win/makefile.vc b/win/makefile.vc index d802cc8..f14fdcc 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -6,7 +6,7 @@ # Copyright (c) 1995-1996 Sun Microsystems, Inc. # Copyright (c) 1998-1999 by Scriptics Corporation. # -# RCS: @(#) $Id: makefile.vc,v 1.43 1999/08/13 16:49:06 redman Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.44 1999/10/05 22:47:05 hobbs Exp $ # Does not depend on the presence of any environment variables in # order to compile tcl; all needed information is derived from @@ -69,8 +69,8 @@ NODEBUG = 1 NAMEPREFIX = tcl STUBPREFIX = $(NAMEPREFIX)stub -DOTVERSION = 8.2 -VERSION = 82 +DOTVERSION = 8.3 +VERSION = 83 BINROOT = . !IF "$(NODEBUG)" == "1" diff --git a/win/tclWinReg.c b/win/tclWinReg.c index 479435c..7d296a1 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.9 1999/04/16 00:48:09 stanton Exp $ + * RCS: @(#) $Id: tclWinReg.c,v 1.10 1999/10/05 22:47:05 hobbs Exp $ */ #include <tclPort.h> @@ -694,7 +694,13 @@ GetValue( result = (*regWinProcs->regQueryValueExProc)(key, valueName, NULL, &type, (BYTE *) Tcl_DStringValue(&data), &length); - if (result == ERROR_MORE_DATA) { + while (result == ERROR_MORE_DATA) { + /* + * The Windows docs say that in this error case, we just need + * to expand our buffer and request more data. + * Required for HKEY_PERFORMANCE_DATA + */ + length *= 2; Tcl_DStringSetLength(&data, length); result = (*regWinProcs->regQueryValueExProc)(key, valueName, NULL, &type, (BYTE *) Tcl_DStringValue(&data), &length); @@ -975,8 +981,18 @@ OpenSubKey( result = (*regWinProcs->regCreateKeyExProc)(rootKey, keyName, 0, "", REG_OPTION_NON_VOLATILE, mode, NULL, keyPtr, &create); } else { - result = (*regWinProcs->regOpenKeyExProc)(rootKey, keyName, 0, mode, - keyPtr); + if (rootKey == HKEY_PERFORMANCE_DATA) { + /* + * Here we fudge it for this special root key. + * See MSDN for more info on HKEY_PERFORMANCE_DATA and + * the peculiarities surrounding it + */ + *keyPtr = HKEY_PERFORMANCE_DATA; + result = ERROR_SUCCESS; + } else { + result = (*regWinProcs->regOpenKeyExProc)(rootKey, keyName, 0, + mode, keyPtr); + } } Tcl_DStringFree(&buf); diff --git a/win/tclWinSerial.c b/win/tclWinSerial.c index 67b29b4..42a18f6 100644 --- a/win/tclWinSerial.c +++ b/win/tclWinSerial.c @@ -10,7 +10,7 @@ * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * Changes by Rolf.Schroedter@dlr.de June 25-27, 1999 * - * RCS: @(#) $Id: tclWinSerial.c,v 1.7 1999/08/12 17:38:49 redman Exp $ + * RCS: @(#) $Id: tclWinSerial.c,v 1.8 1999/10/05 22:47:05 hobbs Exp $ */ #include "tclWinInt.h" @@ -1008,7 +1008,7 @@ SerialSetOptionProc(instanceData, interp, optionName, value) return Tcl_BadChannelOption(interp, optionName, "mode pollinterval"); } - return TCL_ERROR; + return TCL_OK; } /* |