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
731a3fea
Commit
731a3fea
authored
Feb 14, 2013
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
twain_32: Remove an unnecessary DllMain entry point.
parent
981f79db
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
29 deletions
+5
-29
dsm_ctrl.c
dlls/twain_32/dsm_ctrl.c
+5
-9
twain32_main.c
dlls/twain_32/twain32_main.c
+0
-19
twain_i.h
dlls/twain_32/twain_i.h
+0
-1
No files found.
dlls/twain_32/dsm_ctrl.c
View file @
731a3fea
...
...
@@ -207,7 +207,7 @@ TW_UINT16 TWAIN_OpenDS (pTW_IDENTITY pOrigin, TW_MEMREF pData)
TRACE
(
"DG_CONTROL/DAT_IDENTITY/MSG_OPENDS
\n
"
);
TRACE
(
"pIdentity is %s
\n
"
,
pIdentity
->
ProductName
);
if
(
DSM_currentState
!=
3
)
{
if
(
!
DSM_initialized
)
{
FIXME
(
"seq error
\n
"
);
DSM_twCC
=
TWCC_SEQERROR
;
return
TWRC_FAILURE
;
...
...
@@ -281,10 +281,9 @@ TW_UINT16 TWAIN_CloseDSM (pTW_IDENTITY pOrigin, TW_MEMREF pData)
TRACE
(
"DG_CONTROL/DAT_PARENT/MSG_CLOSEDSM
\n
"
);
if
(
DSM_
currentState
==
3
)
if
(
DSM_
initialized
)
{
DSM_initialized
=
FALSE
;
DSM_currentState
=
2
;
/* If there are data sources still open, close them now. */
while
(
currentDS
!=
NULL
)
...
...
@@ -309,12 +308,9 @@ TW_UINT16 TWAIN_OpenDSM (pTW_IDENTITY pOrigin, TW_MEMREF pData)
TW_UINT16
twRC
=
TWRC_SUCCESS
;
TRACE
(
"DG_CONTROL/DAT_PARENT/MSG_OPENDSM
\n
"
);
if
(
DSM_currentState
==
2
)
{
if
(
!
DSM_initialized
)
{
DSM_currentDevice
=
0
;
DSM_initialized
=
TRUE
;
}
DSM_currentState
=
3
;
if
(
!
DSM_initialized
)
{
DSM_currentDevice
=
0
;
DSM_initialized
=
TRUE
;
DSM_twCC
=
TWCC_SUCCESS
;
twRC
=
TWRC_SUCCESS
;
}
else
{
...
...
dlls/twain_32/twain32_main.c
View file @
731a3fea
...
...
@@ -43,25 +43,6 @@ static activeDS *TWAIN_LookupSource (const TW_IDENTITY *pDest)
return
pSource
;
}
BOOL
WINAPI
DllMain
(
HINSTANCE
hinstDLL
,
DWORD
fdwReason
,
LPVOID
lpvReserved
)
{
TRACE
(
"%p,%x,%p
\n
"
,
hinstDLL
,
fdwReason
,
lpvReserved
);
switch
(
fdwReason
)
{
case
DLL_PROCESS_ATTACH
:
DisableThreadLibraryCalls
(
hinstDLL
);
DSM_currentState
=
2
;
break
;
case
DLL_PROCESS_DETACH
:
DSM_currentState
=
1
;
break
;
}
return
TRUE
;
}
static
TW_UINT16
TWAIN_SourceManagerHandler
(
pTW_IDENTITY
pOrigin
,
TW_UINT16
DAT
,
...
...
dlls/twain_32/twain_i.h
View file @
731a3fea
...
...
@@ -39,7 +39,6 @@ typedef struct tagActiveDS
DSENTRYPROC
dsEntry
;
}
activeDS
;
TW_UINT16
DSM_currentState
DECLSPEC_HIDDEN
;
/* current state of Source Manager */
TW_UINT16
DSM_twCC
DECLSPEC_HIDDEN
;
/* current condition code of Source Manager */
activeDS
*
activeSources
DECLSPEC_HIDDEN
;
/* list of active data sources */
...
...
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