Initial WIN32_FIXME changes.

Author: rayhayes

contrib/win32/openssh/config.h.vs

@@ -1581,6 +1581,7 @@
 #define _CRT_SECURE_NO_DEPRECATE 1
 #define _CRT_NONSTDC_NO_DEPRECATE 1
 #define WIN32_FIXME 1
+#define WINDOWS 1
 
 /* Define if you must implement a startup_needs function for your platform */
 #define HAVE_STARTUP_NEEDS 1
@@ -1631,6 +1632,9 @@
 #define HAVE_STRNCASECMP 1
 #endif
 
+/* Define to 1 if you have the locale.h header. */
+#define HAVE_LOCALE_H 1
+
 #define HAVE_STRUCT_IN6_ADDR 1
 #define HAVE_STRUCT_SOCKADDR_IN6 1
 #define HAVE_STRUCT_TIMEVAL 1

contrib/win32/openssh/paths.targets

@@ -4,10 +4,12 @@
     <OpenSSH-Src-Path>$(SolutionDir)..\..\..\</OpenSSH-Src-Path> 
     <OpenSSH-Bin-Path>$(SolutionDir)..\..\..\bin\</OpenSSH-Bin-Path>
     <OpenSSH-Lib-Path>$(SolutionDir)lib\</OpenSSH-Lib-Path>
-    <OpenSSL-Path>$(SolutionDir)..\..\..\..\OpenSSL\1.0.2d\VS2015\</OpenSSL-Path>
-    <OpenSSL-Win32-Release-Path>$(SolutionDir)..\..\..\..\OpenSSL\1.0.2d\VS2015\Win32\Release\</OpenSSL-Win32-Release-Path>
-    <OpenSSL-Win32-Debug-Path>$(SolutionDir)..\..\..\..\OpenSSL\1.0.2d\VS2015\Win32\Debug\</OpenSSL-Win32-Debug-Path>
-    <OpenSSL-x64-Release-Path>$(SolutionDir)..\..\..\..\OpenSSL\1.0.2d\VS2015\x64\Release\</OpenSSL-x64-Release-Path>
-    <OpenSSL-x64-Debug-Path>$(SolutionDir)..\..\..\..\OpenSSL\1.0.2d\VS2015\x64\Debug\</OpenSSL-x64-Debug-Path>
+    <OpenSSL-Path>g:\openssl-1.0.2h-x64\OpenSSLInstallx64_vs2015-debug\</OpenSSL-Path>
+    <OpenSSL-Win32-Release-Path>g:\openssl-1.0.2h-x86\OpenSSLInstallx86_vs2015\</OpenSSL-Win32-Release-Path>
+    <OpenSSL-Win32-Debug-Path>g:\openssl-1.0.2h-x86\OpenSSLInstallx86_vs2015-debug\</OpenSSL-Win32-Debug-Path>
+    <OpenSSL-x64-Release-Path>g:\openssl-1.0.2h-x64\OpenSSLInstallx64_vs2015\</OpenSSL-x64-Release-Path>
+    <OpenSSL-x64-Debug-Path>g:\openssl-1.0.2h-x64\OpenSSLInstallx64_vs2015-debug\</OpenSSL-x64-Debug-Path>
+    <OpenSSL-x86-ARM-Release-Path>g:\openssl-1.0.2h-arm-x86\OpenSSLInstallx86_vs2015\</OpenSSL-x86-ARM-Release-Path>
+    <OpenSSL-x86-ARM-Debug-Path>g:\openssl-1.0.2h-arm-x86\OpenSSLInstallx86_vs2015\</OpenSSL-x86-ARM-Debug-Path>
   </PropertyGroup>
 </Project>

contrib/win32/win32compat/inc/unistd.h

@@ -24,6 +24,7 @@
 #define open w32_open
 #define read w32_read
 #define write w32_write
+#define writev w32_writev
 //#define isatty w32_isatty
 #define close w32_close
 #define dup w32_dup

contrib/win32/win32compat/inc/w32posix.h

@@ -44,6 +44,7 @@ int w32_pipe(int *pfds);
 int w32_open(const char *pathname, int flags, ...);
 int w32_read(int fd, void *dst, size_t max);
 int w32_write(int fd, const void *buf, unsigned int max);
+int w32_writev(int fd, const struct iovec *iov, int iovcnt);
 int w32_fstat(int fd, struct w32_stat *buf);
 int w32_stat(const char *path, struct w32_stat *buf);
 long w32_lseek( int fd, long offset, int origin);
@@ -117,7 +118,6 @@ int sw_add_child(HANDLE child, DWORD pid);
 #define allocate_sfd(a, b) w32_allocate_fd_for_handle((a, b))
 //#define WSHELPwopen(a, b) w32_open((a, b))
 
-
 /* TODO - These defs need to revisited and positioned appropriately */
 #define environ _environ
 

contrib/win32/win32compat/shell-host.c

@@ -50,6 +50,33 @@
 #define ENABLE_VIRTUAL_TERMINAL_INPUT 0x0200
 #endif
 
+HINSTANCE   hUserLibrary;       
+HINSTANCE   hKernelLibrary;
+
+// kernel32.dll
+typedef BOOL(WINAPI * fSetCurrentConsoleFontEx)(
+    _In_ HANDLE hConsoleOutput, 
+    _In_ BOOL bMaximumWindow, 
+    _In_ PCONSOLE_FONT_INFOEX lpConsoleCurrentFontEx);
+fSetCurrentConsoleFontEx fnSetCurrentConsoleFontEx = NULL;
+
+// user32.dll
+typedef HWINEVENTHOOK (WINAPI * fSetWinEventHook)(
+    _In_ UINT         eventMin,
+    _In_ UINT         eventMax,
+    _In_ HMODULE      hmodWinEventProc,
+    _In_ WINEVENTPROC lpfnWinEventProc,
+    _In_ DWORD        idProcess,
+    _In_ DWORD        idThread,
+    _In_ UINT         dwflags
+);
+fSetWinEventHook fnSetWinEventHook = NULL;
+
+typedef BOOL (WINAPI * fUnhookWinEvent)(
+    _In_ HWINEVENTHOOK hWinEventHook
+);
+fUnhookWinEvent fnUnhookWinEvent = NULL;
+
 typedef struct consoleEvent {
     DWORD event;
     HWND  hwnd;
@@ -66,6 +93,7 @@ BOOL bRet = FALSE;
 BOOL bNoScrollRegion = FALSE;
 BOOL bStartup = TRUE;
 BOOL bAnsi = FALSE;
+BOOL bHookEvents = FALSE;
 
 HANDLE child_out = INVALID_HANDLE_VALUE;
 HANDLE child_in = INVALID_HANDLE_VALUE;
@@ -389,7 +417,8 @@ void SizeWindow(HANDLE hInput) {
     matchingFont.FontWeight = FW_NORMAL;
     wcscpy(matchingFont.FaceName, L"Consolas");
 
-    bSuccess = SetCurrentConsoleFontEx(child_out, FALSE, &matchingFont);
+    if(fnSetCurrentConsoleFontEx != NULL)
+        bSuccess = fnSetCurrentConsoleFontEx(child_out, FALSE, &matchingFont);
 
     // This information is the live screen 
     ZeroMemory(&consoleInfo, sizeof(consoleInfo));
@@ -1058,6 +1087,22 @@ int wmain(int ac, wchar_t **av) {
     DWORD dwStatus;
     HANDLE hEventHook = NULL;
 
+    HINSTANCE   hUserLibrary;
+    HINSTANCE   hKernelLibrary;
+
+    hKernelLibrary = LoadLibrary(L"kernel32.dll");
+    if (hKernelLibrary != NULL)
+    {
+        fnSetCurrentConsoleFontEx = (fSetCurrentConsoleFontEx)GetProcAddress(hKernelLibrary, "SetCurrentConsoleFontEx");
+    }
+
+    hUserLibrary = LoadLibrary(L"user32.dll");
+    if (hUserLibrary != NULL)
+    {
+        fnSetWinEventHook = (fSetWinEventHook)GetProcAddress(hUserLibrary, "SetWinEventHook");
+        fnUnhookWinEvent = (fUnhookWinEvent)GetProcAddress(hUserLibrary, "UnhookWinEvent");
+    }
+
     pipe_in  = GetStdHandle(STD_INPUT_HANDLE);
     pipe_out = GetStdHandle(STD_OUTPUT_HANDLE);
     pipe_err = GetStdHandle(STD_ERROR_HANDLE);
@@ -1094,15 +1139,22 @@ int wmain(int ac, wchar_t **av) {
 
     InitializeCriticalSection(&criticalSection);
 
-    hEventHook = SetWinEventHook(EVENT_CONSOLE_CARET, EVENT_CONSOLE_LAYOUT, NULL,
-        ConsoleEventProc, 0, 0, WINEVENT_OUTOFCONTEXT);
+    if(fnSetWinEventHook != NULL)
+        hEventHook = SetWinEventHook(EVENT_CONSOLE_CARET, EVENT_CONSOLE_LAYOUT, NULL,
+            ConsoleEventProc, 0, 0, WINEVENT_OUTOFCONTEXT);
 
     memset(&si, 0, sizeof(STARTUPINFO));
     memset(&pi, 0, sizeof(PROCESS_INFORMATION));
 
     // Copy our parent buffer sizes
     si.cb = sizeof(STARTUPINFO);
     si.dwFlags = 0;
+    if (fnSetWinEventHook == NULL) {
+        si.hStdInput = INVALID_HANDLE_VALUE;
+        si.hStdOutput = pipe_out;
+        si.hStdError = pipe_err;
+        si.dwFlags = STARTF_USESTDHANDLES;
+    }
 
     /* disable inheritance on pipe_in*/
     GOTO_CLEANUP_ON_FALSE(SetHandleInformation(pipe_in, HANDLE_FLAG_INHERIT, 0));
@@ -1163,8 +1215,13 @@ int wmain(int ac, wchar_t **av) {
         WaitForSingleObject(monitor_thread, INFINITE);
     if (ux_thread != INVALID_HANDLE_VALUE)
         TerminateThread(ux_thread, S_OK);
-    if (hEventHook)
-        UnhookWinEvent(hEventHook);
+    if (hEventHook && fnUnhookWinEvent != NULL)
+        fnUnhookWinEvent(hEventHook);
+
+    if (hKernelLibrary != NULL)
+        FreeLibrary(hKernelLibrary);
+    if (hUserLibrary != NULL)
+        FreeLibrary(hUserLibrary);
 
     FreeConsole();
 

contrib/win32/win32compat/w32fd.c

@@ -382,6 +382,23 @@ w32_write(int fd, const void *buf, unsigned int max) {
 	return fileio_write(fd_table.w32_ios[fd], buf, max);
 }
 
+int w32_writev(int fd, const struct iovec *iov, int iovcnt) {
+    int written = 0;
+    int i = 0;
+
+    CHECK_FD(fd);
+
+    for (i = 0; i < iovcnt; i++) {
+        int ret = write(fd, iov[i].iov_base, iov[i].iov_len);
+
+        if (ret > 0) {
+            written += ret;
+        }
+    }
+
+    return written;
+}
+
 int
 w32_fstat(int fd, struct w32_stat *buf) {
 	CHECK_FD(fd);

misc.c

@@ -436,9 +436,34 @@ char *
 colon(char *cp)
 {
 	int flag = 0;
+    int len = 0;
 
 	if (*cp == ':')		/* Leading colon is part of file name. */
 		return NULL;
+
+#ifdef WINDOWS
+    for (; *cp; ++cp) {
+        len++;
+
+        if (*cp == '[')
+            flag = 1;
+
+        if (flag && *cp != ']')
+            continue;
+
+        if (*cp == ']')
+            flag = 0;
+
+        if (*cp == ':') {
+            if (len != 2) { // avoid x: format for drive letter in Windows
+                return (cp);
+            }
+        }
+        //	if ( (*cp == '/') || (*cp == '\\') )
+        //		return (0);
+    }
+    return NULL;
+#else
 	if (*cp == '[')
 		flag = 1;
 
@@ -452,7 +477,8 @@ colon(char *cp)
 		if (*cp == '/')
 			return NULL;
 	}
-	return NULL;
+    return NULL;
+#endif
 }
 
 /* function to assist building execv() arguments */

progressmeter.c

@@ -81,10 +81,16 @@ static const char unit[] = " KMGT";
 static int
 can_output(void)
 {
-#ifndef WIN32_FIXME//R
-	return (getpgrp() == tcgetpgrp(STDOUT_FILENO));
+#ifndef WINDOWS
+    return (getpgrp() == tcgetpgrp(STDOUT_FILENO));
 #else
-	return 1;
+    DWORD dwProcessId = -1;
+    if (GetWindowThreadProcessId(GetStdHandle(STD_OUTPUT_HANDLE), &dwProcessId)) {
+        return(GetCurrentProcess() == dwProcessId);
+    }
+    else {
+        return -1;
+    }
 #endif
 }
 
@@ -298,7 +304,7 @@ sig_winch(int sig)
 static void
 setscreensize(void)
 {
-	#ifndef WIN32_FIXME//N
+#ifndef WINDOWS
 	struct winsize winsize;
 
 	if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &winsize) != -1 &&
@@ -310,6 +316,7 @@ setscreensize(void)
 	} else
 		win_size = DEFAULT_WINSIZE;
 	win_size += 1;					/* trailing \0 */
+#else
+    win_size = ConScreenSizeX() + 1;
 #endif
-	win_size = DEFAULT_WINSIZE + 1;
 }