Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-05 21:21:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[TWAIN_32] Sync with Wine Staging 4.18. CORE-16441

Browse source
This commit is contained in:
Amine Khaldi 2019-12-01 19:38:39 +01:00
parent 3edf37e269
commit 174271931a
5 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dll/win32/twain_32/dsm_ctrl.c
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.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) {
ERR("Failed to load TWAIN Source %s\n", dsname);
ERR("Failed to load TWAIN Source %s\n", debugstr_a(dsname));
return;
}
dsEntry = (DSENTRYPROC)GetProcAddress(hmod, "DS_Entry");
if (!dsEntry) {
ERR("Failed to find DS_Entry() in TWAIN DS %s\n", dsname);
ERR("Failed to find DS_Entry() in TWAIN DS %s\n", debugstr_a(dsname));
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) {
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;

2
dll/win32/twain_32/precomp.h
View file

@ -2,8 +2,6 @@
#ifndef _TWAIN32_PRECOMP_H
#define _TWAIN32_PRECOMP_H
#include <wine/config.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT

2
dll/win32/twain_32/twain32_main.c
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include <stdarg.h>
#include "windef.h"

4
dll/win32/twain_32/twain_i.h
View file

@ -20,10 +20,6 @@
#ifndef _TWAIN32_H
#define _TWAIN32_H
#ifndef __WINE_CONFIG_H
# error You must include config.h first
#endif
#include <stdarg.h>
#include "windef.h"

2
media/doc/README.WINE
View file

@ -186,7 +186,7 @@ dll/win32/sxs # Synced to WineStaging-4.18
dll/win32/t2embed # Synced to WineStaging-4.18
dll/win32/tapi32 # Synced to WineStaging-4.18
dll/win32/traffic # Synced to WineStaging-3.3
dll/win32/twain_32 # Synced to WineStaging-3.3
dll/win32/twain_32 # Synced to WineStaging-4.18
dll/win32/updspapi # Synced to WineStaging-3.3
dll/win32/url # Synced to WineStaging-3.3
dll/win32/urlmon # Synced to WineStaging-4.0