multiple fixes for win7 #206
Conversation
bingbing8
commented
Sep 13, 2017
•
bingbing8
commented
- fix some exception when appverifier is enabled on win7 (https://gitthub.com/PowerShell/Win32-OpenSSH/issues/872)
- enable sshdconfig tests on win7(win7: sshd_config E2E tests failed on win7 Win32-OpenSSH#873)
- fix for Win7: ssh session does not return until hit ENTER Win32-OpenSSH#874 ( ReadFile does not return on win7 when no content in console )
- Remove logging to console in Readthread because write hangs here since write thread already closed (win10: ssh.exe hangs when -v option is supplied. Win32-OpenSSH#879)
- fix VCTargetsPath
…/Win32-OpenSSH#872) 2. enable sshdconfig tests on win7(PowerShell/Win32-OpenSSH#873) 3. fix for PowerShell/Win32-OpenSSH#874 does not return on win7 when no content in console ) 4. remove loggin to console in Readthread because write hangs here since write thread already closed (PowerShell/Win32-OpenSSH#879) 5. fix VCTargetsPath
…thread on win7 or earlier os only
contrib/win32/win32compat/termio.c
Outdated
| @@ -247,6 +245,19 @@ syncio_initiate_write(struct w32_io* pio, DWORD num_bytes) | |||
| return 0; | |||
| } | |||
|
|
|||
| static BOOL | |||
There was a problem hiding this comment.
declare it in misc_internals.h and define in misc.c so that we can reuse..
There was a problem hiding this comment.
change to use IsWindows8OrGreater()
contrib/win32/win32compat/termio.c
Outdated
| @@ -247,6 +245,19 @@ syncio_initiate_write(struct w32_io* pio, DWORD num_bytes) | |||
| return 0; | |||
There was a problem hiding this comment.
remove the log in the if (0 == QueueUserAPC(ReadAPCProc...) { ... }
contrib/win32/win32compat/w32fd.c
Outdated
| * UF_UNIX sockets that are not connected yet | ||
| */ | ||
| } | ||
| else if (SetHandleInformation(h, HANDLE_FLAG_INHERIT, shi_flags) == FALSE) { |
There was a problem hiding this comment.
if ((!IS_INVALID_HANDLE(h)) && SetHandleInformation(h, HANDLE_FLAG_INHERIT, shi_flags) == FALSE)
contrib/win32/win32compat/termio.c
Outdated
| ZeroMemory(&osvi, sizeof(OSVERSIONINFO)); | ||
| osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); | ||
|
|
||
| GetVersionEx(&osvi); |
There was a problem hiding this comment.
As per MSDN,
[GetVersionEx may be altered or unavailable for releases after Windows 8.1. Instead, use the Version Helper functions]
we have a simpler function IsWindows8OrGreater()
https://msdn.microsoft.com/en-us/library/windows/desktop/dn424961(v=vs.85).aspx
There was a problem hiding this comment.
changed to use IsWindows8OrGreater()
contrib/win32/win32compat/w32fd.c
Outdated
| * UF_UNIX sockets that are not connected yet | ||
| */ | ||
| if (!IS_INVALID_HANDLE(h) && (SetHandleInformation(h, HANDLE_FLAG_INHERIT, shi_flags) == FALSE)) { | ||
| debug3("fcntl - SetHandleInformation failed %d, io:%p", |
contrib/win32/win32compat/termio.c
Outdated
| @@ -103,12 +103,11 @@ ReadThread(_In_ LPVOID lpParameter) | |||
|
|
|||
| if (!SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), dwAttributes)) | |||
| error("SetConsoleMode on STD_INPUT_HANDLE failed with %d\n", GetLastError()); | |||
| } | |||
| } | |||
contrib/win32/win32compat/termio.c
Outdated
| @@ -257,7 +254,7 @@ syncio_close(struct w32_io* pio) | |||
| /* If io is pending, let worker threads exit. */ | |||
| if (pio->read_details.pending) { | |||
| /* For console - the read thread is blocked so terminate it. */ | |||
| if (FILETYPE(pio) == FILE_TYPE_CHAR && in_raw_mode) | |||
| if (FILETYPE(pio) == FILE_TYPE_CHAR && (!IsWindows8OrGreater() || in_raw_mode)) | |||
There was a problem hiding this comment.
recommend adding a MACRO like this for readability
#define IsWin7OrLess() (!IsWindows8OrGreater())
Also add detailed comments on why we are adding this condition.
contrib/win32/win32compat/w32fd.c
Outdated
| * Ignore if handle is not valid yet. It will not be valid for | ||
| * UF_UNIX sockets that are not connected yet | ||
| */ | ||
| if (!IS_INVALID_HANDLE(h) && (SetHandleInformation(h, HANDLE_FLAG_INHERIT, shi_flags) == FALSE)) { |
There was a problem hiding this comment.
Recommend adding a MACRO like this for readability
#define IS_VALID_HANDLE(h) (!IS_INVALID_HANDLE(h))
