Add detours patch that restores to the pre-vcpkg version

Author: JohnMcPMS

src/VcpkgPortOverlay/CreatePortOverlay.ps1

@@ -236,6 +236,26 @@ function Add-PatchToPort
     Add-PatchToPortFile -Port $Port -PatchName $PatchName
 }
 
+# Copies a patch to a port
+function Copy-PatchToPort
+{
+    param(
+        [Parameter(Mandatory)]
+        [string]$Port,
+        [Parameter(Mandatory)]
+        [string]$PatchPath,  # overlay relative directory
+        [Parameter(Mandatory)]
+        [string]$PatchName
+    )
+
+    $portSource = Join-Path $OverlayRoot $PatchPath $PatchName
+
+    $portDir = Join-Path $OverlayRoot $Port
+    Copy-Item -Path $portSource -Destination (Join-Path $portDir $PatchName)
+
+    Add-PatchToPortFile -Port $Port -PatchName $PatchName
+}
+
 # Sets the value of an existing function parameter.
 # For example, REF in vcpkg_from_github
 function Set-ParameterInPortFile
@@ -302,6 +322,9 @@ function Update-PortVersion
 New-PortOverlay cpprestsdk -Version 2.10.18 -PortVersion 4
 Add-PatchToPort cpprestsdk -PatchRepo 'microsoft/winget-cli' -PatchCommit '888b4ed8f4f7d25cb05a47210e083fe29348163b' -PatchName 'add-server-certificate-validation.patch' -PatchRoot 'src/cpprestsdk/cpprestsdk'
 
+New-PortOverlay detours -Version 4.0.1 -PortVersion 8
+Copy-PatchToPort detours -PatchPath 'detours_manual' -PatchName 'undockedregfreewinrt-version.patch'
+
 New-PortOverlay libyaml -Version 0.2.5 -PortVersion 5
 Update-PortSource libyaml -Commit '840b65c40675e2d06bf40405ad3f12dec7f35923' -SourceHash 'de85560312d53a007a2ddf1fe403676bbd34620480b1ba446b8c16bb366524ba7a6ed08f6316dd783bf980d9e26603a9efc82f134eb0235917b3be1d3eb4b302'
 Update-PortVersion libyaml

src/VcpkgPortOverlay/detours/find-jmp-bounds-arm64.patch

@@ -0,0 +1,24 @@
+diff --git a/src/detours.cpp b/src/detours.cpp
+index 8345c4d..3cd0e9d 100644
+--- a/src/detours.cpp
++++ b/src/detours.cpp
+@@ -974,6 +974,19 @@ inline PBYTE detour_skip_jmp(PBYTE pbCode, PVOID *ppGlobals)
+     return pbCode;
+ }
+ 
++inline void detour_find_jmp_bounds(PBYTE pbCode,
++                                   PDETOUR_TRAMPOLINE *ppLower,
++                                   PDETOUR_TRAMPOLINE *ppUpper)
++{
++    // We have to place trampolines within +/- 2GB of code.
++    ULONG_PTR lo = detour_2gb_below((ULONG_PTR)pbCode);
++    ULONG_PTR hi = detour_2gb_above((ULONG_PTR)pbCode);
++    DETOUR_TRACE(("[%p..%p..%p]\n", lo, pbCode, hi));
++
++    *ppLower = (PDETOUR_TRAMPOLINE)lo;
++    *ppUpper = (PDETOUR_TRAMPOLINE)hi;
++}
++
+ inline BOOL detour_does_code_end_function(PBYTE pbCode)
+ {
+     ULONG Opcode = fetch_opcode(pbCode);

src/VcpkgPortOverlay/detours/portfile.cmake

@@ -0,0 +1,37 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO microsoft/Detours
+    REF v4.0.1
+    SHA512 0a9c21b8222329add2de190d2e94d99195dfa55de5a914b75d380ffe0fb787b12e016d0723ca821001af0168fd1643ffd2455298bf3de5fdc155b3393a3ccc87
+    HEAD_REF master
+    PATCHES 
+        find-jmp-bounds-arm64.patch
+        undockedregfreewinrt-version.patch
+)
+
+vcpkg_build_nmake(
+    SOURCE_PATH "${SOURCE_PATH}"
+    PROJECT_SUBPATH "src"
+    PROJECT_NAME "Makefile"
+    OPTIONS "PROCESSOR_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}"
+    OPTIONS_RELEASE "DETOURS_CONFIG=Release"
+    OPTIONS_DEBUG "DETOURS_CONFIG=Debug"
+)
+
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+    file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib.${VCPKG_TARGET_ARCHITECTURE}Release/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+endif()
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib.${VCPKG_TARGET_ARCHITECTURE}Debug/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+endif()
+
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+    file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include" RENAME detours)
+else()
+    file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include" RENAME detours)
+endif()
+
+file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")