commit 26a423a5de4b715a980a0c0f0a16ec50bf39aef2
author Raphael Moll <ralf@android.com> Thu Aug 16 15:20:43 2012 -0700
committer Raphael Moll <ralf@android.com> Fri Aug 17 14:28:34 2012 -0700
tree 8aa5187f05a90b9c3efab02075ca041462e9609d
parent f84b9feb3e21022f449812dfa10d1d1a1339683f

find_java: wrap toShortPath in disableWow64FSRedirection.

Change-Id: I4e3135927616eb6ad3e0da46496bb97b3029ccd9

find_java/find_java_exe.cpp

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 @@
     _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) {