Skip to content

Commit b15766c

Browse files
committed
Use DWORD_PTR for resumeHandle
Match declared type for resumeHandle parameter to fix crashes on 64-bit systems in SAMCLI.DLL.
1 parent a654040 commit b15766c

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

NetAdmin.xs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
*
1515
* Added LocalGroupGetMembersWithDomain
1616
* 98.02.13 david.gardiner@unisa.edu.au
17+
*
18+
* Updated 64-bit data types in Wi32 API calls
19+
* 14.10.21 m.hewitt@computer.org
1720
*/
1821

1922
#define WIN32_LEAN_AND_MEAN
@@ -1377,7 +1380,8 @@ XS(XS_NT__NetAdmin_GroupIsMember)
13771380
dXSARGS;
13781381
LPWSTR lpwServer, lpwGroup, lpwUser;
13791382
PGROUP_USERS_INFO_0 pwzGroupUsers;
1380-
DWORD entriesRead, totalEntries, resumeHandle = 0;
1383+
DWORD entriesRead, totalEntries;
1384+
DWORD_PTR resumeHandle = 0;
13811385
DWORD index;
13821386
BOOL bReturn = FALSE;
13831387
DWORD lastError = 0;
@@ -1438,7 +1442,7 @@ XS(XS_NT__NetAdmin_GroupGetMembers)
14381442
char buffer[UNLEN+1];
14391443
PGROUP_USERS_INFO_0 pwzGroupUsers;
14401444
DWORD entriesRead, totalEntries;
1441-
DWORD resumeHandle = 0;
1445+
DWORD_PTR resumeHandle = 0;
14421446
DWORD index;
14431447
SV *sv;
14441448
DWORD lastError = 0;
@@ -1686,7 +1690,7 @@ XS(XS_NT__NetAdmin_LocalGroupIsMember)
16861690
dXSARGS;
16871691
LPWSTR lpwServer, lpwGroup;
16881692
DWORD entriesRead, totalEntries;
1689-
DWORD resumeHandle = 0;
1693+
DWORD_PTR resumeHandle = 0;
16901694
DWORD index;
16911695
BOOL bReturn = FALSE;
16921696
DWORD lastError = 0;
@@ -1766,7 +1770,7 @@ XS(XS_NT__NetAdmin_LocalGroupGetMembers)
17661770
char buffer[UNLEN+1];
17671771
PLOCALGROUP_MEMBERS_INFO_1 pwzMembersInfo;
17681772
DWORD entriesRead, totalEntries;
1769-
DWORD resumeHandle = 0;
1773+
DWORD_PTR resumeHandle = 0;
17701774
DWORD index;
17711775
SV *sv;
17721776
DWORD lastError = 0;
@@ -1820,7 +1824,7 @@ XS(XS_NT__NetAdmin_LocalGroupGetMembersWithDomain)
18201824
char buffer1[UNLEN+1];
18211825
PLOCALGROUP_MEMBERS_INFO_2 pwzMembersInfo;
18221826
DWORD entriesRead, totalEntries;
1823-
DWORD resumeHandle = 0;
1827+
DWORD_PTR resumeHandle = 0;
18241828
DWORD index;
18251829
SV *sv;
18261830
DWORD lastError = 0;

0 commit comments

Comments
 (0)