X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/d719927eb175a73b13a7015498e9757010344bf5..e9ad953c8fcd27466d3a10ae344fb2122cc6b97b:/windows/window.c

diff --git a/windows/window.c b/windows/window.c
index 5fe21787..b7f5f867 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -2156,6 +2156,8 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 		si.lpReserved2 = NULL;
 		CreateProcess(b, cl, NULL, NULL, inherit_handles,
 			      NORMAL_PRIORITY_CLASS, NULL, NULL, &si, &pi);
+                CloseHandle(pi.hProcess);
+                CloseHandle(pi.hThread);
 
 		if (filemap)
 		    CloseHandle(filemap);
@@ -2992,7 +2994,19 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 	    break;
 	  case SB_THUMBPOSITION:
 	  case SB_THUMBTRACK:
-	    term_scroll(term, 1, HIWORD(wParam));
+	    /*
+	     * Use GetScrollInfo instead of HIWORD(wParam) to get
+	     * 32-bit scroll position.
+	     */
+	    {
+		SCROLLINFO si;
+
+		si.cbSize = sizeof(si);
+		si.fMask = SIF_TRACKPOS;
+		if (GetScrollInfo(hwnd, SB_VERT, &si) == 0)
+		    si.nTrackPos = HIWORD(wParam);
+		term_scroll(term, 1, si.nTrackPos);
+	    }
 	    break;
 	}
 	break;
@@ -3221,8 +3235,9 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 		} else
 		    break;
 
-		if (send_raw_mouse && shift_pressed &&
-		    !(conf_get_int(conf, CONF_mouse_override))) {
+		if (send_raw_mouse &&
+		    !(conf_get_int(conf, CONF_mouse_override) &&
+                      shift_pressed)) {
 		    /* Mouse wheel position is in screen coordinates for
 		     * some reason */
 		    POINT p;