Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-01 02:10:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[TWAIN_32]

Browse source 
* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=62923
This commit is contained in:
Amine Khaldi 2014-04-23 14:58:49 +00:00
parent 8c07ca6d42
commit c15271be09
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/dll/win32/twain_32/dsm_ctrl.c
View 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");
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");

2
reactos/media/doc/README.WINE
View 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/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