From b15766ccae4083917fc82e648b4bd90d4d1c6f8c Mon Sep 17 00:00:00 2001 From: elsabio Date: Tue, 21 Oct 2014 12:08:17 +0100 Subject: [PATCH 1/2] Use DWORD_PTR for resumeHandle Match declared type for resumeHandle parameter to fix crashes on 64-bit systems in SAMCLI.DLL. --- NetAdmin.xs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/NetAdmin.xs b/NetAdmin.xs index 763133a..e0724de 100644 --- a/NetAdmin.xs +++ b/NetAdmin.xs @@ -14,6 +14,9 @@ * * Added LocalGroupGetMembersWithDomain * 98.02.13 david.gardiner@unisa.edu.au + * + * Updated 64-bit data types in Wi32 API calls + * 14.10.21 m.hewitt@computer.org */ #define WIN32_LEAN_AND_MEAN @@ -1377,7 +1380,8 @@ XS(XS_NT__NetAdmin_GroupIsMember) dXSARGS; LPWSTR lpwServer, lpwGroup, lpwUser; PGROUP_USERS_INFO_0 pwzGroupUsers; - DWORD entriesRead, totalEntries, resumeHandle = 0; + DWORD entriesRead, totalEntries; + DWORD_PTR resumeHandle = 0; DWORD index; BOOL bReturn = FALSE; DWORD lastError = 0; @@ -1438,7 +1442,7 @@ XS(XS_NT__NetAdmin_GroupGetMembers) char buffer[UNLEN+1]; PGROUP_USERS_INFO_0 pwzGroupUsers; DWORD entriesRead, totalEntries; - DWORD resumeHandle = 0; + DWORD_PTR resumeHandle = 0; DWORD index; SV *sv; DWORD lastError = 0; @@ -1686,7 +1690,7 @@ XS(XS_NT__NetAdmin_LocalGroupIsMember) dXSARGS; LPWSTR lpwServer, lpwGroup; DWORD entriesRead, totalEntries; - DWORD resumeHandle = 0; + DWORD_PTR resumeHandle = 0; DWORD index; BOOL bReturn = FALSE; DWORD lastError = 0; @@ -1766,7 +1770,7 @@ XS(XS_NT__NetAdmin_LocalGroupGetMembers) char buffer[UNLEN+1]; PLOCALGROUP_MEMBERS_INFO_1 pwzMembersInfo; DWORD entriesRead, totalEntries; - DWORD resumeHandle = 0; + DWORD_PTR resumeHandle = 0; DWORD index; SV *sv; DWORD lastError = 0; @@ -1820,7 +1824,7 @@ XS(XS_NT__NetAdmin_LocalGroupGetMembersWithDomain) char buffer1[UNLEN+1]; PLOCALGROUP_MEMBERS_INFO_2 pwzMembersInfo; DWORD entriesRead, totalEntries; - DWORD resumeHandle = 0; + DWORD_PTR resumeHandle = 0; DWORD index; SV *sv; DWORD lastError = 0; From a3a9884dd86f5f9020e5b19d172b1dbb463e08ea Mon Sep 17 00:00:00 2001 From: elsabio Date: Tue, 21 Oct 2014 12:11:23 +0100 Subject: [PATCH 2/2] Fix comment typo --- NetAdmin.xs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NetAdmin.xs b/NetAdmin.xs index e0724de..63735d7 100644 --- a/NetAdmin.xs +++ b/NetAdmin.xs @@ -15,7 +15,7 @@ * Added LocalGroupGetMembersWithDomain * 98.02.13 david.gardiner@unisa.edu.au * - * Updated 64-bit data types in Wi32 API calls + * Updated 64-bit data types in Win32 API calls * 14.10.21 m.hewitt@computer.org */