diff options
| -rw-r--r-- | ChangeLog | 45 | ||||
| -rw-r--r-- | win/tclWinDde.c | 3 | ||||
| -rw-r--r-- | win/tclWinInit.c | 5 | ||||
| -rw-r--r-- | win/tclWinNotify.c | 8 | ||||
| -rw-r--r-- | win/tclWinPipe.c | 10 | ||||
| -rw-r--r-- | win/tclWinReg.c | 30 | ||||
| -rw-r--r-- | win/tclWinThrd.c | 4 |
7 files changed, 55 insertions, 50 deletions
@@ -1,3 +1,30 @@ +2000-06-13 Eric Melski <ericm@scriptics.com> + + * win/tclWinDde.c: + * win/tclWinInit.c: + * win/tclWinNotify.c: + * win/tclWinPipe.c: + * win/tclWinReg.c: + * win/tclWinThrd.c: Applied patch from [Bug 5794]. + +2000-05-31 Jeff Hobbs <hobbs@scriptics.com> + + * tests/set-old.test: + * doc/unset.n: + * generic/tclVar.c (Tcl_UnsetObjCmd): added -nocomplain and -- + options to unset, to allow for a silent unset operation. + +2000-05-31 Eric Melski <ericm@scriptics.com> + + * generic/tclVar.c (Tcl_ArrayObjCmd): Added support for regexp and + exact matching for [array names] command. [RFE: 3684]. + + * doc/array.n: Added documentation for [array names + -exact/-regexp/-glob] [RFE: 3684]. + + * tests/set-old.test: Added tests for [array names + -exact/-regexp/-glob] [RFE: 3684]. + 2000-06-06 Jeff Hobbs <hobbs@scriptics.com> 8.4a1 RELEASE @@ -27,24 +54,6 @@ menas the user can check http::status for "error" and http::error for the error message after doing the http::wait. -2000-05-31 Jeff Hobbs <hobbs@scriptics.com> - - * tests/set-old.test: - * doc/unset.n: - * generic/tclVar.c (Tcl_UnsetObjCmd): added -nocomplain and -- - options to unset, to allow for a silent unset operation. - -2000-05-31 Eric Melski <ericm@scriptics.com> - - * generic/tclVar.c (Tcl_ArrayObjCmd): Added support for regexp and - exact matching for [array names] command. [RFE: 3684]. - - * doc/array.n: Added documentation for [array names - -exact/-regexp/-glob] [RFE: 3684]. - - * tests/set-old.test: Added tests for [array names - -exact/-regexp/-glob] [RFE: 3684]. - 2000-05-27 Jeff Hobbs <hobbs@scriptics.com> * tests/info.test: diff --git a/win/tclWinDde.c b/win/tclWinDde.c index 2eaf974..d406db4 100644 --- a/win/tclWinDde.c +++ b/win/tclWinDde.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: tclWinDde.c,v 1.5 1999/06/26 22:41:53 redman Exp $ + * RCS: @(#) $Id: tclWinDde.c,v 1.6 2000/06/13 20:30:23 ericm Exp $ */ #include "tclPort.h" @@ -733,7 +733,6 @@ MakeDdeConnection( { HSZ ddeTopic, ddeService; HCONV ddeConv; - ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey); ddeService = DdeCreateStringHandle(ddeInstance, "TclEval", 0); ddeTopic = DdeCreateStringHandle(ddeInstance, name, 0); diff --git a/win/tclWinInit.c b/win/tclWinInit.c index dbf44ea..7576763 100644 --- a/win/tclWinInit.c +++ b/win/tclWinInit.c @@ -7,7 +7,7 @@ * Copyright (c) 1998-1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tclWinInit.c,v 1.22 2000/03/31 08:52:31 hobbs Exp $ + * RCS: @(#) $Id: tclWinInit.c,v 1.23 2000/06/13 20:30:23 ericm Exp $ */ #include "tclWinInt.h" @@ -88,7 +88,6 @@ static DWORD mainThreadId; static void AppendEnvironment(Tcl_Obj *listPtr, CONST char *lib); static void AppendDllPath(Tcl_Obj *listPtr, HMODULE hModule, CONST char *lib); -static void AppendRegistry(Tcl_Obj *listPtr, CONST char *lib); static int ToUtf(CONST WCHAR *wSrc, char *dst); /* @@ -622,7 +621,7 @@ TclpSetVariables(interp) Tcl_DStringSetLength(&ds, 100); if (TclGetEnv("USERNAME", &ds) == NULL) { - if (GetUserName(Tcl_DStringValue(&ds), &Tcl_DStringLength(&ds)) == 0) { + if (GetUserName(Tcl_DStringValue(&ds), (LPDWORD) &Tcl_DStringLength(&ds)) == 0) { Tcl_DStringSetLength(&ds, 0); } } diff --git a/win/tclWinNotify.c b/win/tclWinNotify.c index 932f86c..d48cae2 100644 --- a/win/tclWinNotify.c +++ b/win/tclWinNotify.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: tclWinNotify.c,v 1.5 1999/07/02 22:08:28 redman Exp $ + * RCS: @(#) $Id: tclWinNotify.c,v 1.6 2000/06/13 20:30:23 ericm Exp $ */ #include "tclWinInt.h" @@ -20,8 +20,6 @@ * The follwing static indicates whether this module has been initialized. */ -static int initialized = 0; - #define INTERVAL_TIMER 1 /* Handle of interval timer. */ #define WM_WAKEUP WM_USER /* Message that is send by @@ -468,7 +466,7 @@ Tcl_WaitForEvent( * propagate the quit message and start unwinding. */ - PostQuitMessage(msg.wParam); + PostQuitMessage((int) msg.wParam); status = -1; } else if (result == -1) { /* @@ -510,5 +508,5 @@ void Tcl_Sleep(ms) int ms; /* Number of milliseconds to sleep. */ { - Sleep(ms); + Sleep((DWORD) ms); } diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c index b21a692..c42de21 100644 --- a/win/tclWinPipe.c +++ b/win/tclWinPipe.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: tclWinPipe.c,v 1.11 2000/04/11 21:42:12 ericm Exp $ + * RCS: @(#) $Id: tclWinPipe.c,v 1.12 2000/06/13 20:30:23 ericm Exp $ */ #include "tclWinInt.h" @@ -1194,7 +1194,7 @@ TclpCreateProcess( if ((*tclWinProcs->createProcessProc)(NULL, (TCHAR *) Tcl_DStringValue(&cmdLine), NULL, NULL, TRUE, - createFlags, NULL, NULL, &startInfo, &procInfo) == 0) { + (DWORD) createFlags, NULL, NULL, &startInfo, &procInfo) == 0) { TclWinConvertError(GetLastError()); Tcl_AppendResult(interp, "couldn't execute \"", argv[0], "\": ", Tcl_PosixError(interp), (char *) NULL); @@ -2112,9 +2112,9 @@ PipeOutputProc( ckfree(infoPtr->writeBuf); } infoPtr->writeBufLen = toWrite; - infoPtr->writeBuf = ckalloc(toWrite); + infoPtr->writeBuf = ckalloc((unsigned int) toWrite); } - memcpy(infoPtr->writeBuf, buf, toWrite); + memcpy(infoPtr->writeBuf, buf, (size_t) toWrite); infoPtr->toWrite = toWrite; ResetEvent(infoPtr->writable); SetEvent(infoPtr->startWriter); @@ -2357,7 +2357,7 @@ Tcl_WaitPid( int options) { ProcInfo *infoPtr, **prevPtrPtr; - int flags; + DWORD flags; Tcl_Pid result; DWORD ret; diff --git a/win/tclWinReg.c b/win/tclWinReg.c index e5808c2..b5931fc 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.11 2000/03/31 08:52:32 hobbs Exp $ + * RCS: @(#) $Id: tclWinReg.c,v 1.12 2000/06/13 20:30:24 ericm Exp $ */ #include <tclPort.h> @@ -367,7 +367,7 @@ DeleteKey( */ keyName = Tcl_GetStringFromObj(keyNameObj, &length); - buffer = ckalloc(length + 1); + buffer = ckalloc((unsigned int) length + 1); strcpy(buffer, keyName); if (ParseKeyName(interp, buffer, &hostName, &rootKey, &keyName) @@ -621,7 +621,7 @@ GetType( */ if (type > lastType || type < 0) { - Tcl_SetIntObj(resultPtr, type); + Tcl_SetIntObj(resultPtr, (int) type); } else { Tcl_SetStringObj(resultPtr, typeNames[type], -1); } @@ -680,7 +680,7 @@ GetValue( Tcl_DStringInit(&data); length = TCL_DSTRING_STATIC_SIZE - 1; - Tcl_DStringSetLength(&data, length); + Tcl_DStringSetLength(&data, (int) length); resultPtr = Tcl_GetObjResult(interp); @@ -696,7 +696,7 @@ GetValue( * Required for HKEY_PERFORMANCE_DATA */ length *= 2; - Tcl_DStringSetLength(&data, length); + Tcl_DStringSetLength(&data, (int) length); result = (*regWinProcs->regQueryValueExProc)(key, valueName, NULL, &type, (BYTE *) Tcl_DStringValue(&data), &length); } @@ -719,7 +719,7 @@ GetValue( */ if (type == REG_DWORD || type == REG_DWORD_BIG_ENDIAN) { - Tcl_SetIntObj(resultPtr, ConvertDWORD(type, + Tcl_SetIntObj(resultPtr, (int) ConvertDWORD(type, *((DWORD*) Tcl_DStringValue(&data)))); } else if (type == REG_MULTI_SZ) { char *p = Tcl_DStringValue(&data); @@ -754,7 +754,7 @@ GetValue( * Save binary data as a byte array. */ - Tcl_SetByteArrayObj(resultPtr, Tcl_DStringValue(&data), length); + Tcl_SetByteArrayObj(resultPtr, Tcl_DStringValue(&data), (int) length); } Tcl_DStringFree(&data); return result; @@ -822,7 +822,7 @@ GetValueNames( Tcl_DStringInit(&buffer); Tcl_DStringSetLength(&buffer, - (regWinProcs->useWide) ? maxSize*2 : maxSize); + (int) ((regWinProcs->useWide) ? maxSize*2 : maxSize)); index = 0; result = TCL_OK; @@ -847,7 +847,7 @@ GetValueNames( size *= 2; } - Tcl_WinTCharToUtf((TCHAR *) Tcl_DStringValue(&buffer), size, &ds); + Tcl_WinTCharToUtf((TCHAR *) Tcl_DStringValue(&buffer), (int) size, &ds); name = Tcl_DStringValue(&ds); if (!pattern || Tcl_StringMatch(name, pattern)) { result = Tcl_ListObjAppendElement(interp, resultPtr, @@ -901,7 +901,7 @@ OpenKey( DWORD result; keyName = Tcl_GetStringFromObj(keyNameObj, &length); - buffer = ckalloc(length + 1); + buffer = ckalloc((unsigned int) length + 1); strcpy(buffer, keyName); result = ParseKeyName(interp, buffer, &hostName, &rootKey, &keyName); @@ -1135,7 +1135,7 @@ RecursiveDeleteKey( Tcl_DStringInit(&subkey); Tcl_DStringSetLength(&subkey, - (regWinProcs->useWide) ? maxSize * 2 : maxSize); + (int) ((regWinProcs->useWide) ? maxSize * 2 : maxSize)); while (result == ERROR_SUCCESS) { /* @@ -1272,7 +1272,7 @@ SetValue( length = Tcl_DStringLength(&buf) + 1; result = (*regWinProcs->regSetValueExProc)(key, valueName, 0, type, - (BYTE*)data, length); + (BYTE*)data, (DWORD) length); Tcl_DStringFree(&buf); } else { char *data; @@ -1283,7 +1283,7 @@ SetValue( data = Tcl_GetByteArrayFromObj(dataObj, &length); result = (*regWinProcs->regSetValueExProc)(key, valueName, 0, type, - (BYTE *)data, length); + (BYTE *)data, (DWORD) length); } Tcl_DStringFree(&nameBuf); RegCloseKey(key); @@ -1346,7 +1346,7 @@ AppendSystemError( if (error == ERROR_CALL_NOT_IMPLEMENTED) { msg = "function not supported under Win32s"; } else { - sprintf(msgBuf, "unknown error: %d", error); + sprintf(msgBuf, "unknown error: %ld", error); msg = msgBuf; } } else { @@ -1371,7 +1371,7 @@ AppendSystemError( } } - sprintf(id, "%d", error); + sprintf(id, "%ld", error); Tcl_SetErrorCode(interp, "WINDOWS", id, msg, (char *) NULL); Tcl_AppendToObj(resultPtr, msg, length); diff --git a/win/tclWinThrd.c b/win/tclWinThrd.c index 5b84cf6..feb15fb 100644 --- a/win/tclWinThrd.c +++ b/win/tclWinThrd.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: tclWinThrd.c,v 1.10 2000/05/09 19:13:55 kupries Exp $ + * RCS: @(#) $Id: tclWinThrd.c,v 1.11 2000/06/13 20:30:24 ericm Exp $ */ #include "tclWinInt.h" @@ -136,7 +136,7 @@ Tcl_CreateThread(idPtr, proc, clientData, stackSize, flags) EnterCriticalSection(&joinLock); - code = _beginthreadex(NULL, stackSize, proc, clientData, 0, + code = _beginthreadex(NULL, (unsigned) stackSize, proc, clientData, 0, (unsigned *)idPtr); if (code == 0) { |