https://git.reactos.org/?p=reactos.git;a=commitdiff;h=174271931a228fec60f9363f4f4f8b49e151426e
commit 174271931a228fec60f9363f4f4f8b49e151426e Author: Amine Khaldi <[email protected]> AuthorDate: Sun Dec 1 19:38:39 2019 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Sun Dec 1 19:38:39 2019 +0100 [TWAIN_32] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/twain_32/dsm_ctrl.c | 8 +++----- dll/win32/twain_32/precomp.h | 2 -- dll/win32/twain_32/twain32_main.c | 2 -- dll/win32/twain_32/twain_i.h | 4 ---- media/doc/README.WINE | 2 +- 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dll/win32/twain_32/dsm_ctrl.c b/dll/win32/twain_32/dsm_ctrl.c index 0b2098654f8..45f227e180b 100644 --- a/dll/win32/twain_32/dsm_ctrl.c +++ b/dll/win32/twain_32/dsm_ctrl.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdlib.h> #include <stdarg.h> #include <stdio.h> @@ -59,12 +57,12 @@ twain_add_onedriver(const char *dsname) { hmod = LoadLibraryA(dsname); if (!hmod) { - ERR("Failed to load TWAIN Source %s\n", dsname); + ERR("Failed to load TWAIN Source %s\n", debugstr_a(dsname)); return; } dsEntry = (DSENTRYPROC)GetProcAddress(hmod, "DS_Entry"); if (!dsEntry) { - ERR("Failed to find DS_Entry() in TWAIN DS %s\n", dsname); + ERR("Failed to find DS_Entry() in TWAIN DS %s\n", debugstr_a(dsname)); return; } /* Loop to do multiple detects, mostly for sane.ds and gphoto2.ds */ @@ -319,7 +317,7 @@ TW_UINT16 TWAIN_OpenDS (pTW_IDENTITY pOrigin, TW_MEMREF pData) } hmod = LoadLibraryA(devices[i].modname); if (!hmod) { - ERR("Failed to load TWAIN Source %s\n", modname); + ERR("Failed to load TWAIN Source %s\n", debugstr_a(modname)); DSM_twCC = TWCC_OPERATIONERROR; HeapFree(GetProcessHeap(), 0, newSource); return TWRC_FAILURE; diff --git a/dll/win32/twain_32/precomp.h b/dll/win32/twain_32/precomp.h index ac103c96449..724a83b24e6 100644 --- a/dll/win32/twain_32/precomp.h +++ b/dll/win32/twain_32/precomp.h @@ -2,8 +2,6 @@ #ifndef _TWAIN32_PRECOMP_H #define _TWAIN32_PRECOMP_H -#include <wine/config.h> - #define NONAMELESSUNION #define NONAMELESSSTRUCT diff --git a/dll/win32/twain_32/twain32_main.c b/dll/win32/twain_32/twain32_main.c index 016680b96eb..b1beb969580 100644 --- a/dll/win32/twain_32/twain32_main.c +++ b/dll/win32/twain_32/twain32_main.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h" diff --git a/dll/win32/twain_32/twain_i.h b/dll/win32/twain_32/twain_i.h index 4d33135344e..7939d233bb0 100644 --- a/dll/win32/twain_32/twain_i.h +++ b/dll/win32/twain_32/twain_i.h @@ -20,10 +20,6 @@ #ifndef _TWAIN32_H #define _TWAIN32_H -#ifndef __WINE_CONFIG_H -# error You must include config.h first -#endif - #include <stdarg.h> #include "windef.h" diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 4d6dd61c7b3..a0ebb653019 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -186,7 +186,7 @@ dll/win32/sxs # Synced to WineStaging-4.18 dll/win32/t2embed # Synced to WineStaging-4.18 dll/win32/tapi32 # Synced to WineStaging-4.18 dll/win32/traffic # Synced to WineStaging-3.3 -dll/win32/twain_32 # Synced to WineStaging-3.3 +dll/win32/twain_32 # Synced to WineStaging-4.18 dll/win32/updspapi # Synced to WineStaging-3.3 dll/win32/url # Synced to WineStaging-3.3 dll/win32/urlmon # Synced to WineStaging-4.0
