From 082845619ccbb429f650542acd73caeb6d43d17a Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Wed, 10 Sep 2014 17:22:40 +0000
Subject: [PATCH] Windows: Add wow_helper.exe to the 32-bit binary distribution
 for Vista 64-bit sandbox support (issue #1366).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1827 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
---
 tools/distrib/cefclient.gyp            | 30 ++++++++++++++++++++++++--
 tools/distrib/win/README.redistrib.txt |  5 +++++
 tools/make_distrib.py                  |  2 ++
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/tools/distrib/cefclient.gyp b/tools/distrib/cefclient.gyp
index 83f817bbf..87d2c2f46 100644
--- a/tools/distrib/cefclient.gyp
+++ b/tools/distrib/cefclient.gyp
@@ -80,12 +80,25 @@
                 '$(OutDir)',
               ],
             },
+            {
+              'action_name': 'copy_executables',
+              'msvs_cygwin_shell': 0,
+              'inputs': [],
+              'outputs': [
+                '<(PRODUCT_DIR)/copy_executables.stamp',
+              ],
+              'action': [
+                'xcopy /efy',
+                '$(ConfigurationName)\*.exe',
+                '$(OutDir)',
+              ],
+            },
             {
               'action_name': 'copy_libraries',
               'msvs_cygwin_shell': 0,
               'inputs': [],
               'outputs': [
-                '<(PRODUCT_DIR)/copy_resources.stamp',
+                '<(PRODUCT_DIR)/copy_libraries.stamp',
               ],
               'action': [
                 'xcopy /efy',
@@ -305,12 +318,25 @@
                 '$(OutDir)',
               ],
             },
+            {
+              'action_name': 'copy_executables',
+              'msvs_cygwin_shell': 0,
+              'inputs': [],
+              'outputs': [
+                '<(PRODUCT_DIR)/copy_executables.stamp',
+              ],
+              'action': [
+                'xcopy /efy',
+                '$(ConfigurationName)\*.exe',
+                '$(OutDir)',
+              ],
+            },
             {
               'action_name': 'copy_libraries',
               'msvs_cygwin_shell': 0,
               'inputs': [],
               'outputs': [
-                '<(PRODUCT_DIR)/copy_resources.stamp',
+                '<(PRODUCT_DIR)/copy_libraries.stamp',
               ],
               'action': [
                 'xcopy /efy',
diff --git a/tools/distrib/win/README.redistrib.txt b/tools/distrib/win/README.redistrib.txt
index 619c1476c..12b03a7f7 100644
--- a/tools/distrib/win/README.redistrib.txt
+++ b/tools/distrib/win/README.redistrib.txt
@@ -49,3 +49,8 @@ Optional components:
     libGLESv2.dll
   Note: Without these components HTML5 accelerated content like 2D canvas, 3D
   CSS and WebGL will not function.
+
+* Windows Vista 64-bit sandbox support (32-bit distributions only)
+    wow_helper.exe
+  Note: Without this component the 32-bit build of CEF will not run on 64-bit
+  Vista machines with the sandbox enabled.
diff --git a/tools/make_distrib.py b/tools/make_distrib.py
index 412836eb0..49ea60008 100644
--- a/tools/make_distrib.py
+++ b/tools/make_distrib.py
@@ -520,6 +520,8 @@ if platform == 'windows':
     'libGLESv2.dll',
     'pdf.dll',
   ]
+  if not options.x64build:
+    binaries.append('wow_helper.exe')
 
   if options.ninjabuild:
     out_dir = os.path.join(src_dir, 'out')