From c15271be09c46a2adfbc352583bbba15404e6b76 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 23 Apr 2014 14:58:49 +0000 Subject: [PATCH] [TWAIN_32] * Sync with Wine 1.7.17. CORE-8080 svn path=/trunk/; revision=62923 --- reactos/dll/win32/twain_32/dsm_ctrl.c | 6 +++--- reactos/media/doc/README.WINE | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/reactos/dll/win32/twain_32/dsm_ctrl.c b/reactos/dll/win32/twain_32/dsm_ctrl.c index 6a17c6a2a2b..aa2a4c1188b 100644 --- a/reactos/dll/win32/twain_32/dsm_ctrl.c +++ b/reactos/dll/win32/twain_32/dsm_ctrl.c @@ -61,7 +61,7 @@ twain_add_onedriver(const char *dsname) { ret = dsEntry (&fakeOrigin, DG_CONTROL, DAT_IDENTITY, MSG_GET, &sourceId); if (ret != TWRC_SUCCESS) { ERR("Source->(DG_CONTROL,DAT_IDENTITY,MSG_GET) failed!\n"); - return; + break; } TRACE("Manufacturer: %s\n", debugstr_a(sourceId.Manufacturer)); TRACE("ProductFamily: %s\n", debugstr_a(sourceId.ProductFamily)); @@ -86,12 +86,12 @@ twain_add_onedriver(const char *dsname) { FreeLibrary (hmod); } -static int detectionrun = 0; +static BOOL detectionrun = FALSE; static void twain_autodetect(void) { if (detectionrun) return; - detectionrun = 1; + detectionrun = TRUE; twain_add_onedriver("sane.ds"); twain_add_onedriver("gphoto2.ds"); diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index b6712c881bc..e1fb3bfc3c3 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -191,7 +191,7 @@ reactos/dll/win32/sti # Synced to Wine-1.7.1 reactos/dll/win32/sxs # Synced to Wine-1.7.1 reactos/dll/win32/tapi32 # Synced to Wine-1.7.17 reactos/dll/win32/traffic # Synced to Wine-1.7.1 -reactos/dll/win32/twain_32 # Synced to Wine-1.7.1 +reactos/dll/win32/twain_32 # Synced to Wine-1.7.17 reactos/dll/win32/unicows # Synced to Wine-1.3.32 (Win9x only, why do we need this?!) reactos/dll/win32/updspapi # Synced to Wine-1.7.1 reactos/dll/win32/url # Synced to Wine-1.7.1