Changeset 1831 for trunk/eraser6

Timestamp:

2/12/2010 7:26:04 AM (3 years ago)

Author:

lowjoel

Message:

Forward port from Eraser 6.0: Wrong parameter order for Marshal.Copy, resulting in the manager buffer being copied to the unmanaged buffer.

Location:

trunk/eraser6

Files:

• . (modified) (1 prop)
• Eraser.Util/NetApi.cs (modified) (3 diffs)
• Eraser.msbuild (modified) (1 prop)
• Eraser/BlackBoxMainForm.it.resx (modified) (1 prop)
• Eraser/BlackBoxUploadForm.it.resx (modified) (1 prop)

trunk/eraser6/Eraser.Util/NetApi.cs

@@ -54 +54 @@
             uint level, uint options)
         {
-            IntPtr netAPIStats = IntPtr.Zero;
+            IntPtr netApiStats = IntPtr.Zero;
             string serviceName = "Lanman" + service.ToString();
-            if (NativeMethods.NetStatisticsGet(server, serviceName, level, options, out netAPIStats) == 0)
+            if (NativeMethods.NetStatisticsGet(server, serviceName, level, options, out netApiStats) == 0)
             {
                 try
@@ -62 +62 @@
                     //Get the size of the buffer
                     uint size = 0;
-                    NativeMethods.NetApiBufferSize(netAPIStats, out size);
+                    NativeMethods.NetApiBufferSize(netApiStats, out size);
                     byte[] result = new byte[size];
 
                     //Copy the buffer
-                    Marshal.Copy(result, 0, netAPIStats, result.Length);
+                    Marshal.Copy(netApiStats, result, 0, result.Length);
 
                     //Return the result
@@ -74 +74 @@
                 {
                     //Free the statistics buffer
-                    NativeMethods.NetApiBufferFree(netAPIStats);
+                    NativeMethods.NetApiBufferFree(netApiStats);
                 }
             }