Add missing cmake patch

Reviewed-on: #6
Reviewed-by: Rafal Kupiec <belliash@noreply.codingworkshop.git>
Co-authored-by: Aiken Harris <harraiken@noreply.codingworkshop.git>
Co-committed-by: Aiken Harris <harraiken@noreply.codingworkshop.git>

.gitignore

@@ -0,0 +1,3 @@
+binaries/*
+sources/*
+xtchain-*.zst

README.md

@@ -5,14 +5,17 @@
   <a href="https://git.codingworkshop.eu.org/xt-sys/xtchain/actions">
     <img alt="Build Status" src="https://codingworkshop.eu.org/actions.php?project=xt-sys/xtchain">
   </a>
+  <a href="https://github.com/xt-sys/xtchain/releases">
+    <img alt="Releases" src="https://img.shields.io/github/v/release/xt-sys/xtchain?label=Release&amp;color=blueviolet">
+  </a>
   <a href="https://git.codingworkshop.eu.org/xt-sys/xtchain/src/branch/master/COPYING.md">
     <img alt="License" src="https://img.shields.io/badge/License-GPLv3-blue.svg">
   </a>
   <a href="https://github.com/sponsors/xt-sys/">
     <img alt="Sponsors" src="https://img.shields.io/badge/Sponsor-%E2%9D%A4-red?logo=GitHub">
   </a>
-  <a href="https://discord.com/invite/3zgjQDVmAe">
-    <img alt="Discord" src="https://img.shields.io/discord/723186294540206100?label=Chat">
+  <a href="https://discord.com/invite/zBzJ5qMGX7">
+    <img alt="Discord" src="https://img.shields.io/badge/Chat-Join%20Discord-success">
   </a>
 </p>
 

build-linux.sh

@@ -16,24 +16,19 @@ WRKDIR="$(pwd)"
 ARCHS="aarch64 armv7 i686 x86_64"
 GENERIC="generic-w64-mingw32"
 
-# Binutils Settings
-BINUTILSDIR="${SRCDIR}/binutils"
-BINUTILSTAG="binutils-2_40"
-BINUTILSVCS="git://sourceware.org/git/binutils-gdb.git"
-
 # CMake Settings
 CMAKEDIR="${SRCDIR}/cmake"
-CMAKETAG="v3.24.2"
+CMAKETAG="v3.31.3"
 CMAKEVCS="https://gitlab.kitware.com/cmake/cmake.git"
 
 # LLVM Settings
 LLVMDIR="${SRCDIR}/llvm"
-LLVMTAG="llvmorg-17.0.1"
+LLVMTAG="llvmorg-19.1.6"
 LLVMVCS="https://github.com/llvm/llvm-project.git"
 
 # Make Settings
 MAKEDIR="${SRCDIR}/make"
-MAKETAG="4.3"
+MAKETAG="4.4.1"
 MAKEVCS="git://git.savannah.gnu.org/make"
 
 # Mingw-w64 Settings
@@ -45,13 +40,13 @@ MINGWVCS="https://github.com/mirror/mingw-w64.git"
 
 # Ninja Settings
 NINJADIR="${SRCDIR}/ninja"
-NINJATAG="v1.11.0"
+NINJATAG="v1.12.1"
 NINJAVCS="https://github.com/ninja-build/ninja.git"
 
 # Wine Settings
 WINEDIR="${SRCDIR}/wine"
-WINETAG="wine-7.9"
-WINEVCS="git://source.winehq.org/git/wine.git"
+WINETAG="wine-9.8"
+WINEVCS="https://github.com/wine-mirror/wine.git"
 
 
 # This function applies a patches to the 3rd party project
@@ -79,51 +74,6 @@ apply_patches()
     fi
 }
 
-# This function compiles and installs GNU BINUTILS
-binutils_build()
-{
-    echo ">>> Building BINUTILS ..."
-    for ARCH in ${ARCHS}; do
-        [ -z ${CLEAN} ] || rm -rf ${BINUTILSDIR}/build-${ARCH}
-        mkdir -p ${BINUTILSDIR}/build-${ARCH}
-        cd ${BINUTILSDIR}/build-${ARCH}
-        case ${ARCH} in
-            "armv7")
-                TARGET="arm"
-                ;;
-            *)
-                TARGET="${ARCH}"
-                ;;
-        esac
-        ../configure \
-            --target=${TARGET}-w64-mingw32 \
-            --disable-binutils \
-            --disable-gdb \
-            --disable-gprof \
-            --disable-ld \
-            --disable-multilib \
-            --disable-nls \
-            --disable-werror \
-            --with-zlib=yes
-        make -j${CORES}
-        cp ${BINUTILSDIR}/build-${ARCH}/gas/as-new ${BINDIR}/bin/${ARCH}-w64-mingw32-gas
-    done
-    cd ${WRKDIR}
-}
-
-# This function downloads GNU BINUTILS from VCS
-binutils_fetch()
-{
-    if [ ! -d ${BINUTILSDIR} ]; then
-        echo ">>> Downloading BINUTILS ..."
-        git clone ${BINUTILSVCS} ${BINUTILSDIR}
-        cd ${BINUTILSDIR}
-        git checkout tags/${BINUTILSTAG}
-        apply_patches ${BINUTILSDIR##*/} ${BINUTILSTAG##*-}
-        cd ${WRKDIR}
-    fi
-}
-
 # This function compiles and installs CMAKE
 cmake_build()
 {
@@ -145,9 +95,8 @@ cmake_fetch()
 {
     if [ ! -d ${CMAKEDIR} ]; then
         echo ">>> Downloading CMAKE ..."
-        git clone ${CMAKEVCS} ${CMAKEDIR}
+        git clone --depth 1 --branch ${CMAKETAG} ${CMAKEVCS} ${CMAKEDIR}
         cd ${CMAKEDIR}
-        git checkout tags/${CMAKETAG}
         apply_patches ${CMAKEDIR##*/} ${CMAKETAG}
         cd ${WRKDIR}
     fi
@@ -282,9 +231,8 @@ llvm_fetch()
 {
     if [ ! -d ${LLVMDIR} ]; then
         echo ">>> Downloading LLVM ..."
-        git clone ${LLVMVCS} ${LLVMDIR}
+        git clone --depth 1 --branch ${LLVMTAG} ${LLVMVCS} ${LLVMDIR}
         cd ${LLVMDIR}
-        git checkout tags/${LLVMTAG}
         apply_patches ${LLVMDIR##*/} ${LLVMTAG##*-}
         cd ${WRKDIR}
     fi
@@ -319,9 +267,8 @@ make_fetch()
 {
     if [ ! -d ${MAKEDIR} ]; then
         echo ">>> Downloading Make ..."
-        git clone ${MAKEVCS} ${MAKEDIR}
+        git clone --depth 1 --branch ${MAKETAG} ${MAKEVCS} ${MAKEDIR}
         cd ${MAKEDIR}
-        git checkout tags/${MAKETAG}
         apply_patches ${MAKEDIR##*/} ${MAKETAG}
         cd ${WRKDIR}
     fi
@@ -416,7 +363,7 @@ mingw_build_libs()
 # This function compiles and installs MINGW tools
 mingw_build_tools()
 {
-    for TOOL in gendef genidl genlib genpeimg widl; do
+    for TOOL in gendef genidl genpeimg widl; do
         for ARCH in ${ARCHS}; do
             echo ">>> Building Mingw-w64 (tools) for ${ARCH} ..."
             [ -z ${CLEAN} ] || rm -rf ${MINGWDIR}/mingw-w64-tools/${TOOL}/build-${ARCH}
@@ -440,11 +387,8 @@ mingw_fetch()
 {
     if [ ! -d ${MINGWDIR} ]; then
         echo ">>> Downloading MinGW-w64 ..."
-        git clone ${MINGWVCS} ${MINGWDIR}
+        git clone --depth 1 --branch ${MINGWTAG} ${MINGWVCS} ${MINGWDIR}
         cd ${MINGWDIR}
-        if [ x"${MINGWTAG}" != x"master" ]; then
-            git checkout tags/${MINGWTAG}
-        fi
         apply_patches ${MINGWDIR##*/} ${MINGWTAG}
         cd ${WRKDIR}
     fi
@@ -467,9 +411,8 @@ ninja_fetch()
 {
     if [ ! -d ${NINJADIR} ]; then
         echo ">>> Downloading NINJA ..."
-        git clone ${NINJAVCS} ${NINJADIR}
+        git clone --depth 1 --branch ${NINJATAG} ${NINJAVCS} ${NINJADIR}
         cd ${NINJADIR}
-        git checkout tags/${NINJATAG}
         apply_patches ${NINJADIR##*/} ${NINJATAG}
         cd ${WRKDIR}
     fi
@@ -502,9 +445,8 @@ wine_fetch()
 {
     if [ ! -d ${WINEDIR} ]; then
         echo ">>> Downloading WINE ..."
-        git clone ${WINEVCS} ${WINEDIR}
+        git clone --depth 1 --branch ${WINETAG} ${WINEVCS} ${WINEDIR}
         cd ${WINEDIR}
-        git checkout tags/${WINETAG}
         apply_patches ${WINEDIR##*/} ${WINETAG##*-}
         cd ${WRKDIR}
     fi
@@ -528,7 +470,7 @@ xtchain_build()
         for EXEC in dlltool ld objdump; do
             ln -sf ../${GENERIC}/bin/${EXEC}-wrapper ${BINDIR}/bin/${ARCH}-w64-mingw32-${EXEC}
         done
-        for EXEC in exetool windres xtcspecc; do
+        for EXEC in bin2c exetool windres xtcspecc; do
             if [ ! -e ${BINDIR}/bin/${EXEC} ]; then
                 gcc ${WRKDIR}/tools/${EXEC}.c -o ${BINDIR}/bin/${EXEC}
             fi
@@ -584,12 +526,6 @@ mingw_build_libs
 # Build and install Mingw-W64 tools
 mingw_build_tools
 
-# Download Binutils
-binutils_fetch
-
-# Build and install Binutils
-binutils_build
-
 # Download Wine
 wine_fetch
 

patches/binutils/2_40/001-fix-compilation.patch

@@ -1,32 +0,0 @@
-diff --git a/gas/Makefile.in b/gas/Makefile.in
-index 8319181b472..e4386b38621 100644
---- a/gas/Makefile.in
-+++ b/gas/Makefile.in
-@@ -2231,7 +2231,7 @@ de-stage3:
- 
- doc/asconfig.texi: doc/$(CONFIG).texi doc/$(am__dirstamp)
- 	$(AM_V_at)rm -f doc/asconfig.texi
--	$(AM_V_GEN)cp $(srcdir)/doc/$(CONFIG).texi doc/asconfig.texi
-+	$(AM_V_GEN)cp -p $(srcdir)/doc/$(CONFIG).texi doc/asconfig.texi
- 	$(AM_V_at)chmod u+w doc/asconfig.texi
- 
- # Maintenance
-diff --git a/gas/doc/.dirstamp b/gas/doc/.dirstamp
-deleted file mode 100644
-index e69de29bb2d..00000000000
-diff --git a/gas/doc/local.mk b/gas/doc/local.mk
-index f611a50913c..de13e3ca8b8 100644
---- a/gas/doc/local.mk
-+++ b/gas/doc/local.mk
-@@ -41,7 +41,7 @@ TEXI2DVI = texi2dvi -I "$(srcdir)/%D%" -I %D% -I "$(srcdir)/../libiberty" \
- 
- %D%/asconfig.texi: %D%/$(CONFIG).texi %D%/$(am__dirstamp)
- 	$(AM_V_at)rm -f %D%/asconfig.texi
--	$(AM_V_GEN)cp $(srcdir)/%D%/$(CONFIG).texi %D%/asconfig.texi
-+	$(AM_V_GEN)cp -p $(srcdir)/%D%/$(CONFIG).texi %D%/asconfig.texi
- 	$(AM_V_at)chmod u+w %D%/asconfig.texi
- 
- CPU_DOCS = \
--- 
-2.39.2
-

patches/binutils/2_40/002-add-arm-architectures.patch

@@ -1,60 +0,0 @@
-From ec231dd4c9ceb09140178b79e30ed0917bb2c955 Mon Sep 17 00:00:00 2001
-From: belliash <belliash@codingworkshop.eu.org>
-Date: Sat, 25 Mar 2023 19:33:33 +0100
-Subject: [PATCH] test2
-
----
- bfd/config.bfd    | 8 +++++++-
- gas/configure.tgt | 3 ++-
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/bfd/config.bfd b/bfd/config.bfd
-index 1b0111fd410..ada7889d362 100644
---- a/bfd/config.bfd
-+++ b/bfd/config.bfd
-@@ -249,7 +249,7 @@ case "${targ}" in
-     targ_selvecs="aarch64_elf64_be_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_le_vec arm_elf32_be_vec aarch64_pei_le_vec aarch64_pe_le_vec"
-     want64=true
-     ;;
--  aarch64-*-pe*)
-+  aarch64-*-pe* | aarch64-*-mingw32)
-     targ_defvec=aarch64_pe_le_vec
-     targ_selvecs="aarch64_pe_le_vec aarch64_pei_le_vec"
-     want64=true
-@@ -409,6 +409,12 @@ case "${targ}" in
-     targ_selvecs="arm_pe_le_vec arm_pe_be_vec arm_pei_le_vec arm_pei_be_vec"
-     targ_underscore=yes
-     ;;
-+  arm-*-mingw32)
-+    targ_defvec=arm_pe_le_vec
-+    targ_selvecs="arm_pe_le_vec arm_pe_be_vec arm_pei_le_vec arm_pei_be_vec"
-+    targ_underscore=no
-+    targ_cflags="-DARM_COFF_BUGFIX"
-+    ;;
-   arm-*-phoenix*)
-     targ_defvec=arm_elf32_le_vec
-     targ_selvecs=arm_elf32_be_vec
-diff --git a/gas/configure.tgt b/gas/configure.tgt
-index 765ba73633d..9bfef1f72e8 100644
---- a/gas/configure.tgt
-+++ b/gas/configure.tgt
-@@ -136,6 +136,7 @@ case ${generic_target} in
-   aarch64*-*-netbsd*)			fmt=elf em=nbsd;;
-   aarch64*-*-openbsd*)			fmt=elf;;
-   aarch64*-*-pe*)			fmt=coff em=pepaarch64 ;;
-+  aarch64*-*-mingw32)		fmt=coff em=pepaarch64 ;;
-   alpha-*-*vms*)			fmt=evax ;;
-   alpha-*-osf*)				fmt=ecoff ;;
-   alpha-*-linux*ecoff*)			fmt=ecoff ;;
-@@ -163,7 +164,7 @@ case ${generic_target} in
-   arm-*-nto*)				fmt=elf ;;
-   arm-wince-pe | arm-*-wince | arm*-*-mingw32ce* | arm*-*-cegcc*)
- 					fmt=coff em=wince-pe ;;
--  arm-*-pe)				fmt=coff em=pe ;;
-+  arm-*-pe | arm-*-mingw32)	fmt=coff em=pe ;;
-   arm-*-fuchsia*)			fmt=elf ;;
-   arm-*-haiku*)				fmt=elf em=haiku ;;
- 
--- 
-2.39.2
-

patches/make/4.3/001-fix-find_in_given_path.patch

@@ -1,13 +0,0 @@
-diff --git a/src/job.c b/src/job.c
-index d6e28d3..f8f6950 100644
---- a/src/job.c
-+++ b/src/job.c
-@@ -2391,7 +2391,7 @@ child_execute_job (struct childbase *child, int good_stdin, char **argv)
-           }
-       }
- 
--    cmd = (char *)find_in_given_path (argv[0], p, 0);
-+    cmd = (char *)find_in_given_path (argv[0], p, 0, false);
-   }
- 
-   if (!cmd)

scripts/xtclib

@@ -51,6 +51,19 @@ chbuild()
 }
 export -f chbuild
 
+# Prints help
+help()
+{
+	version
+	echo "XTChain defines an internal list of commands:"
+	echo " * charch [arch]   - sets the target CPU architecture [aarch64/armv7/i686/amd64]"
+	echo " * chbuild [type]  - sets build type [debug/release]"
+	echo " * help            - prints this message"
+	echo " * version         - prints XTChain and its components version"
+	echo " * xbuild          - builds an application with a Ninja build system"
+}
+export -f help
+
 # Displays version banner
 version()
 {
@@ -66,9 +79,26 @@ version()
     echo "Wine Message Compiler Version: $(${XTCDIR}/bin/wmc -V | grep 'version' | cut -d' ' -f5)"
     echo "Wine Resource Compiler Version: $(${XTCDIR}/bin/wrc --version | grep 'version' | cut -d' ' -f5)"
     echo
-    charch ${TARGET}
-    chbuild DEBUG
+    charch ${TARGET:-amd64}
+    chbuild ${BUILD_TYPE:-DEBUG}
     echo
     echo
 }
 export -f version
+
+# Builds application (wrapper to Ninja)
+xbuild()
+{
+	if [ ! -f build.arch ]; then
+		ninja "$@"
+	else
+		ARCH=$(cat build.arch)
+		if [ x"${ARCH}" != x"${TARGET}" ]; then
+			echo "Build is configured for '${ARCH}' while current target set to '${TARGET}'!"
+			echo "Cannot continue until conflict is resolved ..."
+			return 1
+		fi
+		ninja "$@"
+	fi
+}
+export -f xbuild

tools/bin2c.c

@@ -0,0 +1,74 @@
+/**
+ * PROJECT:     XTchain
+ * LICENSE:     See COPYING.md in the top level directory
+ * FILE:        tools/bin2c.c
+ * DESCRIPTION: Binary to C converter
+ * DEVELOPERS:  Rafal Kupiec <belliash@codingworkshop.eu.org>
+ */
+
+#include "xtchain.h"
+
+int main(int argc, char *argv[])
+{
+    /* Check for proper number of arguments */
+    if(argc != 4)
+    {
+        printf("Usage: %s <input binary> <output file> <structure name>\n", argv[0]);
+        return 1;
+    }
+
+    /* Open the input binary file in binary mode */
+    FILE *inputFile = fopen(argv[1], "rb");
+    if(inputFile == NULL)
+    {
+        printf("Error: unable to open file %s\n", argv[1]);
+        return 1;
+    }
+
+    /* Open the destination source code file in text mode */
+    FILE *outputFile = fopen(argv[2], "w");
+    if(outputFile == NULL)
+    {
+        printf("Error: unable to open file %s\n", argv[2]);
+        fclose(inputFile);
+        return 1;
+    }
+
+    /* Get the size of the binary file */
+    fseek(inputFile, 0, SEEK_END);
+    long binSize = ftell(inputFile);
+    rewind(inputFile);
+
+    /* Allocate memory for the binary data */
+    unsigned char *binData = (unsigned char *)malloc(binSize);
+    if(binData == NULL)
+    {
+        printf("Error: unable to allocate memory for binary data\n");
+        fclose(inputFile);
+        fclose(outputFile);
+        return 1;
+    }
+
+    /* Read the binary data into memory */
+    fread(binData, sizeof(unsigned char), binSize, inputFile);
+
+    /* Write the C structure to the header file */
+    fprintf(outputFile, "unsigned char %s[] = {", argv[3]);
+    for(int i = 0; i < binSize; i++)
+    {
+        fprintf(outputFile, "0x%02X", binData[i]);
+        if(i < binSize - 1)
+        {
+            fprintf(outputFile, ",");
+        }
+    }
+    fprintf(outputFile, "};\nunsigned int %s_size = %ld;\n", argv[3], binSize);
+    free(binData);
+
+    /* Close all open files */
+    fclose(inputFile);
+    fclose(outputFile);
+
+    printf("Binary data converted to C structure successfully.\n");
+    return 0;
+}

tools/exetool.c

@@ -2,7 +2,7 @@
  * PROJECT:     XTchain
  * LICENSE:     See COPYING.md in the top level directory
  * FILE:        tools/exetool.c
- * DESCRIPTION: Portable Executable (PE) utility for changing subsystem
+ * DESCRIPTION: Portable Executable (PE) utility for changing its signature and subsystem
  * DEVELOPERS:  Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
@@ -15,6 +15,7 @@ typedef struct _PE_SUBSYSTEM
 } PE_SUBSYSTEM, *PPE_SUBSYSTEM;
 
 static PE_SUBSYSTEM SubSystems[] = {
+    {0x00, "INVALID_SUBSYSTEM"},
     {0x01, "NT_NATIVE"},
     {0x02, "WINDOWS_GUI"},
     {0x03, "WINDOWS_CLI"},
@@ -37,7 +38,7 @@ static PE_SUBSYSTEM SubSystems[] = {
     {0x19, "XT_APPLICATION_GDI"}
 };
 
-int getSubSystemID(char *Name)
+PPE_SUBSYSTEM getSubSystem(char *Name)
 {
     int Index;
     int SubSystemsCount;
@@ -50,15 +51,39 @@ int getSubSystemID(char *Name)
     for(Index = 0; Index < SubSystemsCount; Index++)
     {
         SubSystem = &SubSystems[Index];
-        if(strcmp(SubSystem->Name, Name) == 0)
+        if(strcasecmp(SubSystem->Name, Name) == 0)
         {
             /* Subsystem found, return its ID */
-            return SubSystem->Identifier;
+            return SubSystem;
         }
     }
 
 	/* No valid subsystem found */
-    return 0x00;
+    return &SubSystems[0];
+}
+
+char *getSubSystemName(int Identifier)
+{
+    int Index;
+    int SubSystemsCount;
+    PPE_SUBSYSTEM SubSystem;
+
+    /* Count number of subsystems avaialble */
+    SubSystemsCount = sizeof(SubSystems) / sizeof(PE_SUBSYSTEM);
+
+    /* Find subsystem */
+    for(Index = 0; Index < SubSystemsCount; Index++)
+    {
+        SubSystem = &SubSystems[Index];
+        if(SubSystem->Identifier == Identifier)
+        {
+            /* Subsystem found, return its ID */
+            return SubSystem->Name;
+        }
+    }
+
+	/* No valid subsystem found */
+    return SubSystems[0].Name;
 }
 
 int main(int argc, char *argv[])
@@ -66,8 +91,9 @@ int main(int argc, char *argv[])
     FILE *ExeFile;
     unsigned char Signature[4];
     unsigned int HeaderOffset;
+    unsigned int ImageSignature;
     unsigned short SubSystem;
-    int NewSubSystem;
+    PPE_SUBSYSTEM NewSubSystem;
 
     /* Check for proper number of arguments */
     if(argc != 3)
@@ -76,13 +102,22 @@ int main(int argc, char *argv[])
         return 1;
     }
 
+    /* Parse the new SubSystem value from the command line argument */
+    NewSubSystem = getSubSystem(argv[2]);
+    if(NewSubSystem->Identifier == 0)
+    {
+        /* Invalid SubSystem provided */
+        printf("Error: %s is not a valid PE SubSystem\n", argv[2]);
+        return 1;
+    }
+
     /* Open the EXE file in binary mode */
     ExeFile = fopen(argv[1], "r+b");
     if(ExeFile == NULL)
     {
         /* Failed to open PE file */
         printf("ERROR: Unable to open file %s\n", argv[1]);
-        return 1;
+        return 2;
     }
     
     /* Verify that the input file has a valid DOS header */
@@ -92,7 +127,7 @@ int main(int argc, char *argv[])
         /* Invalid DOS header */
         printf("ERROR: %s is not a valid EXE file\n", argv[1]);
         fclose(ExeFile);
-        return 1;
+        return 3;
     }
 
     /* Verify that the input file has a valid PE header */
@@ -100,43 +135,48 @@ int main(int argc, char *argv[])
     fread(&HeaderOffset, sizeof(unsigned int), 1, ExeFile);
     fseek(ExeFile, HeaderOffset, SEEK_SET);
     fread(Signature, sizeof(unsigned char), 4, ExeFile);
-    if(Signature[0] != 'P' || Signature[1] != 'E' || Signature[2] != 0 || Signature[3] != 0)
+    if((Signature[0] != 'P' || Signature[1] != 'E' || Signature[2] != 0 || Signature[3] != 0) &&
+       (Signature[0] != 'P' || Signature[1] != 'E' || Signature[2] != 'X' || Signature[3] != 'T'))
     {
         /* Invalid PE header */
         printf("Error: %s is not a valid PE file\n", argv[1]);
         fclose(ExeFile);
-        return 1;
+        return 3;
     }
 
+    /* Check if setting XT subsystem */
+    if(NewSubSystem->Identifier >= 0x14 && NewSubSystem->Identifier <= 0x19)
+    {
+        /* Write PEXT signature */
+        ImageSignature = 0x54584550;
+    }
+    else
+    {
+        /* Write PE00 signature */
+        ImageSignature = 0x00004550;
+    }
+
+    /* Seek back to header offset and write new signature */
+    fseek(ExeFile, HeaderOffset, SEEK_SET);
+    fwrite(&ImageSignature, sizeof(ImageSignature), 1, ExeFile);
+
     /* Seek to the offset of the SubSystem field in the optional header */
     fseek(ExeFile, HeaderOffset + 0x5C, SEEK_SET);
 
     /* Read the current SubSystem value */
     fread(&SubSystem, sizeof(unsigned short), 1, ExeFile);
-    printf("Original SubSystem: 0x%04X\n", SubSystem);
-
-    /* Parse the new SubSystem value from the command line argument */
-    NewSubSystem = getSubSystemID(argv[2]);
-    if(NewSubSystem == 0)
-    {
-        /* Invalid SubSystem provided */
-        printf("Error: %s is not a valid PE SubSystem\n", argv[2]);
-        return 1;
-    }
-
-    /* Print new SubSystem identifier */
-    printf("New SubSystem: 0x%04X\n", NewSubSystem);
 
     /* Seek back to the SubSystem field in the optional header */
     fseek(ExeFile, -sizeof(unsigned short), SEEK_CUR);
 
     /* Write the new SubSystem value */
-    fwrite(&NewSubSystem, sizeof(unsigned short), 1, ExeFile);
+    fwrite(&NewSubSystem->Identifier, sizeof(unsigned short), 1, ExeFile);
 
     /* Close the file */
     fclose(ExeFile);
 
     /* Finished successfully */
-    printf("SubSystem successfully modified!\n");
+    printf("PE SubSystem modified: 0x%02X <%s> to 0x%02X <%s>\n",
+           SubSystem, getSubSystemName(SubSystem), NewSubSystem->Identifier, NewSubSystem->Name);
     return 0;
 }

tools/windres.c

@@ -169,9 +169,9 @@ void check_num_args(int arg,
 int main(int argc,
          char* argv[])
 {
-    const char *dir;
-    const char *basename;
-    const char *target;
+    char *dir;
+    char *basename;
+    char *target;
 
     split_argv(argv[0], &dir, &basename, &target, NULL);