Import Tcl 8.6.10
This commit is contained in:
@@ -1283,7 +1283,7 @@ SerialWriterThread(
|
||||
buf = infoPtr->writeBuf;
|
||||
toWrite = infoPtr->toWrite;
|
||||
|
||||
myWrite.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
|
||||
myWrite.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
|
||||
|
||||
/*
|
||||
* Loop until all of the bytes are written or an error occurs.
|
||||
@@ -1368,7 +1368,7 @@ SerialWriterThread(
|
||||
HANDLE
|
||||
TclWinSerialOpen(
|
||||
HANDLE handle,
|
||||
const TCHAR *name,
|
||||
const WCHAR *name,
|
||||
DWORD access)
|
||||
{
|
||||
SerialInit();
|
||||
@@ -1387,7 +1387,7 @@ TclWinSerialOpen(
|
||||
* finished
|
||||
*/
|
||||
|
||||
handle = CreateFile(name, access, 0, 0, OPEN_EXISTING,
|
||||
handle = CreateFileW(name, access, 0, 0, OPEN_EXISTING,
|
||||
FILE_FLAG_OVERLAPPED, 0);
|
||||
|
||||
return handle;
|
||||
@@ -1460,15 +1460,15 @@ TclWinOpenSerialChannel(
|
||||
|
||||
InitializeCriticalSection(&infoPtr->csWrite);
|
||||
if (permissions & TCL_READABLE) {
|
||||
infoPtr->osRead.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
|
||||
infoPtr->osRead.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
|
||||
}
|
||||
if (permissions & TCL_WRITABLE) {
|
||||
/*
|
||||
* Initially the channel is writable and the writeThread is idle.
|
||||
*/
|
||||
|
||||
infoPtr->osWrite.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
|
||||
infoPtr->evWritable = CreateEvent(NULL, TRUE, TRUE, NULL);
|
||||
infoPtr->osWrite.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
|
||||
infoPtr->evWritable = CreateEventW(NULL, TRUE, TRUE, NULL);
|
||||
infoPtr->writeThread = CreateThread(NULL, 256, SerialWriterThread,
|
||||
TclPipeThreadCreateTI(&infoPtr->writeTI, infoPtr,
|
||||
infoPtr->evWritable), 0, NULL);
|
||||
@@ -1595,7 +1595,7 @@ SerialSetOptionProc(
|
||||
BOOL result, flag;
|
||||
size_t len, vlen;
|
||||
Tcl_DString ds;
|
||||
const TCHAR *native;
|
||||
const WCHAR *native;
|
||||
int argc;
|
||||
const char **argv;
|
||||
|
||||
@@ -1617,8 +1617,8 @@ SerialSetOptionProc(
|
||||
if (!GetCommState(infoPtr->handle, &dcb)) {
|
||||
goto getStateFailed;
|
||||
}
|
||||
native = Tcl_WinUtfToTChar(value, -1, &ds);
|
||||
result = BuildCommDCB(native, &dcb);
|
||||
native = (const WCHAR *)Tcl_WinUtfToTChar(value, -1, &ds);
|
||||
result = BuildCommDCBW(native, &dcb);
|
||||
Tcl_DStringFree(&ds);
|
||||
|
||||
if (result == FALSE) {
|
||||
|
||||
Reference in New Issue
Block a user