Load libwin32-0.13 into trunk.

jandubois · jandubois · commit fe4fe639ca1a · 2008-02-05T02:40:50.000Z
diff --git a/Changes b/Changes
@@ -1,5 +1,8 @@
 Revision history for Perl extension Win32::NetAdmin.
 
+0.06  Mon Sep  7 19:47:20 1998
+	- fixed GPF in LocalGroupIsMember()
+
 0.05  Sun May 10 22:39:01 1998
 	- removed broken #ifdefs that disabled UserChangePassword() and
 	  other functions
diff --git a/NetAdmin.pm b/NetAdmin.pm
@@ -5,7 +5,7 @@ package Win32::NetAdmin;
 #Written by Douglas_Lankshear@ActiveWare.com
 #
 
-$VERSION = '0.05';
+$VERSION = '0.06';
 
 require Exporter;
 require DynaLoader;
diff --git a/NetAdmin.xs b/NetAdmin.xs
@@ -1603,6 +1603,8 @@ XS(XS_NT__NetAdmin_LocalGroupIsMember)
 	    NetApiBufferFree(pwzMembersInfo);
 	} while(bReturn == FALSE &&
 		(lastError == ERROR_MORE_DATA ||  resumeHandle != 0));
+	FreeWideName(lpwServer);
+	FreeWideName(lpwGroup);
 #else
 	AllocWideName((char*)SvPV(ST(0),na), lpwServer);
 	AllocWideName((char*)SvPV(ST(1),na), lpwGroup);
@@ -1626,10 +1628,10 @@ XS(XS_NT__NetAdmin_LocalGroupIsMember)
 		NetApiBufferFree(pwzGroupUsers);
 	    }
 	}
-#endif
 	FreeWideName(lpwServer);
 	FreeWideName(lpwGroup);
 	FreeWideName(lpwUser);
+#endif
     }
     RETURNRESULT(bReturn);
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ package Win32::NetAdmin;`
`5`	`5`	`#Written by Douglas_Lankshear@ActiveWare.com`
`6`	`6`	`#`
`7`	`7`
`8`		`-$VERSION = '0.05';`
	`8`	`+$VERSION = '0.06';`
`9`	`9`
`10`	`10`	`require Exporter;`
`11`	`11`	`require DynaLoader;`
Original file line number	Diff line number	Diff line change
`@@ -1603,6 +1603,8 @@ XS(XS_NT__NetAdmin_LocalGroupIsMember)`
`1603`	`1603`	`NetApiBufferFree(pwzMembersInfo);`
`1604`	`1604`	`} while(bReturn == FALSE &&`
`1605`	`1605`	`(lastError == ERROR_MORE_DATA \|\| resumeHandle != 0));`
	`1606`	`+ FreeWideName(lpwServer);`
	`1607`	`+ FreeWideName(lpwGroup);`
`1606`	`1608`	`#else`
`1607`	`1609`	`AllocWideName((char*)SvPV(ST(0),na), lpwServer);`
`1608`	`1610`	`AllocWideName((char*)SvPV(ST(1),na), lpwGroup);`
`@@ -1626,10 +1628,10 @@ XS(XS_NT__NetAdmin_LocalGroupIsMember)`
`1626`	`1628`	`NetApiBufferFree(pwzGroupUsers);`
`1627`	`1629`	`}`
`1628`	`1630`	`}`
`1629`		`-#endif`
`1630`	`1631`	`FreeWideName(lpwServer);`
`1631`	`1632`	`FreeWideName(lpwGroup);`
`1632`	`1633`	`FreeWideName(lpwUser);`
	`1634`	`+#endif`
`1633`	`1635`	`}`
`1634`	`1636`	`RETURNRESULT(bReturn);`
`1635`	`1637`	`}`