diff --git a/Graphics/Win32.hs b/Graphics/Win32.hs --- a/Graphics/Win32.hs +++ b/Graphics/Win32.hs @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : Graphics.Win32 diff --git a/Graphics/Win32/Control.hsc b/Graphics/Win32/Control.hsc --- a/Graphics/Win32/Control.hsc +++ b/Graphics/Win32/Control.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : Graphics.Win32.Control diff --git a/Graphics/Win32/Dialogue.hsc b/Graphics/Win32/Dialogue.hsc --- a/Graphics/Win32/Dialogue.hsc +++ b/Graphics/Win32/Dialogue.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : Graphics.Win32.Dialogue diff --git a/Graphics/Win32/GDI.hs b/Graphics/Win32/GDI.hs --- a/Graphics/Win32/GDI.hs +++ b/Graphics/Win32/GDI.hs @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : Graphics.Win32.GDI diff --git a/Graphics/Win32/GDI/Bitmap.hsc b/Graphics/Win32/GDI/Bitmap.hsc --- a/Graphics/Win32/GDI/Bitmap.hsc +++ b/Graphics/Win32/GDI/Bitmap.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : Graphics.Win32.GDI.Bitmap diff --git a/Graphics/Win32/GDI/Brush.hsc b/Graphics/Win32/GDI/Brush.hsc --- a/Graphics/Win32/GDI/Brush.hsc +++ b/Graphics/Win32/GDI/Brush.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : Graphics.Win32.GDI.Brush diff --git a/Graphics/Win32/GDI/Clip.hsc b/Graphics/Win32/GDI/Clip.hsc --- a/Graphics/Win32/GDI/Clip.hsc +++ b/Graphics/Win32/GDI/Clip.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : Graphics.Win32.GDI.Clip diff --git a/Graphics/Win32/GDI/Font.hsc b/Graphics/Win32/GDI/Font.hsc --- a/Graphics/Win32/GDI/Font.hsc +++ b/Graphics/Win32/GDI/Font.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : Graphics.Win32.GDI.Font diff --git a/Graphics/Win32/GDI/Graphics2D.hs b/Graphics/Win32/GDI/Graphics2D.hs --- a/Graphics/Win32/GDI/Graphics2D.hs +++ b/Graphics/Win32/GDI/Graphics2D.hs @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : Graphics.Win32.GDI.Graphics2D diff --git a/Graphics/Win32/GDI/HDC.hs b/Graphics/Win32/GDI/HDC.hs --- a/Graphics/Win32/GDI/HDC.hs +++ b/Graphics/Win32/GDI/HDC.hs @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : Graphics.Win32.GDI.HDC diff --git a/Graphics/Win32/GDI/Palette.hsc b/Graphics/Win32/GDI/Palette.hsc --- a/Graphics/Win32/GDI/Palette.hsc +++ b/Graphics/Win32/GDI/Palette.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : Graphics.Win32.GDI.Palette diff --git a/Graphics/Win32/GDI/Path.hs b/Graphics/Win32/GDI/Path.hs --- a/Graphics/Win32/GDI/Path.hs +++ b/Graphics/Win32/GDI/Path.hs @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : Graphics.Win32.GDI.Path diff --git a/Graphics/Win32/GDI/Pen.hsc b/Graphics/Win32/GDI/Pen.hsc --- a/Graphics/Win32/GDI/Pen.hsc +++ b/Graphics/Win32/GDI/Pen.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : Graphics.Win32.GDI.Pen diff --git a/Graphics/Win32/GDI/Region.hs b/Graphics/Win32/GDI/Region.hs --- a/Graphics/Win32/GDI/Region.hs +++ b/Graphics/Win32/GDI/Region.hs @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : Graphics.Win32.GDI.Region diff --git a/Graphics/Win32/GDI/Types.hsc b/Graphics/Win32/GDI/Types.hsc --- a/Graphics/Win32/GDI/Types.hsc +++ b/Graphics/Win32/GDI/Types.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : Graphics.Win32.GDI.Types diff --git a/Graphics/Win32/Icon.hs b/Graphics/Win32/Icon.hs --- a/Graphics/Win32/Icon.hs +++ b/Graphics/Win32/Icon.hs @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : Graphics.Win32.Icon diff --git a/Graphics/Win32/Key.hsc b/Graphics/Win32/Key.hsc --- a/Graphics/Win32/Key.hsc +++ b/Graphics/Win32/Key.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : Graphics.Win32.Key diff --git a/Graphics/Win32/Menu.hsc b/Graphics/Win32/Menu.hsc --- a/Graphics/Win32/Menu.hsc +++ b/Graphics/Win32/Menu.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : Graphics.Win32.Menu diff --git a/Graphics/Win32/Message.hsc b/Graphics/Win32/Message.hsc --- a/Graphics/Win32/Message.hsc +++ b/Graphics/Win32/Message.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : Graphics.Win32.Message diff --git a/Graphics/Win32/Misc.hsc b/Graphics/Win32/Misc.hsc --- a/Graphics/Win32/Misc.hsc +++ b/Graphics/Win32/Misc.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : Graphics.Win32.Misc diff --git a/Graphics/Win32/Resource.hsc b/Graphics/Win32/Resource.hsc --- a/Graphics/Win32/Resource.hsc +++ b/Graphics/Win32/Resource.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : Graphics.Win32.Resource diff --git a/Graphics/Win32/Window.hsc b/Graphics/Win32/Window.hsc --- a/Graphics/Win32/Window.hsc +++ b/Graphics/Win32/Window.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : Graphics.Win32.Window diff --git a/System/Win32.hs b/System/Win32.hs --- a/System/Win32.hs +++ b/System/Win32.hs @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : System.Win32 diff --git a/System/Win32/Console.hsc b/System/Win32/Console.hsc --- a/System/Win32/Console.hsc +++ b/System/Win32/Console.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : System.Win32.Console diff --git a/System/Win32/DLL.hsc b/System/Win32/DLL.hsc --- a/System/Win32/DLL.hsc +++ b/System/Win32/DLL.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : System.Win32.DLL diff --git a/System/Win32/DebugApi.hsc b/System/Win32/DebugApi.hsc --- a/System/Win32/DebugApi.hsc +++ b/System/Win32/DebugApi.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : System.Win32.DebugApi diff --git a/System/Win32/File.hsc b/System/Win32/File.hsc --- a/System/Win32/File.hsc +++ b/System/Win32/File.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : System.Win32.File @@ -24,7 +27,9 @@ import System.Win32.Types import System.Win32.Time -import Foreign +import Foreign hiding (void) +import Control.Monad +import Control.Concurrent #include @@ -252,11 +257,41 @@ -- File operations ---------------------------------------------------------------- +-- | like failIfFalse_, but retried on sharing violations. +-- This is necessary for many file operations; see +-- http://support.microsoft.com/kb/316609 +-- +failIfWithRetry :: (a -> Bool) -> String -> IO a -> IO a +failIfWithRetry cond msg action = retryOrFail retries + where + delay = 100*1000 -- in ms, we use threadDelay + retries = 20 :: Int + -- KB article recommends 250/5 + + -- retryOrFail :: Int -> IO a + retryOrFail times + | times <= 0 = errorWin msg + | otherwise = do + ret <- action + if not (cond ret) + then return ret + else do + err_code <- getLastError + if err_code == (# const ERROR_SHARING_VIOLATION) + then do threadDelay delay; retryOrFail (times - 1) + else errorWin msg + +failIfWithRetry_ :: (a -> Bool) -> String -> IO a -> IO () +failIfWithRetry_ cond msg action = void $ failIfWithRetry cond msg action + +failIfFalseWithRetry_ :: String -> IO Bool -> IO () +failIfFalseWithRetry_ = failIfWithRetry_ not + deleteFile :: String -> IO () deleteFile name = withTString name $ \ c_name -> - failIfFalse_ (unwords ["DeleteFile",show name]) $ - c_DeleteFile c_name + failIfFalseWithRetry_ (unwords ["DeleteFile",show name]) $ + c_DeleteFile c_name foreign import stdcall unsafe "windows.h DeleteFileW" c_DeleteFile :: LPCTSTR -> IO Bool @@ -264,7 +299,7 @@ copyFile src dest over = withTString src $ \ c_src -> withTString dest $ \ c_dest -> - failIfFalse_ (unwords ["CopyFile",show src,show dest]) $ + failIfFalseWithRetry_ (unwords ["CopyFile",show src,show dest]) $ c_CopyFile c_src c_dest over foreign import stdcall unsafe "windows.h CopyFileW" c_CopyFile :: LPCTSTR -> LPCTSTR -> Bool -> IO Bool @@ -273,7 +308,7 @@ moveFile src dest = withTString src $ \ c_src -> withTString dest $ \ c_dest -> - failIfFalse_ (unwords ["MoveFile",show src,show dest]) $ + failIfFalseWithRetry_ (unwords ["MoveFile",show src,show dest]) $ c_MoveFile c_src c_dest foreign import stdcall unsafe "windows.h MoveFileW" c_MoveFile :: LPCTSTR -> LPCTSTR -> IO Bool @@ -282,7 +317,7 @@ moveFileEx src dest flags = withTString src $ \ c_src -> withTString dest $ \ c_dest -> - failIfFalse_ (unwords ["MoveFileEx",show src,show dest]) $ + failIfFalseWithRetry_ (unwords ["MoveFileEx",show src,show dest]) $ c_MoveFileEx c_src c_dest flags foreign import stdcall unsafe "windows.h MoveFileExW" c_MoveFileEx :: LPCTSTR -> LPCTSTR -> MoveFileFlag -> IO Bool @@ -298,7 +333,7 @@ createDirectory :: String -> Maybe LPSECURITY_ATTRIBUTES -> IO () createDirectory name mb_attr = withTString name $ \ c_name -> - failIfFalse_ (unwords ["CreateDirectory",show name]) $ + failIfFalseWithRetry_ (unwords ["CreateDirectory",show name]) $ c_CreateDirectory c_name (maybePtr mb_attr) foreign import stdcall unsafe "windows.h CreateDirectoryW" c_CreateDirectory :: LPCTSTR -> LPSECURITY_ATTRIBUTES -> IO Bool @@ -307,7 +342,7 @@ createDirectoryEx template name mb_attr = withTString template $ \ c_template -> withTString name $ \ c_name -> - failIfFalse_ (unwords ["CreateDirectoryEx",show template,show name]) $ + failIfFalseWithRetry_ (unwords ["CreateDirectoryEx",show template,show name]) $ c_CreateDirectoryEx c_template c_name (maybePtr mb_attr) foreign import stdcall unsafe "windows.h CreateDirectoryExW" c_CreateDirectoryEx :: LPCTSTR -> LPCTSTR -> LPSECURITY_ATTRIBUTES -> IO Bool @@ -315,7 +350,7 @@ removeDirectory :: String -> IO () removeDirectory name = withTString name $ \ c_name -> - failIfFalse_ (unwords ["RemoveDirectory",show name]) $ + failIfFalseWithRetry_ (unwords ["RemoveDirectory",show name]) $ c_RemoveDirectory c_name foreign import stdcall unsafe "windows.h RemoveDirectoryW" c_RemoveDirectory :: LPCTSTR -> IO Bool @@ -337,7 +372,7 @@ createFile :: String -> AccessMode -> ShareMode -> Maybe LPSECURITY_ATTRIBUTES -> CreateMode -> FileAttributeOrFlag -> Maybe HANDLE -> IO HANDLE createFile name access share mb_attr mode flag mb_h = withTString name $ \ c_name -> - failIf (==iNVALID_HANDLE_VALUE) (unwords ["CreateFile",show name]) $ + failIfWithRetry (==iNVALID_HANDLE_VALUE) (unwords ["CreateFile",show name]) $ c_CreateFile c_name access share (maybePtr mb_attr) mode flag (maybePtr mb_h) foreign import stdcall unsafe "windows.h CreateFileW" c_CreateFile :: LPCTSTR -> AccessMode -> ShareMode -> LPSECURITY_ATTRIBUTES -> CreateMode -> FileAttributeOrFlag -> HANDLE -> IO HANDLE @@ -371,7 +406,7 @@ setFileAttributes :: String -> FileAttributeOrFlag -> IO () setFileAttributes name attr = withTString name $ \ c_name -> - failIfFalse_ (unwords ["SetFileAttributes",show name]) + failIfFalseWithRetry_ (unwords ["SetFileAttributes",show name]) $ c_SetFileAttributes c_name attr foreign import stdcall unsafe "windows.h SetFileAttributesW" c_SetFileAttributes :: LPCTSTR -> FileAttributeOrFlag -> IO Bool @@ -379,14 +414,14 @@ getFileAttributes :: String -> IO FileAttributeOrFlag getFileAttributes name = withTString name $ \ c_name -> - failIf (== 0xFFFFFFFF) (unwords ["GetFileAttributes",show name]) $ + failIfWithRetry (== 0xFFFFFFFF) (unwords ["GetFileAttributes",show name]) $ c_GetFileAttributes c_name foreign import stdcall unsafe "windows.h GetFileAttributesW" c_GetFileAttributes :: LPCTSTR -> IO FileAttributeOrFlag getFileInformationByHandle :: HANDLE -> IO BY_HANDLE_FILE_INFORMATION getFileInformationByHandle h = alloca $ \res -> do - failIfFalse_ "GetFileInformationByHandle" $ c_GetFileInformationByHandle h res + failIfFalseWithRetry_ "GetFileInformationByHandle" $ c_GetFileInformationByHandle h res peek res foreign import stdcall unsafe "windows.h GetFileInformationByHandle" c_GetFileInformationByHandle :: HANDLE -> Ptr BY_HANDLE_FILE_INFORMATION -> IO BOOL diff --git a/System/Win32/FileMapping.hsc b/System/Win32/FileMapping.hsc --- a/System/Win32/FileMapping.hsc +++ b/System/Win32/FileMapping.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : System.Win32.FileMapping diff --git a/System/Win32/Info.hsc b/System/Win32/Info.hsc --- a/System/Win32/Info.hsc +++ b/System/Win32/Info.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : System.Win32.Info diff --git a/System/Win32/Mem.hsc b/System/Win32/Mem.hsc --- a/System/Win32/Mem.hsc +++ b/System/Win32/Mem.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : System.Win32.Mem diff --git a/System/Win32/NLS.hsc b/System/Win32/NLS.hsc --- a/System/Win32/NLS.hsc +++ b/System/Win32/NLS.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : System.Win32.NLS diff --git a/System/Win32/Process.hsc b/System/Win32/Process.hsc --- a/System/Win32/Process.hsc +++ b/System/Win32/Process.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : System.Win32.Process diff --git a/System/Win32/Registry.hsc b/System/Win32/Registry.hsc --- a/System/Win32/Registry.hsc +++ b/System/Win32/Registry.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : System.Win32.Registry diff --git a/System/Win32/Security.hsc b/System/Win32/Security.hsc --- a/System/Win32/Security.hsc +++ b/System/Win32/Security.hsc @@ -1,3 +1,13 @@ +{-# OPTIONS_GHC -w #-} +-- The above warning supression flag is a temporary kludge. +-- While working on this module you are encouraged to remove it and fix +-- any warnings in the module. See +-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings +-- for details + +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : System.Win32.Security @@ -11,13 +21,6 @@ -- FFI-bindings to interact with Win32 Security -- ----------------------------------------------------------------------------- - -{-# OPTIONS_GHC -w #-} --- The above warning supression flag is a temporary kludge. --- While working on this module you are encouraged to remove it and fix --- any warnings in the module. See --- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings --- for details module System.Win32.Security ( -- * Types diff --git a/System/Win32/Shell.hsc b/System/Win32/Shell.hsc --- a/System/Win32/Shell.hsc +++ b/System/Win32/Shell.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : System.Win32.Shell diff --git a/System/Win32/SimpleMAPI.hsc b/System/Win32/SimpleMAPI.hsc --- a/System/Win32/SimpleMAPI.hsc +++ b/System/Win32/SimpleMAPI.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : System.Win32.SimpleMAPI diff --git a/System/Win32/Time.hsc b/System/Win32/Time.hsc --- a/System/Win32/Time.hsc +++ b/System/Win32/Time.hsc @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : System.Win32.Time @@ -23,7 +26,7 @@ pokeByteOff, poke) , Ptr, nullPtr, castPtr, plusPtr, advancePtr , with, alloca, allocaBytes, copyArray ) -import Foreign.C ( CInt, CWchar +import Foreign.C ( CInt(..), CWchar(..) , peekCWString, withCWStringLen, withCWString ) #include "windows.h" diff --git a/System/Win32/Types.hs b/System/Win32/Types.hs --- a/System/Win32/Types.hs +++ b/System/Win32/Types.hs @@ -1,3 +1,6 @@ +#if __GLASGOW_HASKELL__ >= 701 +{-# LANGUAGE Trustworthy #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : System.Win32.Types @@ -94,7 +97,7 @@ maybeNum :: Num a => Maybe a -> a maybeNum = fromMaybe 0 -numToMaybe :: Num a => a -> Maybe a +numToMaybe :: (Eq a, Num a) => a -> Maybe a numToMaybe n = if n == 0 then Nothing else Just n type MbLPVOID = Maybe LPVOID @@ -180,7 +183,7 @@ failIfNull :: String -> IO (Ptr a) -> IO (Ptr a) failIfNull = failIf (== nullPtr) -failIfZero :: Num a => String -> IO a -> IO a +failIfZero :: (Eq a, Num a) => String -> IO a -> IO a failIfZero = failIf (== 0) failIfFalse_ :: String -> IO Bool -> IO () diff --git a/Win32.cabal b/Win32.cabal --- a/Win32.cabal +++ b/Win32.cabal @@ -1,13 +1,15 @@ name: Win32 -version: 2.2.1.0 +version: 2.2.2.0 license: BSD3 license-file: LICENSE author: Alastair Reid copyright: Alastair Reid, 1999-2003 -maintainer: Esa Ilari Vuokko -bug-reports: http://hackage.haskell.org/trac/ghc/newticket?component=libraries%20%28other%29 +maintainer: Bryan O'Sullivan +bug-reports: https://github.com/haskell/win32/issues +homepage: https://github.com/haskell/win32 category: System, Graphics synopsis: A binding to part of the Win32 library +description: A binding to part of the Win32 library. build-type: Simple cabal-version: >=1.6 extra-source-files: @@ -57,7 +59,7 @@ System.Win32.Security System.Win32.Types System.Win32.Shell - extensions: ForeignFunctionInterface + extensions: ForeignFunctionInterface, CPP if impl(ghc >= 7.1) extensions: NondecreasingIndentation extra-libraries: @@ -76,5 +78,4 @@ source-repository head type: git - location: http://darcs.haskell.org/packages/Win32.git/ - + location: git://github.com/haskell/win32