mirror of
https://github.com/reactos/reactos.git
synced 2024-06-30 09:50:07 +00:00
[TWAIN_32] Sync with Wine Staging 3.3. CORE-14434
This commit is contained in:
parent
302c4ae0ca
commit
f76ac9dc71
|
@ -6,7 +6,7 @@ spec2def(twain_32.dll twain_32.spec)
|
||||||
list(APPEND SOURCE
|
list(APPEND SOURCE
|
||||||
dsm_ctrl.c
|
dsm_ctrl.c
|
||||||
twain32_main.c
|
twain32_main.c
|
||||||
twain_i.h)
|
precomp.h)
|
||||||
|
|
||||||
add_library(twain_32 SHARED
|
add_library(twain_32 SHARED
|
||||||
${SOURCE}
|
${SOURCE}
|
||||||
|
@ -16,5 +16,5 @@ add_library(twain_32 SHARED
|
||||||
set_module_type(twain_32 win32dll)
|
set_module_type(twain_32 win32dll)
|
||||||
target_link_libraries(twain_32 wine)
|
target_link_libraries(twain_32 wine)
|
||||||
add_importlibs(twain_32 user32 msvcrt kernel32 ntdll)
|
add_importlibs(twain_32 user32 msvcrt kernel32 ntdll)
|
||||||
add_pch(twain_32 twain_i.h SOURCE)
|
add_pch(twain_32 precomp.h SOURCE)
|
||||||
add_cd_file(TARGET twain_32 DESTINATION reactos FOR all)
|
add_cd_file(TARGET twain_32 DESTINATION reactos FOR all)
|
||||||
|
|
|
@ -19,11 +19,21 @@
|
||||||
* 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 "windef.h"
|
||||||
|
#include "winbase.h"
|
||||||
|
#include "winuser.h"
|
||||||
|
#include "twain.h"
|
||||||
#include "twain_i.h"
|
#include "twain_i.h"
|
||||||
|
|
||||||
#include <winuser.h>
|
|
||||||
|
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
|
#include "wine/debug.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(twain);
|
||||||
|
|
||||||
static TW_UINT16 DSM_initialized; /* whether Source Manager is initialized */
|
static TW_UINT16 DSM_initialized; /* whether Source Manager is initialized */
|
||||||
static TW_UINT32 DSM_sourceId; /* source id generator */
|
static TW_UINT32 DSM_sourceId; /* source id generator */
|
||||||
|
|
16
dll/win32/twain_32/precomp.h
Normal file
16
dll/win32/twain_32/precomp.h
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
|
||||||
|
#ifndef _TWAIN32_PRECOMP_H
|
||||||
|
#define _TWAIN32_PRECOMP_H
|
||||||
|
|
||||||
|
#include <wine/config.h>
|
||||||
|
|
||||||
|
#define NONAMELESSUNION
|
||||||
|
#define NONAMELESSSTRUCT
|
||||||
|
|
||||||
|
#include "twain_i.h"
|
||||||
|
|
||||||
|
#include <winuser.h>
|
||||||
|
|
||||||
|
#include <wine/debug.h>
|
||||||
|
|
||||||
|
#endif /* !_TWAIN32_PRECOMP_H */
|
|
@ -19,7 +19,17 @@
|
||||||
* 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 <stdarg.h>
|
||||||
|
|
||||||
|
#include "windef.h"
|
||||||
|
#include "winbase.h"
|
||||||
|
#include "twain.h"
|
||||||
#include "twain_i.h"
|
#include "twain_i.h"
|
||||||
|
#include "wine/debug.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(twain);
|
||||||
|
|
||||||
extern HINSTANCE DSM_hinstance;
|
extern HINSTANCE DSM_hinstance;
|
||||||
|
|
||||||
|
|
|
@ -20,21 +20,16 @@
|
||||||
#ifndef _TWAIN32_H
|
#ifndef _TWAIN32_H
|
||||||
#define _TWAIN32_H
|
#define _TWAIN32_H
|
||||||
|
|
||||||
#include <wine/config.h>
|
#ifndef __WINE_CONFIG_H
|
||||||
|
# error You must include config.h first
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
#define NONAMELESSUNION
|
#include "windef.h"
|
||||||
#define NONAMELESSSTRUCT
|
#include "winbase.h"
|
||||||
|
#include "twain.h"
|
||||||
#include <windef.h>
|
#include "wine/list.h"
|
||||||
#include <winbase.h>
|
|
||||||
#include <twain.h>
|
|
||||||
|
|
||||||
#include <wine/debug.h>
|
|
||||||
#include <wine/list.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(twain);
|
|
||||||
|
|
||||||
struct pending_message
|
struct pending_message
|
||||||
{
|
{
|
||||||
|
@ -84,4 +79,4 @@ extern TW_UINT16 TWAIN_ControlNull
|
||||||
extern TW_UINT16 TWAIN_ProcessEvent
|
extern TW_UINT16 TWAIN_ProcessEvent
|
||||||
(pTW_IDENTITY pOrigin, activeDS *pSource, TW_MEMREF pData) DECLSPEC_HIDDEN;
|
(pTW_IDENTITY pOrigin, activeDS *pSource, TW_MEMREF pData) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
#endif /* _TWAIN32_H */
|
#endif
|
||||||
|
|
|
@ -185,7 +185,7 @@ reactos/dll/win32/sxs # Synced to WineStaging-3.3
|
||||||
reactos/dll/win32/t2embed # Synced to WineStaging-3.3
|
reactos/dll/win32/t2embed # Synced to WineStaging-3.3
|
||||||
reactos/dll/win32/tapi32 # Synced to WineStaging-3.3
|
reactos/dll/win32/tapi32 # Synced to WineStaging-3.3
|
||||||
reactos/dll/win32/traffic # Synced to WineStaging-3.3
|
reactos/dll/win32/traffic # Synced to WineStaging-3.3
|
||||||
reactos/dll/win32/twain_32 # Synced to Wine-3.0
|
reactos/dll/win32/twain_32 # Synced to WineStaging-3.3
|
||||||
reactos/dll/win32/updspapi # Synced to WineStaging-2.9
|
reactos/dll/win32/updspapi # Synced to WineStaging-2.9
|
||||||
reactos/dll/win32/url # Synced to WineStaging-2.9
|
reactos/dll/win32/url # Synced to WineStaging-2.9
|
||||||
reactos/dll/win32/urlmon # Synced to Wine-3.0
|
reactos/dll/win32/urlmon # Synced to Wine-3.0
|
||||||
|
|
Loading…
Reference in a new issue