diff options
| author | dgp <dgp@users.sourceforge.net> | 2012-07-16 19:35:25 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2012-07-16 19:35:25 (GMT) |
| commit | 5c22ee49d88410e94790f9a632b48b0274f49fc3 (patch) | |
| tree | 9dbe96b5000c5c159fff3b670f70d4152d8d297d /win | |
| parent | bf64344945361a6d74aa972720e8c62e75c70615 (diff) | |
| parent | d3ed87e02220799c87c30f7b3109080fd5471afe (diff) | |
| download | tcl-5c22ee49d88410e94790f9a632b48b0274f49fc3.zip tcl-5c22ee49d88410e94790f9a632b48b0274f49fc3.tar.gz tcl-5c22ee49d88410e94790f9a632b48b0274f49fc3.tar.bz2 | |
merge 8.5
Diffstat (limited to 'win')
| -rw-r--r-- | win/tclWinPipe.c | 2 | ||||
| -rw-r--r-- | win/tclWinReg.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c index 9a529d2..b6764d4 100644 --- a/win/tclWinPipe.c +++ b/win/tclWinPipe.c @@ -1707,7 +1707,7 @@ TclpCreateCommandChannel( * unique, in case channels share handles (stdin/stdout). */ - sprintf(channelName, "file" TCL_I_MODIFIER "x", (size_t)infoPtr); + sprintf(channelName, "file%" TCL_I_MODIFIER "x", (size_t)infoPtr); infoPtr->channel = Tcl_CreateChannel(&pipeChannelType, channelName, (ClientData) infoPtr, infoPtr->validMask); diff --git a/win/tclWinReg.c b/win/tclWinReg.c index 343a22f..a6ce2ce 100644 --- a/win/tclWinReg.c +++ b/win/tclWinReg.c @@ -794,7 +794,7 @@ GetValue( * HKEY_PERFORMANCE_DATA */ - length *= 2; + length = Tcl_DStringLength(&data) * (regWinProcs->useWide ? 1 : 2); Tcl_DStringSetLength(&data, (int) length * (regWinProcs->useWide ? 2 : 1)); result = (*regWinProcs->regQueryValueExProc)(key, (char *) nativeValue, NULL, &type, (BYTE *) Tcl_DStringValue(&data), &length); |