[TWAIN_32]
authorAmine Khaldi <amine.khaldi@reactos.org>
Wed, 23 Apr 2014 14:58:49 +0000 (14:58 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Wed, 23 Apr 2014 14:58:49 +0000 (14:58 +0000)
* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=62923

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

index 6a17c6a..aa2a4c1 100644 (file)
@@ -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");
                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));
                }
                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);
 }
 
        FreeLibrary (hmod);
 }
 
-static int detectionrun = 0;
+static BOOL detectionrun = FALSE;
 
 static void
 twain_autodetect(void) {
        if (detectionrun) return;
 
 static void
 twain_autodetect(void) {
        if (detectionrun) return;
-       detectionrun = 1;
+        detectionrun = TRUE;
 
        twain_add_onedriver("sane.ds");
        twain_add_onedriver("gphoto2.ds");
 
        twain_add_onedriver("sane.ds");
        twain_add_onedriver("gphoto2.ds");
index b6712c8..e1fb3bf 100644 (file)
@@ -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/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
 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