mirror of
https://github.com/reactos/reactos.git
synced 2024-07-02 18:54:25 +00:00
[TWAIN_32]
* Sync with Wine 1.7.17. CORE-8080 svn path=/trunk/; revision=62923
This commit is contained in:
parent
8c07ca6d42
commit
c15271be09
|
@ -61,7 +61,7 @@ twain_add_onedriver(const char *dsname) {
|
||||||
ret = dsEntry (&fakeOrigin, DG_CONTROL, DAT_IDENTITY, MSG_GET, &sourceId);
|
ret = dsEntry (&fakeOrigin, DG_CONTROL, DAT_IDENTITY, MSG_GET, &sourceId);
|
||||||
if (ret != TWRC_SUCCESS) {
|
if (ret != TWRC_SUCCESS) {
|
||||||
ERR("Source->(DG_CONTROL,DAT_IDENTITY,MSG_GET) failed!\n");
|
ERR("Source->(DG_CONTROL,DAT_IDENTITY,MSG_GET) failed!\n");
|
||||||
return;
|
break;
|
||||||
}
|
}
|
||||||
TRACE("Manufacturer: %s\n", debugstr_a(sourceId.Manufacturer));
|
TRACE("Manufacturer: %s\n", debugstr_a(sourceId.Manufacturer));
|
||||||
TRACE("ProductFamily: %s\n", debugstr_a(sourceId.ProductFamily));
|
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
|
static void
|
||||||
twain_autodetect(void) {
|
twain_autodetect(void) {
|
||||||
if (detectionrun) return;
|
if (detectionrun) return;
|
||||||
detectionrun = 1;
|
detectionrun = TRUE;
|
||||||
|
|
||||||
twain_add_onedriver("sane.ds");
|
twain_add_onedriver("sane.ds");
|
||||||
twain_add_onedriver("gphoto2.ds");
|
twain_add_onedriver("gphoto2.ds");
|
||||||
|
|
|
@ -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/sxs # Synced to Wine-1.7.1
|
||||||
reactos/dll/win32/tapi32 # Synced to Wine-1.7.17
|
reactos/dll/win32/tapi32 # Synced to Wine-1.7.17
|
||||||
reactos/dll/win32/traffic # Synced to Wine-1.7.1
|
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/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/updspapi # Synced to Wine-1.7.1
|
||||||
reactos/dll/win32/url # Synced to Wine-1.7.1
|
reactos/dll/win32/url # Synced to Wine-1.7.1
|
||||||
|
|
Loading…
Reference in a new issue