Win32 2.6.2.1 → 2.7.0.0

raw patch · 4 files changed

+85/−19 lines, 4 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• System/Win32/File.hsc +78/−13
• System/Win32/Types.hsc +1/−1
• Win32.cabal +3/−3
• changelog.md +3/−2

@@ -17,14 +17,7 @@ -- ----------------------------------------------------------------------------- -module System.Win32.File-{--        ( AccessMode, ShareMode, CreateMode, FileAttributeOrFlag-        , CreateFile, CloseHandle, DeleteFile, CopyFile-        , MoveFileFlag, MoveFile, MoveFileEx,-        )--}-where+module System.Win32.File where  import System.Win32.Types import System.Win32.Time@@ -227,6 +220,15 @@  ---------------------------------------------------------------- +type LockMode = DWORD++#{enum LockMode,+ , lOCKFILE_EXCLUSIVE_LOCK   = LOCKFILE_EXCLUSIVE_LOCK+ , lOCKFILE_FAIL_IMMEDIATELY = LOCKFILE_FAIL_IMMEDIATELY+ }++----------------------------------------------------------------+ newtype GET_FILEEX_INFO_LEVELS = GET_FILEEX_INFO_LEVELS (#type GET_FILEEX_INFO_LEVELS)     deriving (Eq, Ord) @@ -503,13 +505,34 @@ ----------------------------------------------------------------  -- No support for this yet---type OVERLAPPED =--- (DWORD,  -- Offset---  DWORD,  -- OffsetHigh---  HANDLE) -- hEvent+data OVERLAPPED+  = OVERLAPPED { ovl_internal     :: ULONG_PTR+               , ovl_internalHigh :: ULONG_PTR+               , ovl_offset       :: DWORD+               , ovl_offsetHigh   :: DWORD+               , ovl_hEvent       :: HANDLE+               } deriving (Show) -type LPOVERLAPPED = Ptr ()+instance Storable OVERLAPPED where+  sizeOf = const (#size OVERLAPPED)+  alignment _ = #alignment OVERLAPPED+  poke buf ad = do+      (#poke OVERLAPPED, Internal    ) buf (ovl_internal     ad)+      (#poke OVERLAPPED, InternalHigh) buf (ovl_internalHigh ad)+      (#poke OVERLAPPED, Offset      ) buf (ovl_offset       ad)+      (#poke OVERLAPPED, OffsetHigh  ) buf (ovl_offsetHigh   ad)+      (#poke OVERLAPPED, hEvent      ) buf (ovl_hEvent       ad) +  peek buf = do+      intnl      <- (#peek OVERLAPPED, Internal    ) buf+      intnl_high <- (#peek OVERLAPPED, InternalHigh) buf+      off        <- (#peek OVERLAPPED, Offset      ) buf+      off_high   <- (#peek OVERLAPPED, OffsetHigh  ) buf+      hevnt      <- (#peek OVERLAPPED, hEvent      ) buf+      return $ OVERLAPPED intnl intnl_high off off_high hevnt++type LPOVERLAPPED = Ptr OVERLAPPED+ type MbLPOVERLAPPED = Maybe LPOVERLAPPED  --Sigh - I give up & prefix win32_ to the next two to avoid@@ -672,6 +695,48 @@   failIfFalse_ "SetVolumeLabel" $ c_SetVolumeLabel c_path c_name foreign import WINDOWS_CCONV unsafe "windows.h SetVolumeLabelW"   c_SetVolumeLabel :: LPCTSTR -> LPCTSTR -> IO Bool++----------------------------------------------------------------+-- File locks+----------------------------------------------------------------++-- | Locks a given range in a file handle, To lock an entire file+--   use 0xFFFFFFFFFFFFFFFF for size and 0 for offset.+lockFile :: HANDLE   -- ^ CreateFile handle+         -> LockMode -- ^ Locking mode+         -> DWORD64  -- ^ Size of region to lock+         -> DWORD64  -- ^ Beginning offset of file to lock+         -> IO BOOL  -- ^ Indicates if locking was successful, if not query+                     --   getLastError.+lockFile hwnd mode size f_offset =+  do let s_low = fromIntegral (size .&. 0xFFFFFFFF)+         s_hi  = fromIntegral (size `shiftR` 32)+         o_low = fromIntegral (f_offset .&. 0xFFFFFFFF)+         o_hi  = fromIntegral (f_offset `shiftR` 32)+         ovlp  = OVERLAPPED 0 0 o_low o_hi nullPtr+     with ovlp $ \ptr -> c_LockFileEx hwnd mode 0 s_low s_hi ptr++foreign import WINDOWS_CCONV unsafe "LockFileEx"+  c_LockFileEx :: HANDLE -> DWORD -> DWORD -> DWORD -> DWORD -> LPOVERLAPPED+               -> IO BOOL++-- | Unlocks a given range in a file handle, To unlock an entire file+--   use 0xFFFFFFFFFFFFFFFF for size and 0 for offset.+unlockFile :: HANDLE  -- ^ CreateFile handle+           -> DWORD64 -- ^ Size of region to unlock+           -> DWORD64 -- ^ Beginning offset of file to unlock+           -> IO BOOL -- ^ Indicates if unlocking was successful, if not query+                      --   getLastError.+unlockFile hwnd size f_offset =+  do let s_low = fromIntegral (size .&. 0xFFFFFFFF)+         s_hi  = fromIntegral (size `shiftR` 32)+         o_low = fromIntegral (f_offset .&. 0xFFFFFFFF)+         o_hi  = fromIntegral (f_offset `shiftR` 32)+         ovlp  = OVERLAPPED 0 0 o_low o_hi nullPtr+     with ovlp $ \ptr -> c_UnlockFileEx hwnd 0 s_low s_hi ptr++foreign import WINDOWS_CCONV unsafe "UnlockFileEx"+  c_UnlockFileEx :: HANDLE -> DWORD -> DWORD -> DWORD -> LPOVERLAPPED -> IO BOOL  ---------------------------------------------------------------- -- End

@@ -94,12 +94,12 @@ type ULONG64       = Word64 type SHORT         = Int16 -type DWORD_PTR     = Ptr DWORD32 type INT_PTR       = Ptr CInt type ULONG         = Word32 type UINT_PTR      = Word type LONG_PTR      = CIntPtr type ULONG_PTR     = CUIntPtr+type DWORD_PTR     = ULONG_PTR #ifdef _WIN64 type HALF_PTR      = Ptr INT32 #else

@@ -1,5 +1,5 @@ name:		Win32-version:	2.6.2.1+version:	2.7.0.0 license:	BSD3 license-file:	LICENSE author:		Alastair Reid, shelarcy, Tamar Christina@@ -13,8 +13,8 @@ build-type:     Simple cabal-version:  >=1.10 extra-source-files:-    include/diatemp.h include/dumpBMP.h include/ellipse.h include/errors.h-    include/Win32Aux.h include/win32debug.h include/alignment.h+	include/diatemp.h include/dumpBMP.h include/ellipse.h include/errors.h+	include/Win32Aux.h include/win32debug.h include/alignment.h         changelog.md  Library

@@ -1,8 +1,9 @@ # Changelog for [`Win32` package](http://hackage.haskell.org/package/Win32) -## 2.6.2.1 *August 2021*+## 2.7.0.0 *March 2018* -* Fix `registery001` test (See #181)+* Fixed `DWORD_PTR` type (See #99)+* Add `lockFile` and `unlockFile` (See #103)  ## 2.6.2.0 *December 2017*