base 4.16.2.0 → 4.16.3.0

raw patch · 4 files changed

+43/−12 lines, 4 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

GHC/IO/Handle/Windows.hs +5/−3
GHC/IO/Windows/Handle.hsc +29/−8
base.cabal +1/−1
changelog.md +8/−0

GHC/IO/Handle/Windows.hs view

@@ -217,9 +217,11 @@ handleToHANDLE h = case h of   FileHandle _ mv -> do     Handle__{haDevice = dev} <- readMVar mv-    case (cast dev :: Maybe (Win.Io Win.NativeHandle)) of-      Just hwnd -> return $ Win.toHANDLE hwnd-      Nothing   -> throwErr "not a file HANDLE"+    case (cast dev :: Maybe (Win.Io Win.NativeHandle),+          cast dev :: Maybe (Win.Io Win.ConsoleHandle)) of+      (Just hwnd, Nothing) -> return $ Win.toHANDLE hwnd+      (Nothing, Just hwnd) -> return $ Win.toHANDLE hwnd+      _                    -> throwErr "not a file HANDLE"   DuplexHandle{} -> throwErr "not a file handle"   where     throwErr msg = ioException $ IOError (Just h)

GHC/IO/Windows/Handle.hsc view

@@ -140,7 +140,7 @@  -- | @since 4.11.0.0 instance GHC.IO.Device.RawIO (Io ConsoleHandle) where-  read             = consoleRead+  read             = consoleRead True   readNonBlocking  = consoleReadNonBlocking   write            = consoleWrite   writeNonBlocking = consoleWriteNonBlocking@@ -420,6 +420,9 @@ foreign import WINDOWS_CCONV safe "windows.h ReadConsoleInputW"   c_read_console_input :: HANDLE -> PINPUT_RECORD -> DWORD -> LPDWORD -> IO BOOL +foreign import WINDOWS_CCONV safe "windows.h GetNumberOfConsoleInputEvents"+  c_get_num_console_inputs :: HANDLE -> LPDWORD -> IO BOOL+ type LPSECURITY_ATTRIBUTES = LPVOID  -- -----------------------------------------------------------------------------@@ -570,8 +573,8 @@          val <- fromIntegral <$> peek res          return val -consoleRead :: Io ConsoleHandle -> Ptr Word8 -> Word64 -> Int -> IO Int-consoleRead hwnd ptr _offset bytes+consoleRead :: Bool -> Io ConsoleHandle -> Ptr Word8 -> Word64 -> Int -> IO Int+consoleRead blocking hwnd ptr _offset bytes   = withUTF16ToGhcInternal ptr bytes $ \reqBytes w_ptr ->       alloca $ \res -> do        cooked <- isCooked hwnd@@ -588,7 +591,7 @@        -- and instead have by default a pipe/file based std handles.  Which        -- means the cooked behaviour is best when used in a native Windows        -- terminal such as cmd, powershell or ConEmu.-       case cooked of+       case cooked || not blocking of         False -> do           debugIO "consoleRead :: un-cooked I/O read."           -- eotControl allows us to handle control characters like EOL@@ -626,9 +629,27 @@           -- but for now I'm only interested in key presses.           let entries = fromIntegral $ reqBytes `div` (#size INPUT_RECORD)           allocaBytes entries $ \p_inputs ->-            readEvent p_inputs entries res w_ptr+            maybeReadEvent p_inputs entries res w_ptr -    where readEvent p_inputs entries res w_ptr = do+          -- Check to see if we have been explicitly asked to do a non-blocking+          -- I/O, and if we were, make sure that if we didn't have any console+          -- events that we don't block.+    where maybeReadEvent p_inputs entries res w_ptr =+            case (not blocking) of+              True -> do+                avail <- with (0 :: DWORD) $ \num_events_ptr -> do+                  failIfFalse_ "GHC.IO.Handle.consoleRead [non-blocking]" $+                    c_get_num_console_inputs (toHANDLE hwnd) num_events_ptr+                  peek num_events_ptr+                debugIO $ "consoleRead [avail] :: " ++ show avail+                if avail > 0+                  then readEvent p_inputs entries res w_ptr+                  else return 0+              False -> readEvent p_inputs entries res w_ptr++          -- Unconditionally issue the first read, but conditionally+          -- do the recursion.+          readEvent p_inputs entries res w_ptr = do             failIfFalse_ "GHC.IO.Handle.consoleRead" $               c_read_console_input (toHANDLE hwnd) p_inputs                                    (fromIntegral entries) res@@ -637,7 +658,7 @@             read <- cobble b_read w_ptr p_inputs             if read > 0                then return $ fromIntegral read-               else readEvent p_inputs entries res w_ptr+               else maybeReadEvent p_inputs entries res w_ptr            -- Dereference and read console input records.  We only read the bare           -- minimum required to know which key/sequences were pressed.  To do@@ -677,7 +698,7 @@ consoleReadNonBlocking :: Io ConsoleHandle -> Ptr Word8 -> Word64 -> Int                        -> IO (Maybe Int) consoleReadNonBlocking hwnd ptr offset bytes-  = Just <$> consoleRead hwnd ptr offset bytes+  = Just <$> consoleRead False hwnd ptr offset bytes  -- ----------------------------------------------------------------------------- -- Operations on file handles

base.cabal view

@@ -1,6 +1,6 @@ cabal-version:  3.0 name:           base-version:        4.16.2.0+version:        4.16.3.0 -- NOTE: Don't forget to update ./changelog.md  license:        BSD-3-Clause

changelog.md view

@@ -1,5 +1,13 @@ # Changelog for [`base` package](http://hackage.haskell.org/package/base) +## 4.16.3.0 *May 2022*++  * Shipped with GHC 9.2.4++  * winio: make consoleReadNonBlocking not wait for any events at all.++  * winio: Add support to console handles to handleToHANDLE+ ## 4.16.2.0 *May 2022*    * Shipped with GHC 9.2.2