diff options
| author | Raphael Moll <ralf@android.com> | 2012-09-20 17:35:31 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-09-20 17:35:31 -0700 |
| commit | 69e16b2fbea467122cea308ac5ad74f27ca94d95 (patch) | |
| tree | c282d5118eebf5718de4178c0478c9319a5539f7 | |
| parent | 1d96433fc413046aeecc8bd9388fecad511ecefb (diff) | |
| parent | 26a423a5de4b715a980a0c0f0a16ec50bf39aef2 (diff) | |
| download | sdk-69e16b2fbea467122cea308ac5ad74f27ca94d95.zip sdk-69e16b2fbea467122cea308ac5ad74f27ca94d95.tar.gz sdk-69e16b2fbea467122cea308ac5ad74f27ca94d95.tar.bz2 | |
Merge "find_java: wrap toShortPath in disableWow64FSRedirection."
| -rw-r--r-- | find_java/find_java_exe.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/find_java/find_java_exe.cpp b/find_java/find_java_exe.cpp index c8e0e49..6b1add9 100644 --- a/find_java/find_java_exe.cpp +++ b/find_java/find_java_exe.cpp @@ -117,12 +117,15 @@ int main(int argc, char* argv[]) { _ASSERT(!javaPath.isEmpty());
if (doShortPath) {
+ PVOID oldWow64Value = disableWow64FsRedirection();
if (!javaPath.toShortPath(&javaPath)) {
+ revertWow64FsRedirection(&oldWow64Value);
fprintf(stderr,
"Failed to convert path to a short DOS path: %s\n",
javaPath.cstr());
return 1;
}
+ revertWow64FsRedirection(&oldWow64Value);
}
if (doVersion) {
|