diff --git a/Graphics/Win32.hs b/Graphics/Win32.hs --- a/Graphics/Win32.hs +++ b/Graphics/Win32.hs @@ -1,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- diff --git a/Graphics/Win32/Control.hsc b/Graphics/Win32/Control.hsc --- a/Graphics/Win32/Control.hsc +++ b/Graphics/Win32/Control.hsc @@ -1,6 +1,4 @@ -#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,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- diff --git a/Graphics/Win32/GDI.hs b/Graphics/Win32/GDI.hs --- a/Graphics/Win32/GDI.hs +++ b/Graphics/Win32/GDI.hs @@ -1,6 +1,4 @@ -#if __GLASGOW_HASKELL__ >= 701 {-# LANGUAGE Trustworthy #-} -#endif ----------------------------------------------------------------------------- -- | -- Module : Graphics.Win32.GDI @@ -21,7 +19,7 @@ -- 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 +-- https://ghc.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings -- for details 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,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- 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,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- 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,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- 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,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- 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,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- 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,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- 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,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- 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,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- 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,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- 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,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- 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,6 +1,4 @@ -#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,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- diff --git a/Graphics/Win32/Key.hsc b/Graphics/Win32/Key.hsc --- a/Graphics/Win32/Key.hsc +++ b/Graphics/Win32/Key.hsc @@ -1,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- diff --git a/Graphics/Win32/Menu.hsc b/Graphics/Win32/Menu.hsc --- a/Graphics/Win32/Menu.hsc +++ b/Graphics/Win32/Menu.hsc @@ -1,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- diff --git a/Graphics/Win32/Message.hsc b/Graphics/Win32/Message.hsc --- a/Graphics/Win32/Message.hsc +++ b/Graphics/Win32/Message.hsc @@ -1,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- diff --git a/Graphics/Win32/Misc.hsc b/Graphics/Win32/Misc.hsc --- a/Graphics/Win32/Misc.hsc +++ b/Graphics/Win32/Misc.hsc @@ -1,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- diff --git a/Graphics/Win32/Resource.hsc b/Graphics/Win32/Resource.hsc --- a/Graphics/Win32/Resource.hsc +++ b/Graphics/Win32/Resource.hsc @@ -1,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- diff --git a/Graphics/Win32/Window.hsc b/Graphics/Win32/Window.hsc --- a/Graphics/Win32/Window.hsc +++ b/Graphics/Win32/Window.hsc @@ -1,8 +1,6 @@ {-# LANGUAGE CApiFFI #-} {-# LANGUAGE NegativeLiterals #-} -#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,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- diff --git a/System/Win32/Console.hsc b/System/Win32/Console.hsc --- a/System/Win32/Console.hsc +++ b/System/Win32/Console.hsc @@ -1,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- @@ -41,7 +41,7 @@ ##include "windows_cconv.h" import System.Win32.Types -import Graphics.Win32.Misc +import Graphics.Win32.Misc import Foreign.C.Types (CInt(..)) import Foreign.C.String (withCWString, CWString) diff --git a/System/Win32/DLL.hsc b/System/Win32/DLL.hsc --- a/System/Win32/DLL.hsc +++ b/System/Win32/DLL.hsc @@ -1,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- diff --git a/System/Win32/DebugApi.hsc b/System/Win32/DebugApi.hsc --- a/System/Win32/DebugApi.hsc +++ b/System/Win32/DebugApi.hsc @@ -1,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- @@ -66,7 +66,7 @@ | SingleStep | StackOverflow deriving (Show) - + data DebugEventInfo = UnknownDebugEvent | Exception ExceptionInfo Exception @@ -94,7 +94,7 @@ where dwZero = 0 :: DWORD wZero = 0 :: WORD - + rest (#const EXCEPTION_DEBUG_EVENT) p' = do chance <- (#peek EXCEPTION_DEBUG_INFO, dwFirstChance) p' flags <- (#peek EXCEPTION_RECORD, ExceptionFlags) p' @@ -121,7 +121,7 @@ (#const EXCEPTION_PRIV_INSTRUCTION) -> return PrivilegedInstruction (#const EXCEPTION_SINGLE_STEP) -> return SingleStep (#const EXCEPTION_STACK_OVERFLOW) -> return StackOverflow - _ -> return UnknownException + _ -> return UnknownException return $ Exception (chance/=dwZero, flags==dwZero, addr) e rest (#const CREATE_THREAD_DEBUG_EVENT) p' = do @@ -141,16 +141,16 @@ start <- (#peek CREATE_PROCESS_DEBUG_INFO, lpStartAddress) p' imgname <- (#peek CREATE_PROCESS_DEBUG_INFO, lpImageName) p' --unicode <- (#peek CREATE_PROCESS_DEBUG_INFO, fUnicode) p' - return $ CreateProcess proc + return $ CreateProcess proc (file, imgbase, dbgoff, dbgsize, imgname) --, unicode/=wZero) (thread, local, start) - + rest (#const EXIT_THREAD_DEBUG_EVENT) p' = (#peek EXIT_THREAD_DEBUG_INFO, dwExitCode) p' >>= return.ExitThread - + rest (#const EXIT_PROCESS_DEBUG_EVENT) p' = (#peek EXIT_PROCESS_DEBUG_INFO, dwExitCode) p' >>= return.ExitProcess - + rest (#const LOAD_DLL_DEBUG_EVENT) p' = do file <- (#peek LOAD_DLL_DEBUG_INFO, hFile) p' imgbase <- (#peek LOAD_DLL_DEBUG_INFO, lpBaseOfDll) p' @@ -158,7 +158,7 @@ dbgsize <- (#peek LOAD_DLL_DEBUG_INFO, nDebugInfoSize) p' imgname <- (#peek LOAD_DLL_DEBUG_INFO, lpImageName) p' --unicode <- (#peek LOAD_DLL_DEBUG_INFO, fUnicode) p' - return $ + return $ LoadDll (file, imgbase, dbgoff, dbgsize, imgname)--, unicode/=wZero) rest (#const OUTPUT_DEBUG_STRING_EVENT) p' = do @@ -166,7 +166,7 @@ unicode <- (#peek OUTPUT_DEBUG_STRING_INFO, fUnicode) p' len <- (#peek OUTPUT_DEBUG_STRING_INFO, nDebugStringLength) p' return $ DebugString dat (unicode/=wZero) len - + rest (#const UNLOAD_DLL_DEBUG_EVENT) p' = (#peek UNLOAD_DLL_DEBUG_INFO, lpBaseOfDll) p' >>= return.UnloadDll @@ -339,7 +339,7 @@ 6 -> (#offset CONTEXT, Dr6) 7 -> (#offset CONTEXT, Dr7) _ -> undefined - + setReg :: Ptr a -> Int -> DWORD -> IO () setReg = pokeByteOff @@ -381,12 +381,12 @@ foreign import WINDOWS_CCONV "windows.h DebugActiveProcess" c_DebugActiveProcess :: DWORD -> IO Bool - + -- Windows XP -- foreign import WINDOWS_CCONV "windows.h DebugActiveProcessStop" -- c_DebugActiveProcessStop :: DWORD -> IO Bool -foreign import WINDOWS_CCONV "windows.h ReadProcessMemory" c_ReadProcessMemory :: +foreign import WINDOWS_CCONV "windows.h ReadProcessMemory" c_ReadProcessMemory :: PHANDLE -> Ptr () -> Ptr Word8 -> DWORD -> Ptr DWORD -> IO BOOL foreign import WINDOWS_CCONV "windows.h WriteProcessMemory" c_WriteProcessMemory :: diff --git a/System/Win32/File.hsc b/System/Win32/File.hsc --- a/System/Win32/File.hsc +++ b/System/Win32/File.hsc @@ -1,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- diff --git a/System/Win32/FileMapping.hsc b/System/Win32/FileMapping.hsc --- a/System/Win32/FileMapping.hsc +++ b/System/Win32/FileMapping.hsc @@ -1,6 +1,4 @@ -#if __GLASGOW_HASKELL__ >= 701 {-# LANGUAGE Trustworthy #-} -#endif ----------------------------------------------------------------------------- -- | -- Module : System.Win32.FileMapping @@ -143,7 +141,7 @@ c_OpenFileMapping access inherit c_name mapViewOfFileEx :: HANDLE -> FileMapAccess -> DDWORD -> SIZE_T -> Ptr a -> IO (Ptr b) -mapViewOfFileEx h access offset size base = +mapViewOfFileEx h access offset size base = failIfNull "mapViewOfFile(Ex): c_MapViewOfFileEx" $ c_MapViewOfFileEx h access ohi olow size base where @@ -162,7 +160,7 @@ c_OpenFileMapping :: DWORD -> BOOL -> LPCTSTR -> IO HANDLE foreign import WINDOWS_CCONV "windows.h CreateFileMappingW" - c_CreateFileMapping :: HANDLE -> Ptr () -> DWORD -> DWORD -> DWORD -> LPCTSTR -> IO HANDLE + c_CreateFileMapping :: HANDLE -> Ptr () -> DWORD -> DWORD -> DWORD -> LPCTSTR -> IO HANDLE foreign import WINDOWS_CCONV "windows.h MapViewOfFileEx" c_MapViewOfFileEx :: HANDLE -> DWORD -> DWORD -> DWORD -> SIZE_T -> Ptr a -> IO (Ptr b) diff --git a/System/Win32/Info.hsc b/System/Win32/Info.hsc --- a/System/Win32/Info.hsc +++ b/System/Win32/Info.hsc @@ -1,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- @@ -360,10 +360,10 @@ foreign import WINDOWS_CCONV unsafe "windows.h GetUserNameW" c_GetUserName :: LPTSTR -> LPDWORD -> IO Bool - + getUserName :: IO String -getUserName = - allocaArray 512 $ \ c_str -> +getUserName = + allocaArray 512 $ \ c_str -> with 512 $ \ c_len -> do failIfFalse_ "GetUserName" $ c_GetUserName c_str c_len len <- peek c_len diff --git a/System/Win32/Mem.hsc b/System/Win32/Mem.hsc --- a/System/Win32/Mem.hsc +++ b/System/Win32/Mem.hsc @@ -1,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- diff --git a/System/Win32/MinTTY.hsc b/System/Win32/MinTTY.hsc --- a/System/Win32/MinTTY.hsc +++ b/System/Win32/MinTTY.hsc @@ -2,7 +2,7 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- @@ -153,7 +153,7 @@ type F_NtQueryObject = HANDLE -> CInt -> Ptr OBJECT_NAME_INFORMATION -> ULONG -> Ptr ULONG -> IO NTSTATUS - + foreign import WINDOWS_CCONV "dynamic" mk_NtQueryObject :: FunPtr F_NtQueryObject -> F_NtQueryObject diff --git a/System/Win32/NLS.hsc b/System/Win32/NLS.hsc --- a/System/Win32/NLS.hsc +++ b/System/Win32/NLS.hsc @@ -1,6 +1,4 @@ -#if __GLASGOW_HASKELL__ >= 701 {-# LANGUAGE Trustworthy #-} -#endif ----------------------------------------------------------------------------- -- | -- Module : System.Win32.NLS diff --git a/System/Win32/Path.hsc b/System/Win32/Path.hsc --- a/System/Win32/Path.hsc +++ b/System/Win32/Path.hsc @@ -1,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- @@ -53,5 +53,5 @@ _ <- localFree p_AbsPath return path -foreign import WINDOWS_CCONV unsafe "Shlwapi.h PathRelativePathToW" +foreign import WINDOWS_CCONV unsafe "Shlwapi.h PathRelativePathToW" c_pathRelativePathTo :: LPTSTR -> LPCTSTR -> DWORD -> LPCTSTR -> DWORD -> IO UINT diff --git a/System/Win32/Process.hsc b/System/Win32/Process.hsc --- a/System/Win32/Process.hsc +++ b/System/Win32/Process.hsc @@ -1,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- diff --git a/System/Win32/Registry.hsc b/System/Win32/Registry.hsc --- a/System/Win32/Registry.hsc +++ b/System/Win32/Registry.hsc @@ -1,6 +1,4 @@ -#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 @@ -2,12 +2,10 @@ -- 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 +-- https://ghc.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings -- for details -#if __GLASGOW_HASKELL__ >= 701 {-# LANGUAGE Trustworthy #-} -#endif ----------------------------------------------------------------------------- -- | -- Module : System.Win32.Security @@ -22,7 +20,7 @@ -- ----------------------------------------------------------------------------- -module System.Win32.Security ( +module System.Win32.Security ( -- * Types SID, PSID, ACL, PACL, @@ -96,34 +94,34 @@ :: PSECURITY_DESCRIPTOR -- pSecurityDescriptor -> Ptr SECURITY_DESCRIPTOR_CONTROL -- pControl -> LPDWORD -- lpdwRevision - -> IO BOOL + -> IO BOOL foreign import WINDOWS_CCONV unsafe "windows.h GetSecurityDescriptorDacl" - c_getSecurityDescriptorDacl + c_getSecurityDescriptorDacl :: PSECURITY_DESCRIPTOR -- pSecurityDescriptor -> LPBOOL -- lpbDaclPresent -> Ptr PACL -- pDacl -> LPBOOL -- lpbDaclDefaulted - -> IO BOOL + -> IO BOOL foreign import WINDOWS_CCONV unsafe "windows.h GetSecurityDescriptorGroup" c_getSecurityDescriptorGroup :: PSECURITY_DESCRIPTOR -- pSecurityDescriptor -> Ptr PSID -- pGroup -> LPBOOL -- lpbGroupDefaulted - -> IO BOOL + -> IO BOOL foreign import WINDOWS_CCONV unsafe "windows.h GetSecurityDescriptorLength" c_getSecurityDescriptorLength :: PSECURITY_DESCRIPTOR -- pSecurityDescriptor - -> IO DWORD + -> IO DWORD foreign import WINDOWS_CCONV unsafe "windows.h GetSecurityDescriptorOwner" c_getSecurityDescriptorOwner :: PSECURITY_DESCRIPTOR -- pSecurityDescriptor -> Ptr PSID -- pOwner -> LPBOOL -- lpbOwnerDefaulted - -> IO BOOL + -> IO BOOL foreign import WINDOWS_CCONV unsafe "windows.h GetSecurityDescriptorSacl" c_getSecurityDescriptorSacl @@ -131,18 +129,18 @@ -> LPBOOL -- lpbSaclPresent -> Ptr PACL -- pSacl -> LPBOOL -- lpbSaclDefaulted - -> IO BOOL + -> IO BOOL foreign import WINDOWS_CCONV unsafe "windows.h InitializeSecurityDescriptor" c_initializeSecurityDescriptor :: PSECURITY_DESCRIPTOR -- pSecurityDescriptor -> DWORD -- dwRevision - -> IO BOOL + -> IO BOOL foreign import WINDOWS_CCONV unsafe "windows.h IsValidSecurityDescriptor" c_isValidSecurityDescriptor :: PSECURITY_DESCRIPTOR -- pSecurityDescriptor - -> IO BOOL + -> IO BOOL foreign import WINDOWS_CCONV unsafe "windows.h SetSecurityDescriptorDacl" c_setSecurityDescriptorDacl @@ -150,21 +148,21 @@ -> BOOL -- bDaclPresent -> PACL -- pDacl -> BOOL -- bDaclDefaulted - -> IO BOOL + -> IO BOOL foreign import WINDOWS_CCONV unsafe "windows.h SetSecurityDescriptorGroup" c_setSecurityDescriptorGroup :: PSECURITY_DESCRIPTOR -- pSecurityDescriptor -> PSID -- pGroup -> BOOL -- bGroupDefaulted - -> IO BOOL + -> IO BOOL foreign import WINDOWS_CCONV unsafe "windows.h SetSecurityDescriptorOwner" c_setSecurityDescriptorOwner :: PSECURITY_DESCRIPTOR -- pSecurityDescriptor -> PSID -- pOwner -> BOOL -- bOwnerDefaulted - -> IO BOOL + -> IO BOOL foreign import WINDOWS_CCONV unsafe "windows.h SetSecurityDescriptorSacl" c_setSecurityDescriptorSacl @@ -172,7 +170,7 @@ -> BOOL -- bSaclPresent -> PACL -- pSacl -> BOOL -- bSaclDefaulted - -> IO BOOL + -> IO BOOL -- --------------------------------------------------------------------------- @@ -190,7 +188,7 @@ -- , pROTECTED_DACL_SECURITY_INFORMATION = PROTECTED_DACL_SECURITY_INFORMATION -- , pROTECTED_SACL_SECURITY_INFORMATION = PROTECTED_SACL_SECURITY_INFORMATION -- , uNPROTECTED_DACL_SECURITY_INFORMATION = UNPROTECTED_DACL_SECURITY_INFORMATION --- , uNPROTECTED_SACL_SECURITY_INFORMATION = UNPROTECTED_SACL_SECURITY_INFORMATION +-- , uNPROTECTED_SACL_SECURITY_INFORMATION = UNPROTECTED_SACL_SECURITY_INFORMATION getFileSecurity :: String @@ -203,7 +201,7 @@ needed <- peek lpnLengthNeeded fpSd <- mallocForeignPtrBytes (fromIntegral needed) withForeignPtr fpSd $ \pSd -> do - failIfFalse_ "getFileSecurity" $ + failIfFalse_ "getFileSecurity" $ c_GetFileSecurity lpFileName si pSd needed lpnLengthNeeded return (SecurityDescriptor fpSd) @@ -214,7 +212,7 @@ -> PSECURITY_DESCRIPTOR -- pSecurityDescriptor -> DWORD -- nLength -> LPDWORD -- lpnLengthNeeded - -> IO BOOL + -> IO BOOL --foreign import WINDOWS_CCONV unsafe "windows.h AccessCheck" -- c_AccessCheck diff --git a/System/Win32/Shell.hsc b/System/Win32/Shell.hsc --- a/System/Win32/Shell.hsc +++ b/System/Win32/Shell.hsc @@ -1,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- @@ -81,7 +81,7 @@ peekTString pstr raiseUnsupported :: String -> IO () -raiseUnsupported loc = +raiseUnsupported loc = ioError (ioeSetErrorString (mkIOError illegalOperationErrorType loc Nothing Nothing) "unsupported operation") foreign import WINDOWS_CCONV unsafe "SHGetFolderPathW" diff --git a/System/Win32/SimpleMAPI.hsc b/System/Win32/SimpleMAPI.hsc --- a/System/Win32/SimpleMAPI.hsc +++ b/System/Win32/SimpleMAPI.hsc @@ -1,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- @@ -224,7 +224,7 @@ maybeWith withCAString pw $ \c_pw -> alloca $ \out -> do mapiFail_ "MAPILogon: " $ mapifLogon - f (maybeHWND hwnd) + f (maybeHWND hwnd) c_ses c_pw flags 0 out peek out diff --git a/System/Win32/Time.hsc b/System/Win32/Time.hsc --- a/System/Win32/Time.hsc +++ b/System/Win32/Time.hsc @@ -1,6 +1,6 @@ #if __GLASGOW_HASKELL__ >= 709 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >= 701 +#else {-# LANGUAGE Trustworthy #-} #endif ----------------------------------------------------------------------------- diff --git a/System/Win32/Types.hsc b/System/Win32/Types.hsc --- a/System/Win32/Types.hsc +++ b/System/Win32/Types.hsc @@ -1,7 +1,5 @@ -#if __GLASGOW_HASKELL__ >= 701 -{-# LANGUAGE Trustworthy #-} -#endif {-# LANGUAGE CPP #-} +{-# LANGUAGE Trustworthy #-} ----------------------------------------------------------------------------- -- | -- Module : System.Win32.Types diff --git a/Win32.cabal b/Win32.cabal --- a/Win32.cabal +++ b/Win32.cabal @@ -1,5 +1,5 @@ name: Win32 -version: 2.8.0.0 +version: 2.8.1.0 license: BSD3 license-file: LICENSE author: Alastair Reid, shelarcy, Tamar Christina diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,11 @@ # Changelog for [`Win32` package](http://hackage.haskell.org/package/Win32) +## 2.8.1.0 *Nov 2018* + +* Fix broken links (See #116) +* Remove unused CPP Lower bounds (See #114) +* GHC 8.8 release + ## 2.8.0.0 *May 2018* * Deprecated `regQueryValueKey`. (See #105, #108)