diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-20 21:20:28 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-20 21:20:28 (GMT) |
| commit | b776295fc0380d1bc09f8b141128b06a7f331d18 (patch) | |
| tree | de267fd20e2cc3d63c9e9960ba9b99c1869b3e97 /win | |
| parent | 6178928e349857e891c94b928ac0a5e4a8da0955 (diff) | |
| parent | 0a6728c33d79445c6e4fc81ab9c78f2aa1f2cd82 (diff) | |
| download | tcl-b776295fc0380d1bc09f8b141128b06a7f331d18.zip tcl-b776295fc0380d1bc09f8b141128b06a7f331d18.tar.gz tcl-b776295fc0380d1bc09f8b141128b06a7f331d18.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'win')
| -rw-r--r-- | win/tclWinConsole.c | 4 | ||||
| -rw-r--r-- | win/tclWinPipe.c | 2 | ||||
| -rw-r--r-- | win/tclWinSock.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/win/tclWinConsole.c b/win/tclWinConsole.c index e1059ca..09262c0 100644 --- a/win/tclWinConsole.c +++ b/win/tclWinConsole.c @@ -229,7 +229,7 @@ ReadConsoleBytes( * will run and take whatever action it deems appropriate. */ do { - result = ReadConsole(hConsole, lpBuffer, nbytes / sizeof(WCHAR), &ntchars, + result = ReadConsoleW(hConsole, lpBuffer, nbytes / sizeof(WCHAR), &ntchars, NULL); } while (result && ntchars == 0 && GetLastError() == ERROR_OPERATION_ABORTED); if (nbytesread != NULL) { @@ -248,7 +248,7 @@ WriteConsoleBytes( DWORD ntchars; BOOL result; - result = WriteConsole(hConsole, lpBuffer, nbytes / sizeof(WCHAR), &ntchars, + result = WriteConsoleW(hConsole, lpBuffer, nbytes / sizeof(WCHAR), &ntchars, NULL); if (nbyteswritten != NULL) { *nbyteswritten = ntchars * sizeof(WCHAR); diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c index 86dff45..23ede6e 100644 --- a/win/tclWinPipe.c +++ b/win/tclWinPipe.c @@ -1205,7 +1205,7 @@ HasConsole(void) { HANDLE handle; - handle = CreateFileA("CONOUT$", GENERIC_WRITE, FILE_SHARE_WRITE, + handle = CreateFileW(L"CONOUT$", GENERIC_WRITE, FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (handle != INVALID_HANDLE_VALUE) { diff --git a/win/tclWinSock.c b/win/tclWinSock.c index de59941..61af337 100644 --- a/win/tclWinSock.c +++ b/win/tclWinSock.c @@ -3247,7 +3247,7 @@ SocketProc( #ifdef _WIN64 GetWindowLongPtrW(hwnd, GWLP_USERDATA); #else - GetWindowLong(hwnd, GWL_USERDATA); + GetWindowLongW(hwnd, GWL_USERDATA); #endif switch (message) { @@ -3265,7 +3265,7 @@ SocketProc( SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR) ((LPCREATESTRUCT)lParam)->lpCreateParams); #else - SetWindowLong(hwnd, GWL_USERDATA, + SetWindowLongW(hwnd, GWL_USERDATA, (LONG) ((LPCREATESTRUCT)lParam)->lpCreateParams); #endif break; |