From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Fri, 27 Dec 2013 14:08:56 +0000 (+0000)
Subject: [TWAIN_32]
X-Git-Tag: ReactOS-0.3.16~407
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=3c0256d2c4a242830514ca09fa0d2624d045679f

[TWAIN_32]
* Move some inclusions to the main header.
* Set the default debugging channel globally through the main header.
* Remove inclusions and definitions that already exist in the main header.
CORE-7716

svn path=/trunk/; revision=61448
---

diff --git a/reactos/dll/win32/twain_32/dsm_ctrl.c b/reactos/dll/win32/twain_32/dsm_ctrl.c
index 76255f6a581..6a17c6a2a2b 100644
--- a/reactos/dll/win32/twain_32/dsm_ctrl.c
+++ b/reactos/dll/win32/twain_32/dsm_ctrl.c
@@ -19,21 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-
-//#include <stdlib.h>
-//#include <stdarg.h>
-//#include <stdio.h>
-
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-//#include "windef.h"
-//#include "winbase.h"
-//#include "twain.h"
 #include "twain_i.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(twain);
 
 static TW_UINT16 DSM_initialized;	/* whether Source Manager is initialized */
 static TW_UINT32 DSM_sourceId;		/* source id generator */
diff --git a/reactos/dll/win32/twain_32/twain32_main.c b/reactos/dll/win32/twain_32/twain32_main.c
index eec7fc7fc37..4044cb2dcc7 100644
--- a/reactos/dll/win32/twain_32/twain32_main.c
+++ b/reactos/dll/win32/twain_32/twain32_main.c
@@ -19,17 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "twain.h"
 #include "twain_i.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(twain);
 
 /* A helper function that looks up a destination identity in the active
    source list */
diff --git a/reactos/dll/win32/twain_32/twain_i.h b/reactos/dll/win32/twain_32/twain_i.h
index a8fa2fb94d9..b426aa323ee 100644
--- a/reactos/dll/win32/twain_32/twain_i.h
+++ b/reactos/dll/win32/twain_32/twain_i.h
@@ -20,15 +20,19 @@
 #ifndef _TWAIN32_H
 #define _TWAIN32_H
 
-#ifndef __WINE_CONFIG_H
-# error You must include config.h first
-#endif
+#include <config.h>
 
 #include <stdarg.h>
 
-#include "windef.h"
-#include "winbase.h"
-#include "twain.h"
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#include <windef.h>
+#include <winbase.h>
+#include <twain.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(twain);
 
 /* internal information about an active data source */
 typedef struct tagActiveDS