twain_32: Replace realloc() and strdup()

Andrew Talbot andrew.talbot at talbotville.com
Sat Feb 14 11:47:28 CST 2009


Changelog:
    twain_32: Replace realloc() and strdup().

diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c
index 325b49d..e0d0983 100644
--- a/dlls/twain_32/dsm_ctrl.c
+++ b/dlls/twain_32/dsm_ctrl.c
@@ -84,10 +84,11 @@ twain_add_onedriver(const char *dsname) {
 		if (i < nrdevices)
 			break;
 		if (nrdevices)
-			devices = realloc(devices, sizeof(devices[0])*(nrdevices+1));
+			devices = HeapReAlloc(GetProcessHeap(), 0, devices, sizeof(devices[0])*(nrdevices+1));
 		else
-			devices = malloc(sizeof(devices[0]));
-		devices[nrdevices].modname = strdup(dsname);
+			devices = HeapAlloc(GetProcessHeap(), 0, sizeof(devices[0]));
+		if ((devices[nrdevices].modname = HeapAlloc(GetProcessHeap(), 0, strlen(dsname) + 1)))
+			lstrcpyA(devices[nrdevices].modname, dsname);
 		devices[nrdevices].identity = sourceId;
 		nrdevices++;
 		DSM_sourceId++;



More information about the wine-patches mailing list