mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-31 12:19:49 +00:00
twain_32: Remove an unnecessary DllMain entry point.
This commit is contained in:
parent
981f79dbf8
commit
731a3fea91
3 changed files with 5 additions and 29 deletions
|
@ -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;
|
||||
DSM_twCC = TWCC_SUCCESS;
|
||||
twRC = TWRC_SUCCESS;
|
||||
} else {
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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 */
|
||||
|
|
Loading…
Reference in a new issue