Merge remote-tracking branch 'cmaglie/fix-win-paths'

Author: cmaglie

app/lib/jna-4.1.0.jar

@@ -29,7 +29,7 @@
 	<classpathentry kind="lib" path="lib/jackson-databind-2.6.3.jar"/>
 	<classpathentry kind="lib" path="lib/jackson-module-mrbean-2.6.3.jar"/>
 	<classpathentry kind="lib" path="lib/java-semver-0.8.0.jar"/>
-	<classpathentry kind="lib" path="lib/jna-4.1.0.jar"/>
-	<classpathentry kind="lib" path="lib/jna-platform-4.1.0.jar"/>
+	<classpathentry kind="lib" path="lib/jna-4.2.2.jar"/>
+	<classpathentry kind="lib" path="lib/jna-platform-4.2.2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

app/lib/jna-platform-4.1.0.jar

@@ -191,27 +191,28 @@ private PreferencesMap loadPreferences(TargetBoard board, TargetPlatform platfor
     return prefs;
   }
 
+  private void addPathFlagIfPathExists(List<String> cmd, String flag, File folder) {
+    if (folder.exists()) {
+      cmd.add(flag);
+      cmd.add(folder.getAbsolutePath());
+    }
+  }
+
   private void callArduinoBuilder(TargetBoard board, TargetPlatform platform, TargetPackage aPackage, String vidpid, BuilderAction action, OutputStream outStream, OutputStream errStream) throws RunnerException {
     List<String> cmd = new ArrayList<>();
     cmd.add(BaseNoGui.getContentFile("arduino-builder").getAbsolutePath());
     cmd.add(action.value);
     cmd.add("-logger=machine");
 
-    Stream.of(BaseNoGui.getHardwarePath(), new File(BaseNoGui.getSettingsFolder(), "packages").getAbsolutePath(), BaseNoGui.getSketchbookHardwareFolder().getAbsolutePath())
-      .forEach(p -> {
-        if (Files.exists(Paths.get(p))) {
-          cmd.add("-hardware");
-          cmd.add(p);
-        }
-      });
+    File installedPackagesFolder = new File(BaseNoGui.getSettingsFolder(), "packages");
 
-    Stream.of(BaseNoGui.getContentFile("tools-builder").getAbsolutePath(), Paths.get(BaseNoGui.getHardwarePath(), "tools", "avr").toAbsolutePath().toString(), new File(BaseNoGui.getSettingsFolder(), "packages").getAbsolutePath())
-      .forEach(p -> {
-        if (Files.exists(Paths.get(p))) {
-          cmd.add("-tools");
-          cmd.add(p);
-        }
-      });
+    addPathFlagIfPathExists(cmd, "-hardware", BaseNoGui.getHardwareFolder());
+    addPathFlagIfPathExists(cmd, "-hardware", installedPackagesFolder);
+    addPathFlagIfPathExists(cmd, "-hardware", BaseNoGui.getSketchbookHardwareFolder());
+
+    addPathFlagIfPathExists(cmd, "-tools", BaseNoGui.getContentFile("tools-builder"));
+    addPathFlagIfPathExists(cmd, "-tools", Paths.get(BaseNoGui.getHardwarePath(), "tools", "avr").toFile());
+    addPathFlagIfPathExists(cmd, "-tools", installedPackagesFolder);
 
     cmd.add("-built-in-libraries");
     cmd.add(BaseNoGui.getContentFile("libraries").getAbsolutePath());

app/test/processing/app/windows/RegQueryParserTest.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of Arduino.
  *
- * Copyright 2015 Arduino LLC (http://www.arduino.cc/)
+ * Copyright 2016 Arduino LLC (http://www.arduino.cc/)
  *
  * Arduino is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,26 +29,38 @@
 
 package cc.arduino.os.windows;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
+import static com.sun.jna.platform.win32.KnownFolders.FOLDERID_Documents;
+import static com.sun.jna.platform.win32.KnownFolders.FOLDERID_LocalAppData;
+import static com.sun.jna.platform.win32.KnownFolders.FOLDERID_RoamingAppData;
+
+import java.io.File;
+import java.io.FileNotFoundException;
 import java.nio.file.Paths;
 
-public class FolderFinderInWindowsEnvVar extends FolderFinder {
+import com.sun.jna.platform.win32.Shell32Util;
+
+import processing.app.PreferencesData;
+
+public class Win32KnownFolders {
 
-  private final String envVar;
+  public static File getLocalAppDataFolder() {
+    return new File(Shell32Util.getKnownFolderPath(FOLDERID_LocalAppData));
+  }
+
+  public static File getRoamingAppDataFolder() {
+    return new File(Shell32Util.getKnownFolderPath(FOLDERID_RoamingAppData));
+  }
 
-  public FolderFinderInWindowsEnvVar(FolderFinder next, String folderName, String evnVar) {
-    super(next, folderName);
-    this.envVar = evnVar;
+  public static File getDocumentsFolder() {
+    return new File(Shell32Util.getKnownFolderPath(FOLDERID_Documents));
   }
 
-  @Override
-  public Path findInternal() throws Exception {
-    String userprofile = System.getenv(envVar);
-    Path documents = Paths.get(userprofile, folderName);
-    if (Files.exists(documents)) {
-      return documents;
+  public static File getLocalCacheFolder() throws FileNotFoundException {
+    if (!PreferencesData.getBoolean("runtime.is-windows-store-app")) {
+      throw new FileNotFoundException();
     }
-    return null;
+    String localAppData = Shell32Util.getKnownFolderPath(FOLDERID_LocalAppData);
+    String appId = PreferencesData.get("runtime.windows-store-app.id");
+    return Paths.get(localAppData, "Packages", appId, "LocalCache").toFile();
   }
 }

arduino-core/.classpath

@@ -62,6 +62,19 @@ public class BaseNoGui {
         //noop
       }
     }
+
+    File windowsStoreConfig = new File(getContentFile("lib"), "windowsStore.txt");
+    if (windowsStoreConfig.exists()) {
+      try {
+        PreferencesMap conf = new PreferencesMap(windowsStoreConfig);
+        PreferencesData.setBoolean("runtime.is-windows-store-app", true);
+        PreferencesData.set("runtime.windows-store-app.id", conf.get("appid"));
+        versionNameLong += " (Windows Store " + conf.get("version") + ")";
+      } catch (IOException e1) {
+        e1.printStackTrace();
+      }
+    }
+
     VERSION_NAME_LONG = versionNameLong;
   }
 

arduino-core/lib/jna-4.1.0.jar

@@ -22,8 +22,8 @@
 
 package processing.app.windows;
 
-import cc.arduino.os.windows.FolderFinderInWindowsEnvVar;
-import cc.arduino.os.windows.FolderFinderInWindowsRegistry;
+import cc.arduino.os.windows.Win32KnownFolders;
+import processing.app.PreferencesData;
 import processing.app.legacy.PApplet;
 import processing.app.legacy.PConstants;
 
@@ -51,28 +51,25 @@ public void init() throws Exception {
   }
 
   private void recoverSettingsFolderPath() throws Exception {
-    FolderFinderInWindowsRegistry findInUserShellFolders = new FolderFinderInWindowsRegistry(null, "Documents", "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders", "Local AppData");
-    FolderFinderInWindowsRegistry findInShellFolders = new FolderFinderInWindowsRegistry(findInUserShellFolders, "Documents", "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", "Local AppData");
-
-    Path path = findInShellFolders.find();
-    this.settingsFolder = path.resolve("Arduino15").toFile();
+    if (PreferencesData.getBoolean("runtime.is-windows-store-app")) {
+      // LocalAppData is restricted for Windows Store Apps.
+      // We are forced to use a document folder to store tools.
+      Path path = Win32KnownFolders.getDocumentsFolder().toPath();
+      settingsFolder = path.resolve("ArduinoData").toFile();
+    } else {
+      Path path = Win32KnownFolders.getLocalAppDataFolder().toPath();
+      settingsFolder = path.resolve("Arduino15").toFile();
+    }
   }
 
   private Path recoverOldSettingsFolderPath() throws Exception {
-    FolderFinderInWindowsRegistry findInUserShellFolders = new FolderFinderInWindowsRegistry(null, "Documents", "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders", "AppData");
-    FolderFinderInWindowsRegistry findInShellFolders = new FolderFinderInWindowsRegistry(findInUserShellFolders, "Documents", "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", "AppData");
-
-    Path path = findInShellFolders.find();
+    Path path = Win32KnownFolders.getRoamingAppDataFolder().toPath();
     return path.resolve("Arduino15");
   }
 
   private void recoverDefaultSketchbookFolder() throws Exception {
-    FolderFinderInWindowsEnvVar findInUserProfile = new FolderFinderInWindowsEnvVar(null, "Documents", "USERPROFILE");
-    FolderFinderInWindowsRegistry findInUserShellFolders = new FolderFinderInWindowsRegistry(findInUserProfile, "Documents", "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders", "Personal");
-    FolderFinderInWindowsRegistry findInShellFolders = new FolderFinderInWindowsRegistry(findInUserShellFolders, "Documents", "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", "Personal");
-
-    Path path = findInShellFolders.find();
-    this.defaultSketchbookFolder = path.resolve("Arduino").toFile();
+    Path path = Win32KnownFolders.getDocumentsFolder().toPath();
+    defaultSketchbookFolder = path.resolve("Arduino").toFile();
   }
 
   /**
@@ -213,6 +210,9 @@ public void chmod(File file, int mode) throws IOException, InterruptedException
 
   @Override
   public void fixSettingsLocation() throws Exception {
+    if (PreferencesData.getBoolean("runtime.is-windows-store-app"))
+      return;
+
     Path oldSettingsFolder = recoverOldSettingsFolderPath();
     if (!Files.exists(oldSettingsFolder)) {
       return;