[ros-diffs] [akhaldi] 61448: [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 i...

Author: akhaldi
Date: Fri Dec 27 14:08:56 2013
New Revision: 61448

URL: http://svn.reactos.org/svn/reactos?rev=61448&view=rev
Log:
[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

Modified:
    trunk/reactos/dll/win32/twain_32/dsm_ctrl.c
    trunk/reactos/dll/win32/twain_32/twain32_main.c
    trunk/reactos/dll/win32/twain_32/twain_i.h

Modified: trunk/reactos/dll/win32/twain_32/dsm_ctrl.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/dsm_ctrl...
==============================================================================
--- trunk/reactos/dll/win32/twain_32/dsm_ctrl.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/twain_32/dsm_ctrl.c	[iso-8859-1] Fri Dec 27 14:08:56 2013
@@ -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 */

Modified: trunk/reactos/dll/win32/twain_32/twain32_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/twain32_...
==============================================================================
--- trunk/reactos/dll/win32/twain_32/twain32_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/twain_32/twain32_main.c	[iso-8859-1] Fri Dec 27 14:08:56 2013
@@ -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 */

Modified: trunk/reactos/dll/win32/twain_32/twain_i.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/twain_i....
==============================================================================
--- trunk/reactos/dll/win32/twain_32/twain_i.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/twain_32/twain_i.h	[iso-8859-1] Fri Dec 27 14:08:56 2013
@@ -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