Fix: wait for windows app to exit as well

.clang-format

@@ -0,0 +1,75 @@
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: DontAlign
+AlignTrailingComments: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortFunctionsOnASingleLine: true
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+BreakBeforeBinaryOperators: None
+
+# Custom format to allow namespace and empty method compression.
+BreakBeforeBraces: Custom
+BraceWrapping:
+    AfterClass: true
+    AfterControlStatement: true
+    AfterEnum : true
+    AfterExternBlock: true
+    AfterFunction: true
+    AfterNamespace: false
+    AfterStruct: true
+    AfterUnion: true
+    BeforeCatch: true
+    BeforeElse: true
+    IndentBraces: false
+    SplitEmptyFunction: false
+    SplitEmptyRecord: false
+    SplitEmptyNamespace: false
+
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializers: AfterColon
+BreakStringLiterals: true
+ColumnLimit: 160
+CompactNamespaces: true
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerBinding: false
+FixNamespaceComments: true
+IncludeBlocks: Preserve
+IndentCaseLabels: false
+IndentPPDirectives: None
+IndentWidth: 4
+IndentWrappedFunctionNames: false
+Language: Cpp
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+PointerAlignment: Left
+ReflowComments: false
+SortIncludes: false
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: Cpp11
+TabWidth: 4
+UseTab: Never
+MacroBlockBegin: '^BEGIN_MODULE$|^BEGIN_TEST_CLASS$|^BEGIN_TEST_METHOD$|^BEGIN_COM_MAP$'
+MacroBlockEnd: '^END_MODULE$|^END_TEST_CLASS$|^END_TEST_METHOD$|^END_TEST_METHOD$|^END_COM_MAP$'

.github/scripts/setenv.ps1

@@ -0,0 +1,7 @@
+$_VsInstallerDir = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\";
+if (Test-Path "$_VsInstallerDir\vswhere.exe") {
+    $env:PATH += ";$_VsInstallerDir";
+    $installPath = vswhere -latest -property installationPath;
+    Import-Module (Join-Path $installPath "Common7\Tools\Microsoft.VisualStudio.DevShell.dll") -Force;
+    Enter-VsDevShell -VsInstallPath $installPath -SkipAutomaticLocation;
+}

.github/workflows/compile.yml

@@ -0,0 +1,26 @@
+name: Build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: windows-latest
+    env:
+      MSYS2_PATH_TYPE: inherit
+    defaults:
+      run:
+        shell: pwsh
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: msys2/setup-msys2@v2
+        with:
+          update: false
+          release: false
+          install: >-
+            ninja
+
+      - name: Build
+        run: |
+          .github/scripts/setenv.ps1
+          ninja -C build shim.exe

.github/workflows/release.yml

@@ -0,0 +1,68 @@
+name: Release
+
+on:
+  schedule:
+    - cron: "0 0 * * 0" # weekly
+  workflow_dispatch:
+  push:
+    paths:
+      - 'version'
+
+jobs:
+  build:
+    runs-on: windows-latest
+    env:
+      MSYS2_PATH_TYPE: inherit
+    defaults:
+      run:
+        shell: msys2 {0}
+
+    steps:
+      - uses: msys2/setup-msys2@v2
+        with:
+          update: false
+          release: false
+          install: >-
+            zip
+            ninja
+      - uses: actions/checkout@v2
+
+      - name: Get latest release
+        continue-on-error: true
+        id: cur_release
+        uses: pozetroninc/github-action-get-latest-release@master
+        with:
+          repository: ${{ github.repository }}
+          excludes: draft
+
+      - name: Get version
+        run: |
+          base_ver=$(cat version)
+          sha=${GITHUB_SHA::7}
+          version=$([ -z "${{ github.event.schedule }}" ] && echo ${base_ver} || echo ${base_ver}.$sha)
+          cur_ver=$([[ ${{ steps.cur_release.outcome }} == failure ]] && echo v0 || echo ${{ steps.cur_release.outputs.release }})
+          [[ v$version == $cur_ver ]] && exit 1
+          prerelease=$([ -z "${{ github.event.schedule }}" ] && echo false || echo true)
+          echo "version=$version" >> $GITHUB_ENV
+          echo "prerelease=$prerelease" >> $GITHUB_ENV
+
+      - name: Setup environment
+        shell: pwsh
+        run: |
+          .github/scripts/setenv.ps1
+          echo $env:PATH | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+      - name: Build
+        run: ninja -C build
+
+      - name: Create release
+        uses: ncipollo/release-action@v1
+        with:
+          tag: v${{ env.version }}
+          name: ${{ env.version }}
+          draft: false
+          prerelease: ${{ env.prerelease }}
+          artifactErrorsFailBuild: true
+          artifacts: build/shimexe.zip
+          artifactContentType: application/zip
+          token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,3 +1,16 @@
 .vscode/
 *.exe
 *.obj
+*.pdb
+*.ilk
+*.o
+checksum.sha*
+obj/
+bin/
+archive/
+build/**
+!build/*.ninja
+!build/build.ps1
+!build/build.zig
+.zig-cache/
+zig-out/

Makefile

@@ -0,0 +1,41 @@
+CC=clang++.exe
+CFLAGS=-std=c++17 -m32
+
+ODIR = obj
+BDIR = bin
+ADIR = archive
+
+TARGET = $(BDIR)/shim.exe
+OBJ = shim.o
+OBJS = $(patsubst %,$(ODIR)/%,$(OBJ))
+
+$(TARGET): $(OBJS) | $(BDIR)
+	$(CC) -o $(TARGET) $^ $(CFLAGS) -Ofast -static
+	sha256sum $(TARGET) > $(BDIR)/checksum.sha256
+	sha512sum $(TARGET) > $(BDIR)/checksum.sha512
+
+$(ODIR)/%.o: %.cpp | $(ODIR)
+	$(CC) -c -o $@ $< $(CFLAGS) -Ofast -g
+
+$(ODIR):
+	mkdir -p $(ODIR)
+
+$(BDIR):
+	mkdir -p $(BDIR)
+
+.PHONY: clean debug zip
+
+clean:
+	rm -f $(ODIR)/*.*
+	rm -f $(BDIR)/*.*
+
+debug: $(OBJS) | $(BDIR)
+	$(CC) -o $(BDIR)/shim.exe $^ $(CFLAGS) -g
+
+$(ADIR):
+	mkdir -p $(ADIR)
+
+$(ADIR)/shimexe.zip: $(TARGET) | $(ADIR)
+	cd $(ADIR) && zip -j -9 shimexe.zip ../$(BDIR)/*.*
+
+zip: $(ADIR)/shimexe.zip

README.md

@@ -11,7 +11,7 @@ file to redirect commands from `scoop\shims\app.exe` to `scoop\apps\app\current\
 The last issue making interaction with REPLs and long-running apps practically impossible,
 and having never been fixed, I set out to improve them with this repository.
 
-[`shim.c`](./shim.c) is:
+[`shim.cpp`](./shim.cpp) is:
 - **Faster**, because it does not use the .NET Framework, and parses the `.shim` file in a simpler way.
 - **More efficient**, because by the time the target of the shim is started, all allocated memory will have been freed.
 - And more importantly, it **works better**:
@@ -24,6 +24,7 @@ and having never been fixed, I set out to improve them with this repository.
 ## Installation
 
 - In a Visual Studio command prompt, run `cl /O1 shim.c`.
+- Or using `clang++` with `clang++ shim.cpp -o shim.exe -m32 -O -std=c++17 -g`.
 - Replace any `.exe` in `scoop\shims` by `shim.exe`.
 
 An additional script, `repshims.bat`, is provided. It will replace all `.exe`s in the user's Scoop directory

build/build.ninja

@@ -0,0 +1,32 @@
+cc = clang++.exe
+cflags = -std=c++20 -m32
+
+rule cc
+  command = $cc -c -o $out $in $cflags -O2 -g
+
+rule link
+  command = $cc -o $out $cflags -O2 -static -Wl,/manifest:embed -Wl,/manifestinput:$in
+
+rule link-debug
+  command = $cc -o $out $cflags -O2 -static -fuse-ld=lld -g -Wl,/manifest:embed -Wl,/manifestinput:$in
+
+rule mkdir
+  command = mkdir -p $in
+
+rule sha256sum
+  command = sha256sum $in > $out
+
+rule sha512sum
+  command = sha512sum $in > $out
+
+rule zip
+  command = zip -j -9 $out $in
+
+build shim.o: cc ../shim.cpp
+build shim.exe: link ../shim.manifest shim.o
+build shimd.exe: link-debug ../shim.manifest shim.o
+build checksum.sha256: sha256sum shim.exe
+build checksum.sha512: sha512sum shim.exe
+build shimexe.zip: zip shim.exe checksum.sha256 checksum.sha512
+
+default shimexe.zip

build/build.ps1

@@ -0,0 +1,94 @@
+#!/usr/bin/env pwsh
+#Requires -Version 7
+
+<#
+.SYNOPSIS
+    Build shim.exe using Zig.
+.PARAMETER BuildMode
+    The build mode. Valid values are Debug, ReleaseSafe, ReleaseFast, ReleaseSmall
+    Default is ReleaseSmall
+.PARAMETER Target
+    The target architecture. Valid values are x86-windows-gnu, x86_64-windows-gnu, aarch64-windows-gnu
+    Default is undefined (all valid targets)
+.PARAMETER Zip
+    Generate checksums and pack the artifacts into a zip file for distribution
+#>
+param(
+    [ValidateSet('Debug', 'ReleaseSafe', 'ReleaseFast', 'ReleaseSmall')]
+    [string]$BuildMode = "ReleaseSmall",
+    [ValidateSet('x86-windows-gnu', 'x86_64-windows-gnu', 'aarch64-windows-gnu')]
+    [string]$Target,
+    [switch]$Zip = $false
+)
+
+$oldErrorActionPreference = $ErrorActionPreference
+$ErrorActionPreference = "Stop"
+
+if (-not [bool](Get-Command zig -ErrorAction SilentlyContinue)) {
+    Write-Host "Zig is not installed. Please install Zig before running this script." -ForegroundColor Yellow
+    exit 1
+}
+
+Remove-Item -Path "$PSScriptRoot\zig-out" -Recurse -Force -ErrorAction SilentlyContinue
+
+Push-Location $PSScriptRoot
+
+if (-not $Target -or $Target -eq 'x86-windows-gnu') {
+    Write-Host "Build shim.exe for x86-windows-gnu target..." -ForegroundColor Cyan
+    Start-Process -FilePath "zig" -ArgumentList "build -Dtarget=x86-windows-gnu -Doptimize=$BuildMode" -Wait -NoNewWindow
+    Rename-Item -Path "$PSScriptRoot\zig-out\bin\shim.exe" -NewName "$PSScriptRoot\zig-out\bin\shim-ia32.exe"
+}
+
+if (-not $Target -or $Target -eq 'x86_64-windows-gnu') {
+    Write-Host "Build shim.exe for x86_64-windows-gnu target..." -ForegroundColor Cyan
+    Start-Process -FilePath "zig" -ArgumentList "build -Dtarget=x86_64-windows-gnu -Doptimize=$BuildMode" -Wait -NoNewWindow
+    Rename-Item -Path "$PSScriptRoot\zig-out\bin\shim.exe" -NewName "$PSScriptRoot\zig-out\bin\shim-amd64.exe"
+}
+
+if (-not $Target -or $Target -eq 'aarch64-windows-gnu') {
+    Write-Host "Build shim.exe for aarch64-windows-gnu target..." -ForegroundColor Cyan
+    Start-Process -FilePath "zig" -ArgumentList "build -Dtarget=aarch64-windows-gnu -Doptimize=$BuildMode" -Wait -NoNewWindow
+    Rename-Item -Path "$PSScriptRoot\zig-out\bin\shim.exe" -NewName "$PSScriptRoot\zig-out\bin\shim-aarch64.exe"
+}
+
+if ($Zip) {
+    Write-Host "Generate checksums..." -ForegroundColor Cyan
+
+    # shim-ia32.exe
+    if (-not $Target -or $Target -eq 'x86-windows-gnu') {
+        $sha256 = (Get-FileHash "$PSScriptRoot\zig-out\bin\shim-ia32.exe" -Algorithm SHA256).Hash.ToLower()
+        "$sha256 shim-ia32.exe" | Out-File "$PSScriptRoot\zig-out\bin\shim-ia32.exe.sha256"
+        $sha512 = (Get-FileHash "$PSScriptRoot\zig-out\bin\shim-ia32.exe" -Algorithm SHA512).Hash.ToLower()
+        "$sha512 shim-ia32.exe" | Out-File "$PSScriptRoot\zig-out\bin\shim-ia32.exe.sha512"
+    }
+
+    # shim-amd64.exe
+    if (-not $Target -or $Target -eq 'x86_64-windows-gnu') {
+        $sha256 = (Get-FileHash "$PSScriptRoot\zig-out\bin\shim-amd64.exe" -Algorithm SHA256).Hash.ToLower()
+        "$sha256 shim-amd64.exe" | Out-File "$PSScriptRoot\zig-out\bin\shim-amd64.exe.sha256"
+        $sha512 = (Get-FileHash "$PSScriptRoot\zig-out\bin\shim-amd64.exe" -Algorithm SHA512).Hash.ToLower()
+        "$sha512 shim-amd64.exe" | Out-File "$PSScriptRoot\zig-out\bin\shim-amd64.exe.sha512"
+    }
+
+    # shim-aarch64.exe
+    if (-not $Target -or $Target -eq 'aarch64-windows-gnu') {
+        $sha256 = (Get-FileHash "$PSScriptRoot\zig-out\bin\shim-aarch64.exe" -Algorithm SHA256).Hash.ToLower()
+        "$sha256 shim-aarch64.exe" | Out-File "$PSScriptRoot\zig-out\bin\shim-aarch64.exe.sha256"
+        $sha512 = (Get-FileHash "$PSScriptRoot\zig-out\bin\shim-aarch64.exe" -Algorithm SHA512).Hash.ToLower()
+        "$sha512 shim-aarch64.exe" | Out-File "$PSScriptRoot\zig-out\bin\shim-aarch64.exe.sha512"
+    }
+
+    Write-Host "Packaging..." -ForegroundColor Cyan
+
+    $version = (Get-Content "$PSScriptRoot\..\version").Trim()
+    Compress-Archive -Path "$PSScriptRoot\zig-out\bin\shim-*" -DestinationPath "$PSScriptRoot\zig-out\shimexe-$version.zip"
+
+    $sha256 = (Get-FileHash "$PSScriptRoot\zig-out\shimexe-$version.zip" -Algorithm SHA256).Hash.ToLower()
+    "$sha256 shimexe-$version.zip" | Out-File "$PSScriptRoot\zig-out\shimexe-$version.zip.sha256"
+}
+
+Write-Host "Artifacts available in $PSScriptRoot\zig-out" -ForegroundColor Green
+
+Pop-Location
+
+$ErrorActionPreference = $oldErrorActionPreference