Make sure we include config.h before including twain_i.h. Fixes an activeDS.deviceHandle corruption bug.
diff --git a/dlls/twain/capability.c b/dlls/twain/capability.c index fb0fdfa..5f3af57 100644 --- a/dlls/twain/capability.c +++ b/dlls/twain/capability.c
@@ -19,6 +19,8 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT +#include "config.h" + #include <stdarg.h> #include "windef.h"
diff --git a/dlls/twain/ds_audio.c b/dlls/twain/ds_audio.c index a9c966a..105c4b7 100644 --- a/dlls/twain/ds_audio.c +++ b/dlls/twain/ds_audio.c
@@ -17,7 +17,7 @@ */ #include "twain.h" -#include "twain_i.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(twain); @@ -48,4 +48,3 @@ return TWRC_FAILURE; } -
diff --git a/dlls/twain/twain16_main.c b/dlls/twain/twain16_main.c index fa5aa5a..dc80440 100644 --- a/dlls/twain/twain16_main.c +++ b/dlls/twain/twain16_main.c
@@ -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"
diff --git a/dlls/twain/twain32_main.c b/dlls/twain/twain32_main.c index e4cf857..e34588c 100644 --- a/dlls/twain/twain32_main.c +++ b/dlls/twain/twain32_main.c
@@ -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"
diff --git a/dlls/twain/twain_i.h b/dlls/twain/twain_i.h index 118f557..e7be1cc 100644 --- a/dlls/twain/twain_i.h +++ b/dlls/twain/twain_i.h
@@ -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