Final cleanup for beta release.

basildane · Oct 22, 2016 · 3c123bc · 3c123bc
1 parent 31e3f89
commit 3c123bc
Show file tree

Hide file tree

Showing 20 changed files with 1,777 additions and 1,110 deletions.
diff --git a/AssemblyInfo.vb b/AssemblyInfo.vb
@@ -49,7 +49,7 @@ Imports System.Runtime.InteropServices
 ' You can specify all the values or you can default the Build and Revision Numbers 
 ' by using the '*' as shown below:
 
-<Assembly: AssemblyVersion("2.11.11.10")>
+<Assembly: AssemblyVersion("2.11.11.15")>
 
 <Assembly: ComVisibleAttribute(False)> 
 <Assembly: NeutralResourcesLanguageAttribute("en-US")> 
diff --git a/Console/WakeOnLanC/My Project/AssemblyInfo.vb b/Console/WakeOnLanC/My Project/AssemblyInfo.vb
@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.11.11.0")>
-<Assembly: AssemblyFileVersion("2.11.11.0")>
+<Assembly: AssemblyVersion("2.11.11.15")>
+<Assembly: AssemblyFileVersion("2.11.11.15")>
 
 <Assembly: NeutralResourcesLanguageAttribute("en-US")> 
diff --git a/Machines/Machines.vb b/Machines/Machines.vb
@@ -140,25 +140,19 @@ Imports System.Threading
 
                             For Each ipAddress As IPAddress In From IPA1 In Dns.GetHostAddresses(Netbios) Where IPA1.AddressFamily.ToString() = "InterNetwork"
                                 Dim remoteIp As Integer
-                                Dim remoteMac() As Byte = New Byte(6) {}
+                                Dim remoteMac() As Byte = New Byte(5) {}
                                 Dim dWord As Integer
-                                Dim sendInterface As Integer
-                                Dim len As Integer = 6
 
                                 Try
-                                    sendInterface = 0
-                                    ' sendInterface = ipAddress.Parse(Adapter).GetHashCode()
-                                    ' TODO: check all interfaces
-
                                     remoteIp = ipAddress.GetHashCode()
                                     If remoteIp <> 0 Then
-                                        dWord = SendARP(remoteIp, sendInterface, remoteMac, len)
+                                        dWord = SendARP(remoteIp, 0, remoteMac, remoteMac.Length)
                                         If dWord = 0 Or dWord = 67 Then
                                             '
                                             ' we found a matching MAC, the host is officially ONLINE
                                             ' 67 = ERROR_BAD_NET_NAME: if host on another subnet, just ignore the error
                                             '
-                                            If CompareMac(BitConverter.ToString(remoteMac, 0, len), MAC) = 0 Or dWord = 67 Then
+                                            If CompareMac(BitConverter.ToString(remoteMac, 0, remoteMac.Length), MAC) = 0 Or dWord = 67 Then
                                                 newStatus = StatusCodes.Online
                                                 newIpAddress = ipAddress.ToString()
                                                 Exit For

diff --git a/Properties.Designer.vb b/Properties.Designer.vb
diff --git a/Properties.ar-JO.resx b/Properties.ar-JO.resx
@@ -188,7 +188,7 @@
     <value>خصائص العرض</value>
   </data>
   <data name="cbKeepAlive.Location" type="System.Drawing.Point, System.Drawing">
-    <value>307, 222</value>
+    <value>308, 140</value>
   </data>
   <data name="cbKeepAlive.Size" type="System.Drawing.Size, System.Drawing">
     <value>77, 18</value>
@@ -199,27 +199,8 @@
   <data name="tHostURI.Location" type="System.Drawing.Point, System.Drawing">
     <value>97, 112</value>
   </data>
-  <data name="ComboBoxAdapters.Location" type="System.Drawing.Point, System.Drawing">
-    <value>97, 166</value>
-  </data>
-  <data name="ComboBoxAdapters.Size" type="System.Drawing.Size, System.Drawing">
-    <value>320, 22</value>
-  </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="LabelInterfaces.AutoSize" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="LabelInterfaces.Location" type="System.Drawing.Point, System.Drawing">
-    <value>96, 149</value>
-  </data>
-  <data name="LabelInterfaces.Size" type="System.Drawing.Size, System.Drawing">
-    <value>321, 14</value>
-  </data>
-  <data name="LabelInterfaces.Text" xml:space="preserve">
-    <value>واجهة</value>
-  </data>
   <data name="lbUDP.Location" type="System.Drawing.Point, System.Drawing">
-    <value>232, 223</value>
+    <value>233, 141</value>
   </data>
   <data name="lbUDP.Size" type="System.Drawing.Size, System.Drawing">
     <value>47, 14</value>
@@ -228,7 +209,7 @@
     <value>منفذ UDP</value>
   </data>
   <data name="lbTTL.Location" type="System.Drawing.Point, System.Drawing">
-    <value>233, 251</value>
+    <value>234, 169</value>
   </data>
   <data name="lbTTL.Size" type="System.Drawing.Size, System.Drawing">
     <value>30, 14</value>
@@ -294,13 +275,13 @@
     <value>TTL غير صالحة</value>
   </data>
   <data name="TTL.Location" type="System.Drawing.Point, System.Drawing">
-    <value>97, 248</value>
+    <value>98, 166</value>
   </data>
   <data name="UDPPort.ErrorMessage" xml:space="preserve">
     <value>UDP غير صالح</value>
   </data>
   <data name="UDPPort.Location" type="System.Drawing.Point, System.Drawing">
-    <value>96, 220</value>
+    <value>97, 138</value>
   </data>
   <data name="Broadcast.ErrorMessage" xml:space="preserve">
     <value>عنوان IP غير صالح. استخدام ###.###.###.###</value>
@@ -500,6 +481,7 @@
   <data name="TabControl1.Location" type="System.Drawing.Point, System.Drawing">
     <value>12, 13</value>
   </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="TabControl1.RightToLeftLayout" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>

diff --git a/Properties.es.resx b/Properties.es.resx
@@ -154,14 +154,8 @@
   <data name="tHostURI.ErrorMessage" xml:space="preserve">
     <value>Nombre del equipo no válido</value>
   </data>
-  <data name="LabelInterfaces.Size" type="System.Drawing.Size, System.Drawing">
-    <value>42, 13</value>
-  </data>
-  <data name="LabelInterfaces.Text" xml:space="preserve">
-    <value>Interfaz</value>
-  </data>
   <data name="lbUDP.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 207</value>
+    <value>16, 133</value>
   </data>
   <data name="lbUDP.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 13</value>

diff --git a/Properties.fi.resx b/Properties.fi.resx
@@ -149,7 +149,7 @@
     <value>Virheellinen tietokoneen nimi</value>
   </data>
   <data name="lbUDP.Location" type="System.Drawing.Point, System.Drawing">
-    <value>34, 207</value>
+    <value>35, 133</value>
   </data>
   <data name="lbUDP.Size" type="System.Drawing.Size, System.Drawing">
     <value>56, 13</value>
@@ -158,7 +158,7 @@
     <value>UDP-portti</value>
   </data>
   <data name="lbTTL.Location" type="System.Drawing.Point, System.Drawing">
-    <value>5, 230</value>
+    <value>5, 159</value>
   </data>
   <data name="lbTTL.Size" type="System.Drawing.Size, System.Drawing">
     <value>86, 13</value>

diff --git a/Properties.fr.resx b/Properties.fr.resx
@@ -161,14 +161,11 @@
   <data name="tHostURI.ErrorMessage" xml:space="preserve">
     <value>Nom d'ordinateur invalide</value>
   </data>
-  <data name="lbUDP.Location" type="System.Drawing.Point, System.Drawing">
-    <value>39, 207</value>
-  </data>
   <data name="lbUDP.Text" xml:space="preserve">
     <value>Port UDP</value>
   </data>
   <data name="lbTTL.Location" type="System.Drawing.Point, System.Drawing">
-    <value>63, 230</value>
+    <value>63, 159</value>
   </data>
   <data name="lbMAC.Text" xml:space="preserve">
     <value>Adresse MAC</value>
@@ -213,7 +210,7 @@
     <value>TTL invalide</value>
   </data>
   <data name="TTL.Location" type="System.Drawing.Point, System.Drawing">
-    <value>96, 230</value>
+    <value>96, 156</value>
   </data>
   <data name="UDPPort.ErrorMessage" xml:space="preserve">
     <value>UDP invalide</value>

diff --git a/Properties.nl.resx b/Properties.nl.resx
@@ -143,7 +143,7 @@
     <value>Ongeldige computernaam</value>
   </data>
   <data name="lbUDP.Location" type="System.Drawing.Point, System.Drawing">
-    <value>33, 207</value>
+    <value>34, 133</value>
   </data>
   <data name="lbUDP.Size" type="System.Drawing.Size, System.Drawing">
     <value>57, 13</value>