noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-introducing JNA, used only on Windows and only to access Windows Registry. Should fix #3360

This commit is contained in:
Federico Fissore 2015-06-23 12:46:58 +02:00
parent 7d8d07889f
commit 98eb1a9ee2
5 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
arduino-core/lib/jna-4.1.0.jar Normal file
View File

Binary file not shown.

BIN
arduino-core/lib/jna-platform-4.1.0.jar Normal file
View File

Binary file not shown.

16
arduino-core/src/processing/app/windows/Platform.java
View File

@ -22,6 +22,8 @@
package processing.app.windows;
import com.sun.jna.platform.win32.Advapi32Util;
import com.sun.jna.platform.win32.WinReg;
import org.apache.commons.exec.CommandLine;
import org.apache.commons.exec.DefaultExecutor;
import org.apache.commons.exec.Executor;
@ -52,25 +54,15 @@ public class Platform extends processing.app.Platform {
}
private void recoverSettingsFolderPath() throws IOException {
String path = getFolderPathFromRegistry("AppData");
String path = Advapi32Util.registryGetStringValue(WinReg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", "AppData");
this.settingsFolder = new File(path, "Arduino15");
}
private void recoverDefaultSketchbookFolder() throws IOException {
String path = getFolderPathFromRegistry("Personal");
String path = Advapi32Util.registryGetStringValue(WinReg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", "Personal");
this.defaultSketchbookFolder = new File(path, "Arduino");
}
private String getFolderPathFromRegistry(String folderType) throws IOException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
Executor executor = new DefaultExecutor();
executor.setStreamHandler(new PumpStreamHandler(baos, null));
CommandLine toDevicePath = CommandLine.parse("reg query \"HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\" /v \"" + folderType + "\"");
executor.execute(toDevicePath);
return new RegQueryParser(new String(baos.toByteArray())).getValueOfKey();
}
/**
* Remove extra quotes, slashes, and garbage from the Windows PATH.
*/

2
build/windows/launcher/config.xml
View File

@ -28,6 +28,8 @@
<cp>lib/jackson-module-mrbean-2.2.3.jar</cp>
<cp>lib/java-semver-0.8.0.jar</cp>
<cp>lib/jmdns-3.4.1.jar</cp>
<cp>lib/jna-4.1.0.jar</cp>
<cp>lib/jna-platform-4.1.0.jar</cp>
<cp>lib/jsch-0.1.50.jar</cp>
<cp>lib/jssc-2.8.0.jar</cp>
<cp>lib/pde.jar</cp>

2
build/windows/launcher/config_debug.xml
View File

@ -28,6 +28,8 @@
<cp>lib/jackson-module-mrbean-2.2.3.jar</cp>
<cp>lib/java-semver-0.8.0.jar</cp>
<cp>lib/jmdns-3.4.1.jar</cp>
<cp>lib/jna-4.1.0.jar</cp>
<cp>lib/jna-platform-4.1.0.jar</cp>
<cp>lib/jsch-0.1.50.jar</cp>
<cp>lib/jssc-2.8.0.jar</cp>
<cp>lib/pde.jar</cp>