Fix twain device handle corruption

[Francois Gouget]

Alexandre Julliard wrote:
> Francois Gouget <fgouget at codeweavers.com> writes:
> 
>>  * or we could check that config.h has been included first using
>>something like:
>>
>>#ifndef __WINE_CONFIG_H
>># error You must include config.h first
>>#endif
> 
> I think that's preferable, we really want to be using the same
> structure everywhere.

Yes, it's a bit moer change but it's probably cleaner. Here's the patch:

Changelog:

  * dlls/twain/twain_i.h
    dlls/twain/capability.c
    dlls/twain/ds_audio.c
    dlls/twain/twain16_main.c
    dlls/twain/twain32_main.c

    Francois Gouget <fgouget at codeweavers.com>
    Make sure we include config.h before including twain_i.h.
    Fixes an activeDS.deviceHandle corruption bug.

-- 
Francois Gouget
fgouget at codeweavers.com

-------------- next part --------------
Index: dlls/twain/twain_i.h
===================================================================
RCS file: /var/cvs/wine/dlls/twain/twain_i.h,v
retrieving revision 1.4
diff -u -r1.4 twain_i.h
--- dlls/twain/twain_i.h	5 Sep 2003 23:08:30 -0000	1.4
+++ dlls/twain/twain_i.h	10 Sep 2004 22:48:40 -0000
@@ -19,6 +19,10 @@
 #ifndef _TWAIN32_H
 #define _TWAIN32_H
 
+#ifndef __WINE_CONFIG_H
+# error You must include config.h first
+#endif
+
 #ifdef HAVE_SANE
 # include <sane/sane.h>
 #endif
Index: dlls/twain/capability.c
===================================================================
RCS file: /var/cvs/wine/dlls/twain/capability.c,v
retrieving revision 1.3
diff -u -r1.3 capability.c
--- dlls/twain/capability.c	22 Aug 2003 05:05:56 -0000	1.3
+++ dlls/twain/capability.c	10 Sep 2004 22:49:38 -0000
@@ -19,6 +19,8 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 
+#include "config.h"
+
 #include <stdarg.h>
 
 #include "windef.h"
Index: dlls/twain/ds_audio.c
===================================================================
RCS file: /var/cvs/wine/dlls/twain/ds_audio.c,v
retrieving revision 1.1
diff -u -r1.1 ds_audio.c
--- dlls/twain/ds_audio.c	21 Mar 2002 02:58:39 -0000	1.1
+++ dlls/twain/ds_audio.c	10 Sep 2004 22:49:57 -0000
@@ -17,7 +17,7 @@
  */
 
 #include "twain.h"
-#include "twain_i.h"
+
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(twain);
Index: dlls/twain/twain16_main.c
===================================================================
RCS file: /var/cvs/wine/dlls/twain/twain16_main.c,v
retrieving revision 1.1
diff -u -r1.1 twain16_main.c
--- dlls/twain/twain16_main.c	13 Jul 2004 03:37:07 -0000	1.1
+++ dlls/twain/twain16_main.c	10 Sep 2004 22:49:15 -0000
@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+
 #include <stdarg.h>
 
 #include "windef.h"
Index: dlls/twain/twain32_main.c
===================================================================
RCS file: /var/cvs/wine/dlls/twain/twain32_main.c,v
retrieving revision 1.6
diff -u -r1.6 twain32_main.c
--- dlls/twain/twain32_main.c	22 Aug 2003 05:05:56 -0000	1.6
+++ dlls/twain/twain32_main.c	10 Sep 2004 22:50:09 -0000
@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+
 #include <stdarg.h>
 
 #include "windef.h"