projects
/
reactos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[TWAIN_32] Sync with Wine Staging 4.18. CORE-16441
[reactos.git]
/
dll
/
win32
/
twain_32
/
dsm_ctrl.c
diff --git
a/dll/win32/twain_32/dsm_ctrl.c
b/dll/win32/twain_32/dsm_ctrl.c
index
0b20986
..
45f227e
100644
(file)
--- a/
dll/win32/twain_32/dsm_ctrl.c
+++ b/
dll/win32/twain_32/dsm_ctrl.c
@@
-19,8
+19,6
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-
#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
@@
-59,12
+57,12
@@
twain_add_onedriver(const char *dsname) {
hmod = LoadLibraryA(dsname);
if (!hmod) {
hmod = LoadLibraryA(dsname);
if (!hmod) {
- ERR("Failed to load TWAIN Source %s\n", d
sname
);
+ ERR("Failed to load TWAIN Source %s\n", d
ebugstr_a(dsname)
);
return;
}
dsEntry = (DSENTRYPROC)GetProcAddress(hmod, "DS_Entry");
if (!dsEntry) {
return;
}
dsEntry = (DSENTRYPROC)GetProcAddress(hmod, "DS_Entry");
if (!dsEntry) {
- ERR("Failed to find DS_Entry() in TWAIN DS %s\n", d
sname
);
+ ERR("Failed to find DS_Entry() in TWAIN DS %s\n", d
ebugstr_a(dsname)
);
return;
}
/* Loop to do multiple detects, mostly for sane.ds and gphoto2.ds */
return;
}
/* Loop to do multiple detects, mostly for sane.ds and gphoto2.ds */
@@
-319,7
+317,7
@@
TW_UINT16 TWAIN_OpenDS (pTW_IDENTITY pOrigin, TW_MEMREF pData)
}
hmod = LoadLibraryA(devices[i].modname);
if (!hmod) {
}
hmod = LoadLibraryA(devices[i].modname);
if (!hmod) {
- ERR("Failed to load TWAIN Source %s\n",
modname
);
+ ERR("Failed to load TWAIN Source %s\n",
debugstr_a(modname)
);
DSM_twCC = TWCC_OPERATIONERROR;
HeapFree(GetProcessHeap(), 0, newSource);
return TWRC_FAILURE;
DSM_twCC = TWCC_OPERATIONERROR;
HeapFree(GetProcessHeap(), 0, newSource);
return TWRC_FAILURE;