Commit 39f138a2 authored by Andrew Talbot's avatar Andrew Talbot Committed by Alexandre Julliard

twain_32: Assign to structs instead of using memcpy.

parent c5b499d3
...@@ -88,7 +88,7 @@ twain_add_onedriver(const char *dsname) { ...@@ -88,7 +88,7 @@ twain_add_onedriver(const char *dsname) {
else else
devices = malloc(sizeof(devices[0])); devices = malloc(sizeof(devices[0]));
devices[nrdevices].modname = strdup(dsname); devices[nrdevices].modname = strdup(dsname);
memcpy (&devices[nrdevices].identity, &sourceId, sizeof(sourceId)); devices[nrdevices].identity = sourceId;
nrdevices++; nrdevices++;
DSM_sourceId++; DSM_sourceId++;
} while (1); } while (1);
...@@ -155,7 +155,7 @@ TW_UINT16 TWAIN_IdentityGetDefault (pTW_IDENTITY pOrigin, TW_MEMREF pData) ...@@ -155,7 +155,7 @@ TW_UINT16 TWAIN_IdentityGetDefault (pTW_IDENTITY pOrigin, TW_MEMREF pData)
twain_autodetect(); twain_autodetect();
if (!nrdevices) if (!nrdevices)
return TWRC_FAILURE; return TWRC_FAILURE;
memcpy (pSourceIdentity, &devices[0].identity, sizeof(TW_IDENTITY)); *pSourceIdentity = devices[0].identity;
return TWRC_SUCCESS; return TWRC_SUCCESS;
} }
...@@ -172,7 +172,7 @@ TW_UINT16 TWAIN_IdentityGetFirst (pTW_IDENTITY pOrigin, TW_MEMREF pData) ...@@ -172,7 +172,7 @@ TW_UINT16 TWAIN_IdentityGetFirst (pTW_IDENTITY pOrigin, TW_MEMREF pData)
return TWRC_ENDOFLIST; return TWRC_ENDOFLIST;
} }
DSM_currentDevice = 0; DSM_currentDevice = 0;
memcpy (pSourceIdentity, &devices[DSM_currentDevice++].identity, sizeof(TW_IDENTITY)); *pSourceIdentity = devices[DSM_currentDevice++].identity;
return TWRC_SUCCESS; return TWRC_SUCCESS;
} }
...@@ -186,7 +186,7 @@ TW_UINT16 TWAIN_IdentityGetNext (pTW_IDENTITY pOrigin, TW_MEMREF pData) ...@@ -186,7 +186,7 @@ TW_UINT16 TWAIN_IdentityGetNext (pTW_IDENTITY pOrigin, TW_MEMREF pData)
DSM_twCC = TWCC_SUCCESS; DSM_twCC = TWCC_SUCCESS;
return TWRC_ENDOFLIST; return TWRC_ENDOFLIST;
} }
memcpy (pSourceIdentity, &devices[DSM_currentDevice++].identity, sizeof(TW_IDENTITY)); *pSourceIdentity = devices[DSM_currentDevice++].identity;
return TWRC_SUCCESS; return TWRC_SUCCESS;
} }
...@@ -263,7 +263,7 @@ TW_UINT16 TWAIN_UserSelect (pTW_IDENTITY pOrigin, TW_MEMREF pData) ...@@ -263,7 +263,7 @@ TW_UINT16 TWAIN_UserSelect (pTW_IDENTITY pOrigin, TW_MEMREF pData)
DSM_twCC = TWCC_OPERATIONERROR; DSM_twCC = TWCC_OPERATIONERROR;
return TWRC_FAILURE; return TWRC_FAILURE;
} }
memcpy (selected, &devices[0].identity, sizeof(TW_IDENTITY)); *selected = devices[0].identity;
DSM_twCC = TWCC_SUCCESS; DSM_twCC = TWCC_SUCCESS;
return TWRC_SUCCESS; return TWRC_SUCCESS;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment