Merge remote-tracking branch 'origin/master'

changelog.html

@@ -63,6 +63,9 @@ Upcoming changes</a>
 <div id="rc" style="display:none;"><!--=BEGIN=-->
 <h3><a name=v1.588>What's new in 1.588</a> <!--=DATE=--></h3>
 <ul class=image>
+  <li class=bug>
+    JNA error in <code>WindowsInstallerLink.doDoInstall</code>.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-25358">issue 25358</a>)
   <li class=bug>
     Unnecessarily slow startup time with a massive number of jobs.
     (<a href="https://github.com/jenkinsci/jenkins/pull/1439">pull request 1439</a>)  

core/src/main/java/hudson/util/jna/SHELLEXECUTEINFO.java

@@ -25,6 +25,7 @@ package hudson.util.jna;
 
 import com.sun.jna.Pointer;
 import com.sun.jna.Structure;
+import com.sun.jna.Union;
 import java.util.Arrays;
 import java.util.List;
 
@@ -69,7 +70,7 @@ public class SHELLEXECUTEINFO extends Structure {
     public String lpClass;
     public Pointer hkeyClass;
     public int dwHotKey;
-    public Pointer hIcon;
+    public DUMMYUNIONNAME_union DUMMYUNIONNAME;
     public Pointer hProcess;
 
     public static final int SEE_MASK_NOCLOSEPROCESS = 0x40;
@@ -80,7 +81,29 @@ public class SHELLEXECUTEINFO extends Structure {
     protected List getFieldOrder() {
         return Arrays.asList("cbSize", "fMask", "hwnd", "lpVerb",
                 "lpFile", "lpParameters", "lpDirectory", "nShow", "hInstApp",
-                "lpIDList", "lpClass", "hkeyClass", "dwHotKey", "hIcon",
-                "hProcess", "SEE_MASK_NOCLOSEPROCESS", "SW_HIDE", "SW_SHOW");
+                "lpIDList", "lpClass", "hkeyClass", "dwHotKey", "DUMMYUNIONNAME",
+                "hProcess");
     }
+
+    public static class DUMMYUNIONNAME_union extends Union {
+        public Pointer hIcon;
+        public Pointer hMonitor;
+
+        public DUMMYUNIONNAME_union() {
+            super();
+        }
+
+        public DUMMYUNIONNAME_union(Pointer hIcon_or_hMonitor) {
+            super();
+            this.hMonitor = this.hIcon = hIcon_or_hMonitor;
+            setType(Pointer.class);
+        }
+
+        public static class ByReference extends DUMMYUNIONNAME_union implements Structure.ByReference {
+            
+        };
+        public static class ByValue extends DUMMYUNIONNAME_union implements Structure.ByValue {
+            
+        };
+    };
 }