From ed30599f453507dc8f0a9b92dd4ea2b177fd77b6 Mon Sep 17 00:00:00 2001 From: Steven Edwards Date: Fri, 22 Aug 2003 23:36:27 +0000 Subject: [PATCH] Merge with Winehq to support w32api and MS_VC headers. Add linking to winedbgc.dll svn path=/trunk/; revision=5778 --- reactos/lib/twain/Makefile | 4 ++-- reactos/lib/twain/capability.c | 12 ++++++++++-- reactos/lib/twain/ds_audio.c | 4 +++- reactos/lib/twain/ds_ctrl.c | 6 +++++- reactos/lib/twain/ds_image.c | 12 +++++++++++- reactos/lib/twain/dsm_ctrl.c | 15 +++++++++++---- reactos/lib/twain/twain.h | 9 +++++++-- reactos/lib/twain/twain32_main.c | 8 ++++++-- reactos/lib/twain/twain_i.h | 2 +- 9 files changed, 56 insertions(+), 16 deletions(-) diff --git a/reactos/lib/twain/Makefile b/reactos/lib/twain/Makefile index d5458cfaaab..b80b95e0e5f 100644 --- a/reactos/lib/twain/Makefile +++ b/reactos/lib/twain/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 2003/08/07 04:03:23 royce Exp $ +# $Id: Makefile,v 1.3 2003/08/22 23:36:27 sedwards Exp $ PATH_TO_TOP = ../.. @@ -11,7 +11,7 @@ TARGET_CFLAGS += -D_DISABLE_TIDENTS TARGET_BASE=0x76380000 -TARGET_SDKLIBS = ntdll.a +TARGET_SDKLIBS = ntdll.a winedbgc.a TARGET_OBJECTS = \ capability.o \ diff --git a/reactos/lib/twain/capability.c b/reactos/lib/twain/capability.c index 2ad56841e44..fb0fdfa29f2 100644 --- a/reactos/lib/twain/capability.c +++ b/reactos/lib/twain/capability.c @@ -16,10 +16,18 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "windows.h" +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include + +#include "windef.h" +#include "winbase.h" #include "twain.h" #include "twain_i.h" -#include "wine/port.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(twain); TW_UINT16 TWAIN_SaneCapability (activeDS *pSource, pTW_CAPABILITY pCapability, TW_UINT16 action) diff --git a/reactos/lib/twain/ds_audio.c b/reactos/lib/twain/ds_audio.c index a155fd36bba..a9c966a7670 100644 --- a/reactos/lib/twain/ds_audio.c +++ b/reactos/lib/twain/ds_audio.c @@ -18,7 +18,9 @@ #include "twain.h" #include "twain_i.h" -#include "wine/port.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(twain); /* DG_AUDIO/DAT_AUDIOFILEXFER/MSG_GET */ TW_UINT16 TWAIN_AudioFileXferGet (pTW_IDENTITY pOrigin, pTW_IDENTITY pDest, diff --git a/reactos/lib/twain/ds_ctrl.c b/reactos/lib/twain/ds_ctrl.c index bd92282dccf..54d11358d71 100644 --- a/reactos/lib/twain/ds_ctrl.c +++ b/reactos/lib/twain/ds_ctrl.c @@ -16,13 +16,17 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//#include "config.h" + #ifdef HAVE_UNISTD_H # include #endif #include #include "twain.h" #include "twain_i.h" -#include "wine/port.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(twain); /* DG_CONTROL/DAT_CAPABILITY/MSG_GET */ TW_UINT16 TWAIN_CapabilityGet (pTW_IDENTITY pOrigin, pTW_IDENTITY pDest, diff --git a/reactos/lib/twain/ds_image.c b/reactos/lib/twain/ds_image.c index 5ab32b59e88..0193bcd769b 100644 --- a/reactos/lib/twain/ds_image.c +++ b/reactos/lib/twain/ds_image.c @@ -16,9 +16,19 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "windows.h" +//#include "config.h" + +#include + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" #include "twain.h" #include "twain_i.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(twain); /* DG_IMAGE/DAT_CIECOLOR/MSG_GET */ TW_UINT16 TWAIN_CIEColorGet (pTW_IDENTITY pOrigin, pTW_IDENTITY pDest, diff --git a/reactos/lib/twain/dsm_ctrl.c b/reactos/lib/twain/dsm_ctrl.c index 7241101dafe..9ba5140cf6e 100644 --- a/reactos/lib/twain/dsm_ctrl.c +++ b/reactos/lib/twain/dsm_ctrl.c @@ -18,13 +18,20 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include +//#include "config.h" -//#define NONAMELESSUNION -//#define NONAMELESSSTRUCT -#include "windows.h" +#include +#include + +#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); /* DG_CONTROL/DAT_IDENTITY/MSG_CLOSEDS */ TW_UINT16 TWAIN_CloseDS (pTW_IDENTITY pOrigin, TW_MEMREF pData) diff --git a/reactos/lib/twain/twain.h b/reactos/lib/twain/twain.h index df3a558f7b2..0f2e2196d96 100644 --- a/reactos/lib/twain/twain.h +++ b/reactos/lib/twain/twain.h @@ -52,8 +52,13 @@ #ifndef TWAIN #define TWAIN -#include "windows.h" -#include "wine/port.h" +#include "windef.h" + +#define FAR +#define huge +//#define WIN32 +//#define _WIN32 +//#define __declspec(spec) /**************************************************************************** * TWAIN Version * diff --git a/reactos/lib/twain/twain32_main.c b/reactos/lib/twain/twain32_main.c index 959dc8ce96a..e4cf857866a 100644 --- a/reactos/lib/twain/twain32_main.c +++ b/reactos/lib/twain/twain32_main.c @@ -18,11 +18,15 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "windows.h" +#include + +#include "windef.h" +#include "winbase.h" #include "twain.h" #include "twain_i.h" +#include "wine/debug.h" -//WINE_DEFAULT_DEBUG_CHANNEL(twain); +WINE_DEFAULT_DEBUG_CHANNEL(twain); BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/reactos/lib/twain/twain_i.h b/reactos/lib/twain/twain_i.h index e089c6dd33b..4a2d0c06a93 100644 --- a/reactos/lib/twain/twain_i.h +++ b/reactos/lib/twain/twain_i.h @@ -23,7 +23,7 @@ # include #endif #include "twain.h" -#include "windows.h" +#include "windef.h" /* internel information about an active data source */ typedef struct tagActiveDS