Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
f2eac52c
Commit
f2eac52c
authored
Feb 18, 2022
by
Eric Pouech
Committed by
Alexandre Julliard
Feb 18, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
twain_32: Enable compilation with long types.
Signed-off-by:
Eric Pouech
<
eric.pouech@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
56f0485d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
6 deletions
+5
-6
Makefile.in
dlls/twain_32/Makefile.in
+0
-1
dsm_ctrl.c
dlls/twain_32/dsm_ctrl.c
+1
-1
twain32_main.c
dlls/twain_32/twain32_main.c
+4
-4
No files found.
dlls/twain_32/Makefile.in
View file @
f2eac52c
EXTRADEFS
=
-DWINE_NO_LONG_TYPES
MODULE
=
twain_32.dll
IMPORTS
=
user32
...
...
dlls/twain_32/dsm_ctrl.c
View file @
f2eac52c
...
...
@@ -427,7 +427,7 @@ TW_UINT16 TWAIN_UserSelect (pTW_IDENTITY pOrigin, TW_MEMREF pData)
userselect_data
param
=
{
pOrigin
,
pData
};
HWND
parent
=
DSM_parent
;
TRACE
(
"DG_CONTROL/DAT_IDENTITY/MSG_USERSELECT SupportedGroups=0x%x ProductName=%s
\n
"
,
TRACE
(
"DG_CONTROL/DAT_IDENTITY/MSG_USERSELECT SupportedGroups=0x%
l
x ProductName=%s
\n
"
,
pOrigin
->
SupportedGroups
,
wine_dbgstr_a
(
param
.
result
->
ProductName
));
twain_autodetect
();
...
...
dlls/twain_32/twain32_main.c
View file @
f2eac52c
...
...
@@ -35,7 +35,7 @@ HINSTANCE DSM_hinstance;
BOOL
WINAPI
DllMain
(
HINSTANCE
hinstance
,
DWORD
reason
,
LPVOID
reserved
)
{
TRACE
(
"%p,%x,%p
\n
"
,
hinstance
,
reason
,
reserved
);
TRACE
(
"%p,%
l
x,%p
\n
"
,
hinstance
,
reason
,
reserved
);
switch
(
reason
)
{
...
...
@@ -158,7 +158,7 @@ DSM_Entry (pTW_IDENTITY pOrigin,
{
TW_UINT16
twRC
=
TWRC_SUCCESS
;
/* Return Code */
TRACE
(
"(DG=%d DAT=%d MSG=%d)
\n
"
,
DG
,
DAT
,
MSG
);
TRACE
(
"(DG=%
l
d DAT=%d MSG=%d)
\n
"
,
DG
,
DAT
,
MSG
);
if
(
DG
==
DG_CONTROL
&&
DAT
==
DAT_NULL
)
{
...
...
@@ -199,7 +199,7 @@ DSM_Entry (pTW_IDENTITY pOrigin,
}
DSM_twCC
=
TWCC_SUCCESS
;
TRACE
(
"Forwarding %d/%d/%d/%p to DS.
\n
"
,
DG
,
DAT
,
MSG
,
pData
);
TRACE
(
"Forwarding %
l
d/%d/%d/%p to DS.
\n
"
,
DG
,
DAT
,
MSG
,
pData
);
twRC
=
pSource
->
dsEntry
(
pOrigin
,
DG
,
DAT
,
MSG
,
pData
);
TRACE
(
"return value is %d
\n
"
,
twRC
);
return
twRC
;
...
...
@@ -210,7 +210,7 @@ DSM_Entry (pTW_IDENTITY pOrigin,
twRC
=
TWAIN_SourceManagerHandler
(
pOrigin
,
DAT
,
MSG
,
pData
);
break
;
default:
FIXME
(
"The DSM does not handle DG %d
\n
"
,
DG
);
FIXME
(
"The DSM does not handle DG %
l
d
\n
"
,
DG
);
DSM_twCC
=
TWCC_BADPROTOCOL
;
twRC
=
TWRC_FAILURE
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment