diff --git a/app/test/processing/app/windows/RegexpTest.java b/app/test/processing/app/windows/RegexpTest.java new file mode 100644 index 000000000..d93995b7e --- /dev/null +++ b/app/test/processing/app/windows/RegexpTest.java @@ -0,0 +1,50 @@ +/* + * This file is part of Arduino. + * + * Arduino is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, you may use this file as part of a free software + * library without restriction. Specifically, if other files instantiate + * templates or use macros or inline functions from this file, or you compile + * this file and link it with other files to produce an executable, this + * file does not by itself cause the resulting executable to be covered by + * the GNU General Public License. This exception does not however + * invalidate any other reasons why the executable file might be covered by + * the GNU General Public License. + * + * Copyright 2015 Arduino LLC (http://www.arduino.cc/) + */ + +package processing.app.windows; + +import org.junit.Test; + +import java.util.regex.Matcher; + +import static org.junit.Assert.assertEquals; + +public class RegexpTest { + + @Test + public void testReplaceAll() throws Exception { + assertEquals("c:\\\\hello", Matcher.quoteReplacement("c:\\hello")); + String result = "%UsErPROFile%\\world".replaceAll("%[uU][sS][eE][rR][pP][rR][oO][fF][iI][lL][eE]%", Matcher.quoteReplacement("c:\\hello")); + assertEquals("c:\\hello\\world", result); + + result = "%USERPROFILE%\\world".replaceAll("%[uU][sS][eE][rR][pP][rR][oO][fF][iI][lL][eE]%", Matcher.quoteReplacement("c:\\hello")); + assertEquals("c:\\hello\\world", result); + } + +} diff --git a/arduino-core/src/processing/app/windows/Platform.java b/arduino-core/src/processing/app/windows/Platform.java index 7dbdfd11a..3bc051c84 100644 --- a/arduino-core/src/processing/app/windows/Platform.java +++ b/arduino-core/src/processing/app/windows/Platform.java @@ -42,6 +42,7 @@ import java.nio.file.Paths; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.regex.Matcher; public class Platform extends processing.app.Platform { @@ -57,16 +58,29 @@ public class Platform extends processing.app.Platform { recoverDefaultSketchbookFolder(); } - private void recoverSettingsFolderPath() throws IOException { - String path = Advapi32Util.registryGetStringValue(WinReg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", "Local AppData"); + private void recoverSettingsFolderPath() { + String path = readRegistryEntry(new String[]{"User Shell Folders", "Shell Folders"}, "Local AppData"); this.settingsFolder = new File(path, "Arduino15"); } - private void recoverDefaultSketchbookFolder() throws IOException { - String path = Advapi32Util.registryGetStringValue(WinReg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", "Personal"); + private void recoverDefaultSketchbookFolder() { + String path = readRegistryEntry(new String[]{"User Shell Folders", "Shell Folders"}, "Personal"); this.defaultSketchbookFolder = new File(path, "Arduino"); } + private String readRegistryEntry(String[] lastPathElements, String key) { + for (String lastPathElement : lastPathElements) { + try { + String value = Advapi32Util.registryGetStringValue(WinReg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\" + lastPathElement, key); + value = value.replaceAll("%[uU][sS][eE][rR][pP][rR][oO][fF][iI][lL][eE]%", Matcher.quoteReplacement(System.getenv("USERPROFILE"))); + return value; + } catch (Exception e) { + //ignore + } + } + throw new IllegalStateException("Unable to find " + key + " key in Windows registry"); + } + /** * Remove extra quotes, slashes, and garbage from the Windows PATH. */