Jeremy White : twain: Make structures respect 2 byte packing requirements.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Feb 14 07:28:29 CST 2006


Module: wine
Branch: refs/heads/master
Commit: 5b04c3ea5aaf514a66bf5d06a606b3ec2b9ac1e7
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=5b04c3ea5aaf514a66bf5d06a606b3ec2b9ac1e7

Author: Jeremy White <jwhite at codeweavers.com>
Date:   Tue Feb 14 12:24:45 2006 +0100

twain: Make structures respect 2 byte packing requirements.

---

 dlls/twain/twain.h |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/dlls/twain/twain.h b/dlls/twain/twain.h
index de29252..b8d2878 100644
--- a/dlls/twain/twain.h
+++ b/dlls/twain/twain.h
@@ -57,6 +57,9 @@
 #include "windef.h"
 #include "winbase.h"
 
+/* The Twain structures must be packed on 2 byte alignment */
+#include "pshpack2.h"
+
 #undef FAR
 #define FAR
 #define huge
@@ -1861,4 +1864,7 @@ typedef TW_UINT16 (*DSENTRYPROC)(pTW_IDE
 }
 #endif  /* cplusplus */
 
+/* The Twain structures must be packed on 2 byte alignment */
+#include "poppack.h"
+
 #endif  /* TWAIN */




More information about the wine-cvs mailing list