system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 18:04:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

twain_32: Assign to structs instead of using memcpy.

Browse source
This commit is contained in:
Andrew Talbot 2008-03-18 21:42:17 +00:00 committed by Alexandre Julliard
parent c5b499d37a
commit 39f138a298
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dlls/twain_32/dsm_ctrl.c
View file

@ -88,7 +88,7 @@ twain_add_onedriver(const char *dsname) {
else
devices = malloc(sizeof(devices[0]));
devices[nrdevices].modname = strdup(dsname);
memcpy (&devices[nrdevices].identity, &sourceId, sizeof(sourceId));
devices[nrdevices].identity = sourceId;
nrdevices++;
DSM_sourceId++;
} while (1);
@ -155,7 +155,7 @@ TW_UINT16 TWAIN_IdentityGetDefault (pTW_IDENTITY pOrigin, TW_MEMREF pData)
twain_autodetect();
if (!nrdevices)
return TWRC_FAILURE;
memcpy (pSourceIdentity, &devices[0].identity, sizeof(TW_IDENTITY));
*pSourceIdentity = devices[0].identity;
return TWRC_SUCCESS;
}
@ -172,7 +172,7 @@ TW_UINT16 TWAIN_IdentityGetFirst (pTW_IDENTITY pOrigin, TW_MEMREF pData)
return TWRC_ENDOFLIST;
}
DSM_currentDevice = 0;
memcpy (pSourceIdentity, &devices[DSM_currentDevice++].identity, sizeof(TW_IDENTITY));
*pSourceIdentity = devices[DSM_currentDevice++].identity;
return TWRC_SUCCESS;
}
@ -186,7 +186,7 @@ TW_UINT16 TWAIN_IdentityGetNext (pTW_IDENTITY pOrigin, TW_MEMREF pData)
DSM_twCC = TWCC_SUCCESS;
return TWRC_ENDOFLIST;
}
memcpy (pSourceIdentity, &devices[DSM_currentDevice++].identity, sizeof(TW_IDENTITY));
*pSourceIdentity = devices[DSM_currentDevice++].identity;
return TWRC_SUCCESS;
}
@ -263,7 +263,7 @@ TW_UINT16 TWAIN_UserSelect (pTW_IDENTITY pOrigin, TW_MEMREF pData)
DSM_twCC = TWCC_OPERATIONERROR;
return TWRC_FAILURE;
}
memcpy (selected, &devices[0].identity, sizeof(TW_IDENTITY));
*selected = devices[0].identity;
DSM_twCC = TWCC_SUCCESS;
return TWRC_SUCCESS;
}