diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | win/stub16.c | 14 | ||||
| -rw-r--r-- | win/tclWinPipe.c | 6 |
3 files changed, 16 insertions, 10 deletions
@@ -1,3 +1,9 @@ +2010-03-20 Jan Nijtmans <nijtmans@users.sf.net> + + * win/stub16.c Don't hide that we use the ASCII API here. + (does someone still use that?) + * win/tclWinPipe.c 2 unnecessary type casts. + 2010-03-19 Donal K. Fellows <dkf@users.sf.net> * generic/tclCompCmdsSZ.c (TclCompileThrowCmd): Added compilation for diff --git a/win/stub16.c b/win/stub16.c index 737a53e..52460c3 100644 --- a/win/stub16.c +++ b/win/stub16.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: stub16.c,v 1.5 2005/11/04 00:06:50 dkf Exp $ + * RCS: @(#) $Id: stub16.c,v 1.6 2010/03/20 12:00:41 nijtmans Exp $ */ #define STRICT @@ -61,7 +61,7 @@ main(void) char *cmdLine; HANDLE hStdInput, hStdOutput, hStdError; HANDLE hFileInput, hFileOutput, hFileError; - STARTUPINFO si; + STARTUPINFOA si; PROCESS_INFORMATION pi; char buf[8192]; DWORD result; @@ -81,7 +81,7 @@ main(void) * stub16.exe program arg1 arg2 ... */ - cmdLine = strchr(GetCommandLine(), ' '); + cmdLine = strchr(GetCommandLineA(), ' '); if (cmdLine == NULL) { return 1; } @@ -124,7 +124,7 @@ main(void) ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); - if (CreateProcess(NULL, cmdLine, NULL, NULL, TRUE, 0, NULL, NULL, &si, + if (CreateProcessA(NULL, cmdLine, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi) == FALSE) { goto cleanup; } @@ -181,17 +181,17 @@ CreateTempFile(void) char name[MAX_PATH]; SECURITY_ATTRIBUTES sa; - if (GetTempPath(sizeof(name), name) == 0) { + if (GetTempPathA(MAX_PATH, name) == 0) { return INVALID_HANDLE_VALUE; } - if (GetTempFileName(name, "tcl", 0, name) == 0) { + if (GetTempFileNameA(name, "tcl", 0, name) == 0) { return INVALID_HANDLE_VALUE; } sa.nLength = sizeof(sa); sa.lpSecurityDescriptor = NULL; sa.bInheritHandle = TRUE; - return CreateFile(name, GENERIC_READ | GENERIC_WRITE, 0, &sa, + return CreateFileA(name, GENERIC_READ | GENERIC_WRITE, 0, &sa, CREATE_ALWAYS, FILE_ATTRIBUTE_TEMPORARY | FILE_FLAG_DELETE_ON_CLOSE, NULL); } diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c index a625ae8..2ee7310 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.77 2010/03/07 14:39:25 nijtmans Exp $ + * RCS: @(#) $Id: tclWinPipe.c,v 1.78 2010/03/20 12:00:42 nijtmans Exp $ */ #include "tclWinInt.h" @@ -1505,9 +1505,9 @@ ApplicationType( * application name from the arguments. */ - tclWinProcs->getShortPathNameProc((TCHAR *) nativeFullPath, + tclWinProcs->getShortPathNameProc(nativeFullPath, nativeFullPath, MAX_PATH); - strcpy(fullName, tclWinProcs->tchar2utf((TCHAR *) nativeFullPath, -1, &ds)); + strcpy(fullName, tclWinProcs->tchar2utf(nativeFullPath, -1, &ds)); Tcl_DStringFree(&ds); } return applType; |