From: Lenny Komow <lenny@lunarg.com>
Date: Thu, 7 Jul 2016 22:45:34 +0000 (-0600)
Subject: winsdk: Fix error when installing from syswow64
X-Git-Tag: upstream/1.1.92~2879
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d5b4d2ed9b5b6066e93e2df630cc7f38937b3b3c;p=platform%2Fupstream%2FVulkan-Tools.git

winsdk: Fix error when installing from syswow64
---

diff --git a/windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1 b/windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1
index 341df5f..3eadbfd 100644
--- a/windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1
+++ b/windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1
@@ -359,6 +359,7 @@ function UpdateVulkanSysFolder([string]$dir, [int]$writeSdkName)
 
 # We only care about SYSWOW64 if we're targeting a 64-bit OS
 if ($ossize -eq 64) {
+
     # Update the SYSWOW64 Vulkan DLLS/EXEs
     WriteToLog "Calling UpdateVulkanSysFolder $winfolder\SYSWOW64 0"
     UpdateVulkanSysFolder $winfolder\SYSWOW64 0
@@ -368,12 +369,26 @@ if ($ossize -eq 64) {
     }
 }
 
-# Update the SYSTEM32 Vulkan DLLS/EXEs
-WriteToLog "Calling UpdateVulkanSysFolder $winfolder\SYSTEM32 1"
-UpdateVulkanSysFolder $winfolder\SYSTEM32 1
-if (!$?) {
-    WriteToLog "Error: Calling UpdateVulkanSysFolder for all OS"
-    setScriptReturnValue(80)
+# If this is a 64 bit OS and a 32 bit powershell
+if (($ossize -eq 64 ) -and ([IntPtr]::size -eq 4)) {
+
+    # Update the SYSTEM32 Vulkan DLLS/EXEs
+    WriteToLog "Calling UpdateVulkanSysFolder $winfolder\SYSTEM32 1"
+    UpdateVulkanSysFolder $winfolder\SYSNATIVE 1
+    if (!$?) {
+        WriteToLog "Error: Calling UpdateVulkanSysFolder for all OS"
+        setScriptReturnValue(80)
+    }
+
+} else {
+
+    # Update the SYSTEM32 Vulkan DLLS/EXEs
+    WriteToLog "Calling UpdateVulkanSysFolder $winfolder\SYSTEM32 1"
+    UpdateVulkanSysFolder $winfolder\SYSTEM32 1
+    if (!$?) {
+        WriteToLog "Error: Calling UpdateVulkanSysFolder for all OS"
+        setScriptReturnValue(81)
+    }
 }
 
 # Create an array of vulkan sdk install dirs