[ros-diffs] [akhaldi] 62923: [TWAIN_32] * Sync with Wine 1.7.17. CORE-8080

Author: akhaldi
Date: Wed Apr 23 14:58:49 2014
New Revision: 62923

URL: http://svn.reactos.org/svn/reactos?rev=62923&view=rev
Log:
[TWAIN_32]
* Sync with Wine 1.7.17.
CORE-8080

Modified:
    trunk/reactos/dll/win32/twain_32/dsm_ctrl.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/twain_32/dsm_ctrl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/dsm_ctr…
==============================================================================
--- 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] Wed Apr 23 14:58:49 2014
@@ -61,7 +61,7 @@
 		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 @@
 	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");

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Wed Apr 23 14:58:49 2014
@@ -191,7 +191,7 @@
 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