different PID types for Unix and Windows

Windows has a larger (unsigned) PID space, so cannot use the unix CInt
there.

Note that TransferInfo does not yet ever get the TransferPid populated,
as there is missing locking.

Assistant/TransferSlots.hs

@@ -260,13 +260,15 @@ cancelTransfer pause t = do
 	killproc pid = void $ tryIO $ do
 #ifndef mingw32_HOST_OS
 		g <- getProcessGroupIDOf pid
-		void $ tryIO $ signalProcessGroup sigTERM g
+		let signal sig = void $ tryIO $ signalProcessGroup sig g
+		signal sigTERM
 		graceperiod
-		void $ tryIO $ signalProcessGroup sigKILL g
+		signal sigKILL
 #else
-		void $ tryIO $ generateConsoleCtrlEvent cTRL_C_EVENT pid
+		let singnal sig = void $ tryIO $ generateConsoleCtrlEvent sig pid
+		signal cTRL_C_EVENT
 		graceperiod
-		void $ tryIO $ generateConsoleCtrlEvent cTRL_BREAK_EVENT pid
+		signal cTRL_BREAK_EVENT
 #endif
 	graceperiod = threadDelay 50000 -- 0.05 second
 

Logs/Transfer.hs

@@ -18,13 +18,23 @@ import Utility.Metered
 import Utility.Percentage
 import Utility.QuickCheck
 
-import System.Posix.Types
+#ifndef mingw32_HOST_OS
+import System.Posix.Types (ProcessID)
+#else
+import System.Win32.Process (ProcessId)
+#endif
 import Data.Time.Clock
 import Data.Time.Clock.POSIX
 import Data.Time
 import System.Locale
 import Control.Concurrent
 
+#ifndef mingw32_HOST_OS
+type PID = ProcessID
+#else
+type PID = ProcessId
+#endif
+
 {- Enough information to uniquely identify a transfer, used as the filename
  - of the transfer information file. -}
 data Transfer = Transfer
@@ -42,7 +52,7 @@ data Transfer = Transfer
  -}
 data TransferInfo = TransferInfo
 	{ startedTime :: Maybe POSIXTime
-	, transferPid :: Maybe ProcessID
+	, transferPid :: Maybe PID
 	, transferTid :: Maybe ThreadId
 	, transferRemote :: Maybe Remote
 	, bytesComplete :: Maybe Integer
@@ -328,13 +338,13 @@ writeTransferInfo info = unlines
 	, fromMaybe "" $ associatedFile info -- comes last; arbitrary content
 	]
 
-readTransferInfoFile :: Maybe ProcessID -> FilePath -> IO (Maybe TransferInfo)
+readTransferInfoFile :: Maybe PID -> FilePath -> IO (Maybe TransferInfo)
 readTransferInfoFile mpid tfile = catchDefaultIO Nothing $ do
 	h <- openFile tfile ReadMode
 	fileEncoding h
 	hClose h `after` (readTransferInfo mpid <$> hGetContentsStrict h)
 
-readTransferInfo :: Maybe ProcessID -> String -> Maybe TransferInfo
+readTransferInfo :: Maybe PID -> String -> Maybe TransferInfo
 readTransferInfo mpid s = TransferInfo
 	<$> time
 	<*> pure mpid