Fix wrong alignments (#68)

* Win32: Correct alignments

* Win32: alignment

* Win32: fix alignments.

Author: Mistuke

Graphics/Win32/GDI/AlphaBlend.hsc

@@ -17,6 +17,7 @@ import Graphics.Win32.GDI.Types ( HDC )
 import System.Win32.Types       ( BOOL, BYTE, UINT )
 
 #include <windows.h>
+#include "alignment.h"
 ##include "windows_cconv.h"
 
 foreign import ccall unsafe "alphablend.h"
@@ -57,7 +58,7 @@ data BLENDFUNCTION = BLENDFUNCTION
 
 instance Storable BLENDFUNCTION where
     sizeOf = const #size BLENDFUNCTION
-    alignment = sizeOf
+    alignment _ = #alignment BLENDFUNCTION
     poke buf func = do
         (#poke BLENDFUNCTION, BlendOp)     buf (blendOp func)
         (#poke BLENDFUNCTION, BlendFlags)  buf (blendFlags func)

System/Win32/Automation/Input.hsc

@@ -30,6 +30,7 @@ import System.Win32.Types        ( UINT, LPARAM, failIfZero )
 import System.Win32.Word         ( DWORD, WORD )
 
 #include <windows.h>
+#include "alignment.h"
 ##include "windows_cconv.h"
 #include "winuser_compat.h"
 
@@ -71,7 +72,7 @@ data INPUT = Mouse MOUSEINPUT | Keyboard KEYBDINPUT | OtherHardware HARDWAREINPU
 
 instance Storable INPUT where
     sizeOf = const #{size INPUT}
-    alignment = sizeOf
+    alignment _ = #alignment INPUT
 
     poke buf (Mouse mouse) = do
         (#poke INPUT, type) buf (#{const INPUT_MOUSE}:: DWORD)
@@ -103,7 +104,7 @@ data HARDWAREINPUT = HARDWAREINPUT
 
 instance Storable HARDWAREINPUT where
     sizeOf = const #{size HARDWAREINPUT}
-    alignment = sizeOf
+    alignment _ = #alignment HARDWAREINPUT
     poke buf input = do
         (#poke HARDWAREINPUT, uMsg)    buf (uMsg input)
         (#poke HARDWAREINPUT, wParamL) buf (wParamL input)

System/Win32/Automation/Input/Key.hsc

@@ -18,6 +18,7 @@ import System.Win32.Word  ( DWORD, WORD )
 
 #include <windows.h>
 #include "winuser_compat.h"
+#include "alignment.h"
 
 type PKEYBDINPUT = Ptr KEYBDINPUT
 
@@ -31,7 +32,7 @@ data KEYBDINPUT = KEYBDINPUT
 
 instance Storable KEYBDINPUT where
     sizeOf = const #{size KEYBDINPUT}
-    alignment = sizeOf
+    alignment _ = #alignment KEYBDINPUT
     poke buf input = do
         (#poke KEYBDINPUT, wVk)     buf (wVk input)
         (#poke KEYBDINPUT, wScan)   buf (wScan input)

System/Win32/Automation/Input/Mouse.hsc

@@ -18,6 +18,7 @@ import System.Win32.Word         ( DWORD )
 
 #include <windows.h>
 #include "winuser_compat.h"
+#include "alignment.h"
 
 type PMOUSEINPUT = Ptr MOUSEINPUT
 
@@ -32,7 +33,7 @@ data MOUSEINPUT = MOUSEINPUT
 
 instance Storable MOUSEINPUT where
     sizeOf = const #{size MOUSEINPUT}
-    alignment = sizeOf
+    alignment _ = #alignment MOUSEINPUT
     poke buf input = do
         (#poke MOUSEINPUT, dx) buf (dx input)
         (#poke MOUSEINPUT, dx) buf (dx input)

System/Win32/File.hsc

@@ -36,6 +36,7 @@ import Control.Concurrent
 ##include "windows_cconv.h"
 
 #include <windows.h>
+#include "alignment.h"
 
 ----------------------------------------------------------------
 -- Enumeration types
@@ -254,7 +255,7 @@ data BY_HANDLE_FILE_INFORMATION = BY_HANDLE_FILE_INFORMATION
 
 instance Storable BY_HANDLE_FILE_INFORMATION where
     sizeOf = const (#size BY_HANDLE_FILE_INFORMATION)
-    alignment = sizeOf
+    alignment _ = #alignment BY_HANDLE_FILE_INFORMATION
     poke buf bhi = do
         (#poke BY_HANDLE_FILE_INFORMATION, dwFileAttributes)     buf (bhfiFileAttributes bhi)
         (#poke BY_HANDLE_FILE_INFORMATION, ftCreationTime)       buf (bhfiCreationTime bhi)
@@ -294,7 +295,7 @@ data WIN32_FILE_ATTRIBUTE_DATA = WIN32_FILE_ATTRIBUTE_DATA
 
 instance Storable WIN32_FILE_ATTRIBUTE_DATA where
     sizeOf = const (#size WIN32_FILE_ATTRIBUTE_DATA)
-    alignment = sizeOf
+    alignment _ = #alignment WIN32_FILE_ATTRIBUTE_DATA
     poke buf ad = do
         (#poke WIN32_FILE_ATTRIBUTE_DATA, dwFileAttributes) buf (fadFileAttributes ad)
         (#poke WIN32_FILE_ATTRIBUTE_DATA, ftCreationTime)   buf (fadCreationTime ad)

System/Win32/Info.hsc

@@ -36,6 +36,7 @@ import Prelude hiding (catch)
 ##include "windows_cconv.h"
 
 #include <windows.h>
+#include "alignment.h"
 
 ----------------------------------------------------------------
 -- Environment Strings
@@ -218,7 +219,7 @@ data SYSTEM_INFO = SYSTEM_INFO
 
 instance Storable SYSTEM_INFO where
     sizeOf = const #size SYSTEM_INFO
-    alignment = sizeOf
+    alignment _ = #alignment SYSTEM_INFO
     poke buf si = do
         (#poke SYSTEM_INFO, wProcessorArchitecture) buf (siProcessorArchitecture si)
         (#poke SYSTEM_INFO, dwPageSize)             buf (siPageSize si)

System/Win32/Info/Computer.hsc

@@ -66,6 +66,7 @@ import System.Win32.Word     ( DWORD, LPDWORD )
 
 #include <windows.h>
 #include <Lmcons.h>
+#include "alignment.h"
 ##include "windows_cconv.h"
 
 ----------------------------------------------------------------
@@ -137,7 +138,7 @@ data HW_PROFILE_INFO = HW_PROFILE_INFO
 
 instance Storable HW_PROFILE_INFO where
     sizeOf = const #{size HW_PROFILE_INFOW}
-    alignment = sizeOf
+    alignment _ = #alignment HW_PROFILE_INFOW
     poke buf info = do
         (#poke HW_PROFILE_INFOW, dwDockInfo) buf (dwDockInfo info)
         withTString (szHwProfileGuid info) $ \szHwProfileGuid' ->

System/Win32/Info/Version.hsc

@@ -27,6 +27,7 @@ import System.Win32.Types    ( BOOL, BYTE, failIfFalse_ )
 import System.Win32.Word     ( WORD, DWORD )
 
 #include <windows.h>
+#include "alignment.h"
 ##include "windows_cconv.h"
 
 ----------------------------------------------------------------
@@ -77,7 +78,7 @@ data OSVERSIONINFOEX = OSVERSIONINFOEX
 
 instance Storable OSVERSIONINFOEX where
     sizeOf = const #{size struct _OSVERSIONINFOEXW}
-    alignment = sizeOf
+    alignment _ = #alignment OSVERSIONINFOEX
     poke buf info = do
         (#poke OSVERSIONINFOEXW, dwOSVersionInfoSize) buf (sizeOf info)
         (#poke OSVERSIONINFOEXW, dwMajorVersion) buf (dwMajorVersion info)

System/Win32/Mem.hsc

@@ -27,6 +27,7 @@ import Foreign.C.Types
 ##include "windows_cconv.h"
 
 #include <windows.h>
+#include "alignment.h"
 
 ----------------------------------------------------------------
 -- Data types
@@ -48,7 +49,7 @@ data MEMORY_BASIC_INFORMATION = MEMORY_BASIC_INFORMATION
 
 instance Storable MEMORY_BASIC_INFORMATION where
     sizeOf _ = #size MEMORY_BASIC_INFORMATION
-    alignment = sizeOf
+    alignment _ = #alignment MEMORY_BASIC_INFORMATION
     poke buf mbi = do
         (#poke MEMORY_BASIC_INFORMATION, BaseAddress)       buf (mbiBaseAddress mbi)
         (#poke MEMORY_BASIC_INFORMATION, AllocationBase)    buf (mbiAllocationBase mbi)

System/Win32/Time.hsc

@@ -32,7 +32,8 @@ import Foreign.C        ( CInt(..), CWchar(..)
                         , peekCWString, withCWStringLen, withCWString )
 
 ##include "windows_cconv.h"
-#include "windows.h"
+#include <windows.h>
+#include "alignment.h"
 
 ----------------------------------------------------------------
 -- data types
@@ -63,7 +64,7 @@ data TimeZoneId = TzIdUnknown | TzIdStandard | TzIdDaylight
 
 instance Storable FILETIME where
     sizeOf = const (#size FILETIME)
-    alignment = sizeOf
+    alignment _ = #alignment FILETIME
     poke buf (FILETIME n) = do
         (#poke FILETIME, dwLowDateTime) buf low
         (#poke FILETIME, dwHighDateTime) buf hi
@@ -75,7 +76,7 @@ instance Storable FILETIME where
 
 instance Storable SYSTEMTIME where
     sizeOf _ = #size SYSTEMTIME
-    alignment = sizeOf
+    alignment _ = #alignment SYSTEMTIME
     poke buf st = do
          (#poke SYSTEMTIME, wYear)          buf (wYear st)
          (#poke SYSTEMTIME, wMonth)         buf (wMonth st)
@@ -98,7 +99,7 @@ instance Storable SYSTEMTIME where
 
 instance Storable TIME_ZONE_INFORMATION where
     sizeOf _ = (#size TIME_ZONE_INFORMATION)
-    alignment = sizeOf
+    alignment _ = #alignment TIME_ZONE_INFORMATION
     poke buf tzi = do
         (#poke TIME_ZONE_INFORMATION, Bias) buf (tziBias tzi)
         (#poke TIME_ZONE_INFORMATION, StandardDate) buf (tziStandardDate tzi)

Win32.cabal

@@ -97,7 +97,7 @@ Library
         "user32", "gdi32", "winmm", "advapi32", "shell32", "shfolder", "shlwapi", "msimg32", "imm32", "ntdll"
     ghc-options:      -Wall
     include-dirs:     include
-    includes:         "alphablend.h", "diatemp.h", "dumpBMP.h", "ellipse.h", "errors.h", "HsGDI.h", "HsWin32.h", "Win32Aux.h", "win32debug.h", "windows_cconv.h", "WndProc.h"
+    includes:         "alphablend.h", "diatemp.h", "dumpBMP.h", "ellipse.h", "errors.h", "HsGDI.h", "HsWin32.h", "Win32Aux.h", "win32debug.h", "windows_cconv.h", "WndProc.h", "alignment.h"
     install-includes: "HsWin32.h", "HsGDI.h", "WndProc.h", "windows_cconv.h", "alphablend.h", "winternl_compat.h", "winuser_compat.h"
     c-sources:
         cbits/HsGDI.c

changelog.md

@@ -13,6 +13,8 @@
   number is returned. This simulates the behavior of the `NT_SUCCESS` macro.
 * Merged package Win32-extras (See #16)
 * `Graphics.Win32.Misc.messageBox` safely imported now https://github.com/haskell/win32/pull/5
+* Fixed various alignment calls that were incorrect. These would result in an incorrect alignment
+  being returned on certain platforms. (See #66)
 
 ## 2.4.0.0 *Nov 2016*
 

include/alignment.h

@@ -0,0 +1,3 @@
+#if __GLASGOW_HASKELL__ < 711
+#define hsc_alignment(t ) hsc_printf ( "%lu", (unsigned long)offsetof(struct {char x__; t(y__); }, y__));
+#endif