[commit: packages/Win32] master: Pick Win32 2.5.4.1 to master. (9cd8da7)

git at git.haskell.org git at git.haskell.org
Mon Apr 17 21:29:17 UTC 2017


Repository : ssh://git@git.haskell.org/Win32

On branch  : master
Link       : http://git.haskell.org/packages/Win32.git/commitdiff/9cd8da76146ef50f0834c129a38472d48009ba66

>---------------------------------------------------------------

commit 9cd8da76146ef50f0834c129a38472d48009ba66
Author: Tamar Christina <tamar at zhox.com>
Date:   Tue Apr 4 00:10:31 2017 +0100

    Pick Win32 2.5.4.1 to master.


>---------------------------------------------------------------

9cd8da76146ef50f0834c129a38472d48009ba66
 Graphics/Win32/LayeredWindow.hsc | 5 +++++
 changelog.md                     | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/Graphics/Win32/LayeredWindow.hsc b/Graphics/Win32/LayeredWindow.hsc
index b811150..9bd9906 100644
--- a/Graphics/Win32/LayeredWindow.hsc
+++ b/Graphics/Win32/LayeredWindow.hsc
@@ -52,8 +52,13 @@ foreign import WINDOWS_CCONV unsafe "windows.h GetLayeredWindowAttributes"
 foreign import WINDOWS_CCONV unsafe "windows.h UpdateLayeredWindow"
   c_UpdateLayeredWindow :: HANDLE -> HDC -> Ptr POINT -> Ptr SIZE ->  HDC -> Ptr POINT -> COLORREF -> Ptr BLENDFUNCTION -> DWORD -> IO BOOL
 
+#if defined(x86_64_HOST_ARCH)
 foreign import WINDOWS_CCONV "windows.h GetWindowLongPtrW"
   c_GetWindowLongPtr :: HANDLE -> INT -> IO LONG_PTR
+#else
+foreign import WINDOWS_CCONV "windows.h GetWindowLongW"
+  c_GetWindowLongPtr :: HANDLE -> INT -> IO LONG_PTR
+#endif
 
 #{enum DWORD,
  , uLW_ALPHA    = ULW_ALPHA
diff --git a/changelog.md b/changelog.md
index 916c757..567c357 100644
--- a/changelog.md
+++ b/changelog.md
@@ -7,6 +7,10 @@
   default to Haskell2010. (See #81)
 * Use `Maybe` in wrappers for functions with nullable pointer parameters (See #83)
 
+## 2.5.4.1 *April 2017*
+
+* Fixed GetWindowLong on 32-bit Windows
+
 ## 2.5.3.0 *March 2017*
 
 * Fix buffer overflow in `regSetValue`. (See #39)



More information about the ghc-commits mailing list