wine: support both 32-bit and 64-bit Windows builds (Electron-Cash#3189)

EchterAgo · web-flow · commit 21a41703894b · 2026-02-13T13:14:02.000-06:00
* wine: Update gnupg2 to current version

* wine: support both 32-bit and 64-bit Windows builds

- Make `GCC_TRIPLET_HOST` configurable from environment
- Map architecture to Python installer paths (`amd64`/`win32`)
- Add SHA256 checksums for both 32-bit and 64-bit Python MSIs
- Configure OpenSSL target (`mingw64`/`mingw`) based on architecture
- Include architecture in output filenames (e.g. `Electron-Cash-4.2.2-x86_64.exe`)

The 64-bit Wine install with Visual Studio can cross-compile to both
x86 and x64 targets, so we only need a single build container.

I tested:

- All `ctypes` usages directly in the app.
- tor
- Ledger, Keepkey plugins
- zbar and zxing-cpp
diff --git a/contrib/build-wine/_build.sh b/contrib/build-wine/_build.sh
@@ -7,7 +7,14 @@ here=`pwd`  # get an absolute path
 popd
 
 export BUILD_TYPE="wine"
-export GCC_TRIPLET_HOST="i686-w64-mingw32"
+export GCC_TRIPLET_HOST="${GCC_TRIPLET_HOST:-x86_64-w64-mingw32}"
+export GCC_TRIPLET_HOST_ARCH="${GCC_TRIPLET_HOST%%-*}"  # e.g. x86_64
+# Map GCC arch to Python installer directory name
+case "$GCC_TRIPLET_HOST_ARCH" in
+    x86_64) export PYTHON_ARCH="amd64" ;;
+    i686)   export PYTHON_ARCH="win32" ;;
+    *)      echo "Unknown architecture: $GCC_TRIPLET_HOST_ARCH" && exit 1 ;;
+esac
 export GCC_TRIPLET_BUILD="x86_64-pc-linux-gnu"
 export GCC_STRIP_BINARIES="1"
 export GIT_SUBMODULE_FLAGS="--recommend-shallow --depth 1"
@@ -88,19 +95,30 @@ prepare_wine() {
 
         for msifile in $msifiles ; do
             info "Downloading $msifile..."
-            wget "https://www.python.org/ftp/python/$PYTHON_VERSION/win32/${msifile}.msi"
-            wget "https://www.python.org/ftp/python/$PYTHON_VERSION/win32/${msifile}.msi.asc"
+            wget "https://www.python.org/ftp/python/$PYTHON_VERSION/$PYTHON_ARCH/${msifile}.msi"
+            wget "https://www.python.org/ftp/python/$PYTHON_VERSION/$PYTHON_ARCH/${msifile}.msi.asc"
             verify_signature "${msifile}.msi.asc" $KEYRING_PYTHON_DEV
         done
 
-        $SHA256_PROG -c - << EOF
+        if [ "$PYTHON_ARCH" = "amd64" ]; then
+            $SHA256_PROG -c - << EOF
+d5499530d9cddc316811630736eb1bd35f22637f889d562cd3e8e980b1aebd17 core.msi
+eb413f9579079f961d3f4c034ba8e00d28ff1cb703f873b9b585c0f467321fba dev.msi
+b0a7aaffc9b03d5c7d04d8522e30c5027a8c70ec4c14a6922d6c2cf560bc1459 exe.msi
+1e6f5cedc0158f6f2f23d0657d3e6858853569084669dac8f367fc3b94dc4c9b lib.msi
+014460c0444bfff5a003ca0a6375c4b41a257f5ed380a714cda3fbcf5d3c1579 pip.msi
+6d34cbc645c1b2dd360a0b0df79205b24f0d5f85fea2865f1cc1428d6a64b9cd tools.msi
+EOF
+        elif [ "$PYTHON_ARCH" = "win32" ]; then
+            $SHA256_PROG -c - << EOF
 f49a951a6ad7e733e64877b36c8fe43477c2b1c26d316f30a2379bb35a8538a8 core.msi
 45c3faeccbd7fa5041f00fea2d05dfcd1a4ef0211aa519508e168b4bcea92bac dev.msi
 6b18e724b5ae84df94c3d6cbe55c9143a46802e49c6c7310db7c6e9c1996dc24 exe.msi
 6c97ba70fd48747489650b48db5be9ea165dd56f1c6e0ddd5e05c488cf2dd2e2 lib.msi
 2a1a5e6adb9d8120c448ab8df8501a16ad419daa93b230c635036f67e4719f5d pip.msi
 ee1a5d8ee16eaef3c84c6c4cea4621554d9d1de640fb84ba4f4d982a743fef81 tools.msi
 EOF
+        fi
         test $? -eq 0 || fail "Failed to verify Python checksums"
 
         for msifile in $msifiles ; do
@@ -133,13 +151,12 @@ EOF
             fi
             pushd bootloader
             # If switching to 64-bit Windows, edit CC= below
-            python3 ./waf all CC=i686-w64-mingw32-gcc CFLAGS="-Wno-stringop-overflow -static"
+            python3 ./waf all CC="$GCC_TRIPLET_HOST-gcc" CFLAGS="-Wno-stringop-overflow -static"
             # Note: it's possible for the EXE to not be there if the build
             # failed but didn't return exit status != 0 to the shell (waf bug?);
             # So we need to do this to make sure the EXE is actually there.
-            # If we switch to 64-bit, edit this path below.
             popd
-            [ -e PyInstaller/bootloader/Windows-32bit-intel/runw.exe ] || fail "Could not find runw.exe in target dir!"
+            [ -e PyInstaller/bootloader/Windows-32bit-intel/runw.exe -o -e PyInstaller/bootloader/Windows-64bit-intel/runw.exe ] || fail "Could not find runw.exe in target dir!"
             rm -fv pyinstaller.py  # workaround for https://github.com/pyinstaller/pyinstaller/pull/6701
         ) || fail "PyInstaller bootloader build failed"
         info "Installing PyInstaller ..."
@@ -167,12 +184,9 @@ EOF
             git checkout -b pinned "${LIBUSB_COMMIT}^{commit}"
             echo "libusb_1_0_la_LDFLAGS += -Wc,-static" >> libusb/Makefile.am
             ./bootstrap.sh || fail "Could not bootstrap libusb"
-            host="i686-w64-mingw32"
-            LDFLAGS="-Wl,--no-insert-timestamp" ./configure \
-                --host=$host \
-                --build=x86_64-pc-linux-gnu || fail "Could not run ./configure for libusb"
+            LDFLAGS="-Wl,--no-insert-timestamp" ./configure $AUTOCONF_FLAGS || fail "Could not run ./configure for libusb"
             make -j4 || fail "Could not build libusb"
-            ${host}-strip libusb/.libs/libusb-1.0.dll
+            host_strip libusb/.libs/libusb-1.0.dll
         ) || fail "libusb build failed"
 
         # libsecp256k1, libzbar & libusb
@@ -251,8 +265,8 @@ build_the_app() {
 
         # rename the output files
         pushd dist
-        mv $NAME_ROOT.exe $NAME_ROOT-$VERSION.exe
-        mv $NAME_ROOT-portable.exe $NAME_ROOT-$VERSION-portable.exe
+        mv $NAME_ROOT.exe $NAME_ROOT-$VERSION-$GCC_TRIPLET_HOST_ARCH.exe
+        mv $NAME_ROOT-portable.exe $NAME_ROOT-$VERSION-$GCC_TRIPLET_HOST_ARCH-portable.exe
         popd
 
         # set timestamps in dist, in order to make the installer reproducible
@@ -264,10 +278,10 @@ build_the_app() {
         # build NSIS installer
         info "Running makensis to build setup .exe version ..."
         # $VERSION could be passed to the electron-cash.nsi script, but this would require some rewriting in the script iself.
-        wine "$WINEPREFIX/drive_c/Program Files/NSIS/makensis.exe" /DPRODUCT_VERSION=$VERSION electron-cash.nsi || fail "makensis failed"
+        wine "$WINEPREFIX/drive_c/Program Files (x86)/NSIS/makensis.exe" /DPRODUCT_VERSION=$VERSION /DGCC_TRIPLET_HOST_ARCH=$GCC_TRIPLET_HOST_ARCH electron-cash.nsi || fail "makensis failed"
 
         cd dist
-        mv $NAME_ROOT-setup.exe $NAME_ROOT-$VERSION-setup.exe  || fail "Failed to move $NAME_ROOT-$VERSION-setup.exe to the output dist/ directory"
+        mv $NAME_ROOT-setup.exe $NAME_ROOT-$VERSION-$GCC_TRIPLET_HOST_ARCH-setup.exe  || fail "Failed to move $NAME_ROOT-$VERSION-$GCC_TRIPLET_HOST_ARCH-setup.exe to the output dist/ directory"
 
         ls -la *.exe
         sha256sum *.exe
diff --git a/contrib/build-wine/build.sh b/contrib/build-wine/build.sh
@@ -78,32 +78,42 @@ FRESH_CLONE_DIR="$FRESH_CLONE/$GIT_DIR_NAME"
 ) || fail "Could not create a fresh clone from git"
 
 (
-    # NOTE: We propagate forward the GIT_REPO override to the container's env,
-    # just in case it needs to see it.
-    $SUDO docker run $DOCKER_RUN_TTY \
-    -u $USER_ID:$GROUP_ID \
-    -e GIT_REPO="$GIT_REPO" \
-    -e BUILD_DEBUG="$BUILD_DEBUG" \
-    -e PYI_SKIP_TAG="$PYI_SKIP_TAG" \
-    --name ec-wine-builder-cont \
-    -v "$FRESH_CLONE_DIR":/homedir/wine/drive_c/electroncash:delegated \
-    --rm \
-    --workdir /homedir/wine/drive_c/electroncash/contrib/build-wine \
-    $IMGNAME \
-    ./_build.sh $REV
+    for triplet in x86_64-w64-mingw32 i686-w64-mingw32; do
+        pushd "$FRESH_CLONE_DIR"
+        git reset --hard || fail "Failed to reset git repository"
+        git clean -dfxq || fail "Failed to clean git repository"
+        git submodule foreach 'git reset --hard' || fail "Failed to reset git submodules"
+        git submodule foreach 'git clean -dfxq' || fail "Failed to clean git submodules"
+        popd
+
+        # NOTE: We propagate forward the GIT_REPO override to the container's env,
+        # just in case it needs to see it.
+        $SUDO docker run $DOCKER_RUN_TTY \
+            -u $USER_ID:$GROUP_ID \
+            -e GIT_REPO="$GIT_REPO" \
+            -e BUILD_DEBUG="$BUILD_DEBUG" \
+            -e PYI_SKIP_TAG="$PYI_SKIP_TAG" \
+            -e GCC_TRIPLET_HOST="$triplet" \
+            --name ec-wine-builder-cont \
+            -v "$FRESH_CLONE_DIR":/homedir/wine/drive_c/electroncash:delegated \
+            --rm \
+            --workdir /homedir/wine/drive_c/electroncash/contrib/build-wine \
+            $IMGNAME \
+            ./_build.sh $REV || fail "Build for $triplet inside docker container failed"
+
+        info "Copying .exe files out of our build directory ..."
+        mkdir -p "$here"/../../dist
+        files="$FRESH_CLONE_DIR"/contrib/build-wine/dist/*.exe
+        for f in $files; do
+            bn=`basename "$f"`
+            cp -fpv "$f" "$here"/../../dist/"$bn" || fail "Failed to copy $bn"
+            touch "$here"/../../dist/"$bn" || fail "Failed to update timestamp on $bn"
+        done
+    done
 ) || fail "Build inside docker container failed"
 
 popd
 
-info "Copying .exe files out of our build directory ..."
-mkdir -p dist/
-files="$FRESH_CLONE_DIR"/contrib/build-wine/dist/*.exe
-for f in $files; do
-    bn=`basename "$f"`
-    cp -fpv "$f" dist/"$bn" || fail "Failed to copy $bn"
-    touch dist/"$bn" || fail "Failed to update timestamp on $bn"
-done
-
 info "Removing $FRESH_CLONE ..."
 $SUDO rm -fr "$FRESH_CLONE"
 
diff --git a/contrib/build-wine/deterministic.spec b/contrib/build-wine/deterministic.spec
@@ -44,7 +44,7 @@ binaries += [('C:/tmp/tor.exe', '.')]
 # Workaround for "Retro Look":
 binaries += [b for b in collect_dynamic_libs('PyQt5') if 'qwindowsvista' in b[0]]
 
-binaries += [('C:/python*/Lib/site-packages/smartcard/scard/_scard.cp*-win32.pyd', '.')]  # Satochip
+binaries += [('C:/python*/Lib/site-packages/smartcard/scard/_scard.*.pyd', '.')]  # Satochip
 
 datas = [
     (home+'electroncash/currencies.json', 'electroncash'),
diff --git a/contrib/build-wine/docker/Dockerfile b/contrib/build-wine/docker/Dockerfile
@@ -16,7 +16,7 @@ RUN echo deb ${UBUNTU_MIRROR} ${UBUNTUDIST} main restricted universe multiverse
     dpkg --add-architecture i386 && \
     apt-get update -q && \
     apt-get install -qy \
-        gnupg2=2.2.27-3ubuntu2.4 \
+        gnupg2=2.2.27-3ubuntu2.5 \
         ca-certificates=20211016 \
         wget=1.21.2-2ubuntu1 \
         git=1:2.34.1-1ubuntu1.15 \
@@ -67,7 +67,7 @@ ARG USER_ID
 ARG GROUP_ID
 
 ENV HOME=/homedir
-ENV WINEARCH=win32
+ENV WINEARCH=win64
 ENV WINEPREFIX=${HOME}/wine
 ENV WINEDEBUG=-all
 
@@ -104,18 +104,18 @@ RUN wget https://aka.ms/vs/16/release/installer -O /tmp/vs_installer.opc && \
         --add "Microsoft.VisualStudio.Component.VC.Tools.x86.x64" \
         --add "Microsoft.VisualStudio.Component.Windows10SDK.19041" && \
     # vswhere.exe needs to be installed in this path so setuptools can detect the VS installation
-    mkdir "${WINEPREFIX}"/"drive_c/Program Files/Microsoft Visual Studio/Installer" && \
-    mv opc/Contents/vswhere.exe "${WINEPREFIX}"/"drive_c/Program Files/Microsoft Visual Studio/Installer" && \
+    mkdir "${WINEPREFIX}"/"drive_c/Program Files (x86)/Microsoft Visual Studio/Installer" && \
+    mv opc/Contents/vswhere.exe "${WINEPREFIX}"/"drive_c/Program Files (x86)/Microsoft Visual Studio/Installer" && \
     rm -rf opc && wineserver -w
 
 #RUN wine "${WINEPREFIX}"/"drive_c/windows/Microsoft.NET/Framework/v4.0.30319/ngen.exe" executequeueditems && \
 #    wineserver -w
 
 # Patch to make vcvarsall.bat work
-# "C:\Program Files\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x86 && set
+# "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x86 && set
 # python -c "from setuptools import msvc; print(msvc.msvc14_get_vc_env('x86'))"
 # Caused by wrong delayed expansion in Wine, see https://bugs.winehq.org/show_bug.cgi?id=38289
-RUN sed -i -e 's/!result:~0,3!/10./g' "${WINEPREFIX}"/"drive_c/Program Files/Microsoft Visual Studio/2019/BuildTools/Common7/Tools/vsdevcmd/core/winsdk.bat"
+RUN sed -i -e 's/!result:~0,3!/10./g' "${WINEPREFIX}"/"drive_c/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/Common7/Tools/vsdevcmd/core/winsdk.bat"
 
 # Clean up some left overs only needed for the Visual Studio installer
 USER 0:0
diff --git a/contrib/build-wine/docker/wrapper_install.bat b/contrib/build-wine/docker/wrapper_install.bat
@@ -1,7 +1,7 @@
 @echo off
 
 set VCYEAR=2019
-set VCDIR=c:\Program Files\Microsoft Visual Studio\%VCYEAR%\BuildTools\VC
+set VCDIR=c:\Program Files (x86)\Microsoft Visual Studio\%VCYEAR%\BuildTools\VC
 
 call "%VCDIR%\Auxiliary\Build\vcvarsall.bat" x86
 
diff --git a/contrib/build-wine/electron-cash.nsi b/contrib/build-wine/electron-cash.nsi
@@ -29,7 +29,11 @@
   OutFile "dist/${INTERNAL_NAME}-setup.exe"
 
   ;Default installation folder
-  InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
+  !if "${GCC_TRIPLET_HOST_ARCH}" == "x86_64"
+    InstallDir "$PROGRAMFILES64\${PRODUCT_NAME}"
+  !else
+    InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
+  !endif
 
   ;Get installation folder from registry if available
   InstallDirRegKey ${INSTDIR_REG_ROOT} "Software\${PRODUCT_NAME}" ""
@@ -105,6 +109,12 @@
 ;--------------------------------
 ;Functions
 
+!macro SetRegView64
+  !if "${GCC_TRIPLET_HOST_ARCH}" == "x86_64"
+    SetRegView 64 ; Use the 64-bit registry view
+  !endif
+!macroend
+
 !macro CreateEnsureNotRunning prefix operation
 
 Function ${prefix}EnsureNotRunning
@@ -164,6 +174,7 @@ Function .onInit
 FunctionEnd
 
 Section
+  !insertmacro SetRegView64
   SetOutPath $INSTDIR ; side-effect is it creates dir if not exist
 
   !insertmacro UNINSTALL.LOG_OPEN_INSTALL
@@ -236,6 +247,8 @@ SectionEnd
 ;Uninstaller Section
 
 Section "Uninstall"
+  !insertmacro SetRegView64
+
   !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR"
 
   Delete "$DESKTOP\${PRODUCT_NAME}.lnk"
diff --git a/contrib/make_openssl b/contrib/make_openssl
@@ -32,7 +32,12 @@ if ! [ -d dist ] ; then
                 ./Configure darwin64-$(uname -m)-cc --prefix="$here/$pkgname/dist" $CONFIG_OPTIONS
                 ;;
             wine)
-                ./Configure --cross-compile-prefix=${GCC_TRIPLET_HOST}- mingw --prefix="$here/$pkgname/dist" $CONFIG_OPTIONS
+                case "${GCC_TRIPLET_HOST_ARCH:-${GCC_TRIPLET_HOST%%-*}}" in
+                    x86_64) OPENSSL_TARGET="mingw64" ;;
+                    i686)   OPENSSL_TARGET="mingw" ;;
+                    *)      fail "Unknown architecture for OpenSSL: $GCC_TRIPLET_HOST" ;;
+                esac
+                ./Configure --cross-compile-prefix="$GCC_TRIPLET_HOST"- $OPENSSL_TARGET --prefix="$here/$pkgname/dist" $CONFIG_OPTIONS
                 ;;
         esac
     ) || fail "Could not configure $pkgname. Please make sure you have a C compiler installed and try again."
