Win32 2.5.0.0 → 2.5.1.0

raw patch · 4 files changed

+71/−5 lines, 4 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

Files

• System/Win32/Automation/Input.hsc +0/−1
• System/Win32/Types.hsc +65/−3
• Win32.cabal +1/−1
• changelog.md +5/−0

@@ -25,7 +25,6 @@ import System.Win32.Automation.Input.Key
 import System.Win32.Automation.Input.Mouse ( MOUSEINPUT )
 import System.Win32.Automation.Input.Mouse hiding ( MOUSEINPUT(..) )
-import qualified System.Win32.Automation.Input.Mouse
 import System.Win32.Types        ( UINT, LPARAM, failIfZero )
 import System.Win32.Word         ( DWORD, WORD )
 

@@ -21,20 +21,27 @@         , nullPtr         ) where -import Control.Exception (throwIO)+import Control.Concurrent.MVar (readMVar)+import Control.Exception (bracket, throwIO) import Data.Bits (shiftL, shiftR, (.|.), (.&.)) import Data.Char (isSpace) import Data.Int (Int32, Int64, Int16) import Data.Maybe (fromMaybe)+import Data.Typeable (cast) import Data.Word (Word8, Word16, Word32, Word64) import Foreign.C.Error (Errno(..), errnoToIOError) import Foreign.C.String (newCWString, withCWStringLen) import Foreign.C.String (peekCWString, peekCWStringLen, withCWString)-import Foreign.C.Types (CChar, CUChar, CWchar, CInt(..), CIntPtr, CUIntPtr)+import Foreign.C.Types (CChar, CUChar, CWchar, CInt(..), CIntPtr(..), CUIntPtr) import Foreign.ForeignPtr (ForeignPtr, newForeignPtr, newForeignPtr_)-import Foreign.Ptr (FunPtr, Ptr, nullPtr)+import Foreign.Ptr (FunPtr, Ptr, nullPtr, ptrToIntPtr)+import Foreign.StablePtr (StablePtr, freeStablePtr, newStablePtr) import Foreign (allocaArray)+import GHC.IO.FD (FD(..))+import GHC.IO.Handle.FD (fdToHandle)+import GHC.IO.Handle.Types (Handle(..), Handle__(..)) import Numeric (showHex)+import qualified System.IO as IO () import System.IO.Error (ioeSetErrorString) import System.IO.Unsafe (unsafePerformIO) @@ -51,6 +58,7 @@ finiteBitSize = bitSize #endif +#include <fcntl.h> #include <windows.h> ##include "windows_cconv.h" @@ -212,6 +220,60 @@  iNVALID_HANDLE_VALUE :: HANDLE iNVALID_HANDLE_VALUE = castUINTPtrToPtr (-1)++foreign import ccall "_open_osfhandle"+  _open_osfhandle :: CIntPtr -> CInt -> IO CInt++-- | Create a Haskell 'Handle' from a Windows 'HANDLE'.+--+-- Beware that this function allocates a new file descriptor. A consequence of+-- this is that calling 'hANDLEToHandle' on the standard Windows handles will+-- not give you 'IO.stdin', 'IO.stdout', or 'IO.stderr'. For example, if you+-- run this code:+--+-- @+-- import Graphics.Win32.Misc+-- stdoutHANDLE <- getStdHandle sTD_OUTPUT_HANDLE+-- stdout2 <- 'hANDLEToHandle' stdoutHANDLE+-- @+--+-- Then although you can use @stdout2@ to write to standard output, it is not+-- the case that @'IO.stdout' == stdout2@.+hANDLEToHandle :: HANDLE -> IO Handle+hANDLEToHandle handle =+  _open_osfhandle (fromIntegral (ptrToIntPtr handle)) (#const _O_BINARY) >>= fdToHandle++foreign import ccall unsafe "_get_osfhandle"+  c_get_osfhandle :: CInt -> IO HANDLE++-- | Extract a Windows 'HANDLE' from a Haskell 'Handle' and perform+-- an action on it.++-- Originally authored by Max Bolingbroke in the ansi-terminal library+withHandleToHANDLE :: Handle -> (HANDLE -> IO a) -> IO a+withHandleToHANDLE haskell_handle action =+    -- Create a stable pointer to the Handle. This prevents the garbage collector+    -- getting to it while we are doing horrible manipulations with it, and hence+    -- stops it being finalized (and closed).+    withStablePtr haskell_handle $ const $ do+        -- Grab the write handle variable from the Handle+        let write_handle_mvar = case haskell_handle of+                FileHandle _ handle_mvar     -> handle_mvar+                DuplexHandle _ _ handle_mvar -> handle_mvar+                  -- This is "write" MVar, we could also take the "read" one++        -- Get the FD from the algebraic data type+        Just fd <- fmap (\(Handle__ { haDevice = dev }) -> fmap fdFD (cast dev))+                 $ readMVar write_handle_mvar++        -- Finally, turn that (C-land) FD into a HANDLE using msvcrt+        windows_handle <- c_get_osfhandle fd++        -- Do what the user originally wanted+        action windows_handle++withStablePtr :: a -> (StablePtr a -> IO b) -> IO b+withStablePtr value = bracket (newStablePtr value) freeStablePtr  ---------------------------------------------------------------- -- Errors

@@ -1,5 +1,5 @@ name:		Win32-version:	2.5.0.0+version:	2.5.1.0 license:	BSD3 license-file:	LICENSE author:		Alastair Reid, shelarcy

@@ -1,5 +1,10 @@ # Changelog for [`Win32` package](http://hackage.haskell.org/package/Win32) +## 2.5.1.0 *Feb 2017*++* Add `withHandleToHANDLE` (originally found in the `ansi-terminal` library)+* fixed `PokeTZI` test+ ## 2.5.0.0 *Jan 2017*  * `failWith` (and the API calls that use it) now throw `IOError`s with proper