From 8999a04fd671df12d7e3c9447d45d681a5f9b35f Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Tue, 27 Aug 2024 08:01:50 +1000
Subject: [PATCH] Updated cmd-launch-association patchset

Re-enabled.
---
 ...cmd-Changed-errorlevel-type-to-DWORD.patch | 55 -------------------
 patches/cmd-launch-association/definition     |  1 -
 2 files changed, 56 deletions(-)
 delete mode 100644 patches/cmd-launch-association/0003-cmd-Changed-errorlevel-type-to-DWORD.patch

diff --git a/patches/cmd-launch-association/0003-cmd-Changed-errorlevel-type-to-DWORD.patch b/patches/cmd-launch-association/0003-cmd-Changed-errorlevel-type-to-DWORD.patch
deleted file mode 100644
index 12c1ae71..00000000
--- a/patches/cmd-launch-association/0003-cmd-Changed-errorlevel-type-to-DWORD.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 5d1a7ff33160080ad2aca22f689c5b4b446837d8 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Tue, 18 Jun 2024 09:14:56 +1000
-Subject: [PATCH] cmd: Changed errorlevel type to DWORD
-
-This stop the invalid type being passed to GetExitCodeProcess which is being reported
-as an error with clang/mingw in the latest version.
----
- programs/cmd/builtins.c | 2 +-
- programs/cmd/wcmd.h     | 2 +-
- programs/cmd/wcmdmain.c | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
-index 1e92e88d191..9b8cfd389b9 100644
---- a/programs/cmd/builtins.c
-+++ b/programs/cmd/builtins.c
-@@ -442,7 +442,7 @@ RETURN_CODE WCMD_choice (const WCHAR * args)
-                 SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), oldmode);
- 
-             errorlevel = (ptr - opt_c) + 1;
--            TRACE("answer: %d\n", errorlevel);
-+            TRACE("answer: %ld\n", errorlevel);
-             free(my_command);
-             return errorlevel;
-         }
-diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h
-index 6c76070338c..d750aca5572 100644
---- a/programs/cmd/wcmd.h
-+++ b/programs/cmd/wcmd.h
-@@ -336,7 +336,7 @@ void WCMD_set_for_loop_variable(int var_idx, const WCHAR *value);
-  * variables and batch parameters substitution already done.
-  */
- extern WCHAR quals[MAXSTRING], param1[MAXSTRING], param2[MAXSTRING];
--extern int errorlevel;
-+extern DWORD errorlevel;
- extern BATCH_CONTEXT *context;
- extern FOR_CONTEXT *forloopcontext;
- extern BOOL delayedsubst;
-diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
-index 2df0d7c53d3..095be784f2c 100644
---- a/programs/cmd/wcmdmain.c
-+++ b/programs/cmd/wcmdmain.c
-@@ -36,7 +36,7 @@ extern const WCHAR inbuilt[][10];
- extern struct env_stack *pushd_directories;
- 
- BATCH_CONTEXT *context = NULL;
--int errorlevel;
-+DWORD errorlevel;
- WCHAR quals[MAXSTRING], param1[MAXSTRING], param2[MAXSTRING];
- BOOL  interactive;
- FOR_CONTEXT *forloopcontext; /* The 'for' loop context */
--- 
-2.43.0
-
diff --git a/patches/cmd-launch-association/definition b/patches/cmd-launch-association/definition
index 57228f03..6bf85b4c 100644
--- a/patches/cmd-launch-association/definition
+++ b/patches/cmd-launch-association/definition
@@ -1,2 +1 @@
 Fixes: [18154] cmd: Support for launching programs based on file association
-Disabled: True