Merge pull request #4 from jeremyd2019/wine-wow64-support

Build experimental wow64 support in wine

.github/workflows/main.yml

@@ -27,6 +27,15 @@ jobs:
         run: |
           docker build --tag ghcr.io/$GITHUB_REPOSITORY-experimental:latest .
           docker build -f devcontainer.Dockerfile --tag ghcr.io/$GITHUB_REPOSITORY-devcontainer:latest .
+      - name: Save images
+        run: |
+          docker image save ghcr.io/$GITHUB_REPOSITORY-experimental:latest | zstd -T0 -c > experimental.tar.zst
+          docker image save ghcr.io/$GITHUB_REPOSITORY-devcontainer:latest | zstd -T0 -c > devcontainer.tar.zst
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: docker-images
+          path: '*.tar.zst'
       - name: Deploy images
         if: github.event_name != 'pull_request'
         run: |

Dockerfile

@@ -4,6 +4,8 @@ FROM debian:bookworm AS build
 RUN sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/debian.sources
 RUN apt update
 RUN DEBIAN_FRONTEND="noninteractive" apt-get build-dep --install-recommends -y wine
+# debian does not pull in i686 mingw (needed for building "experimental wow64" support)
+RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y gcc-mingw-w64-i686
 
 RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y git
 
@@ -12,7 +14,7 @@ RUN git clone https://gitlab.winehq.org/jhol/wine.git /tmp/winesrc
 WORKDIR /tmp/winesrc
 # https://gitlab.winehq.org/jhol/wine/-/commits/msys2-hacks-17
 RUN git checkout aed38b3fea259c23738d60df67d562592d394393
-RUN ./configure --disable-tests --enable-win64
+RUN ./configure --disable-tests --enable-win64 --with-mingw --enable-archs=x86_64,i386
 RUN make -j $(nproc)
 RUN env DESTDIR=/tmp/install make -j $(nproc) install
 RUN rm -rf /tmp/winesrc

msys2

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-WINEDEBUG="-all" WINEPATH="C:\\msys64\\usr\\bin" MSYSTEM="${MSYSTEM:-UCRT64}" xvfb-run -a wine64 bash.exe -l "$@"
+WINEDEBUG="-all" WINEPATH="C:\\msys64\\usr\\bin" MSYSTEM="${MSYSTEM:-UCRT64}" xvfb-run -a wine bash.exe -l "$@"