Rebase against c1d5cae54b80449308dd8f9aaa85a1a6a5bd2025.

This commit is contained in:
Alistair Leslie-Hughes 2024-07-11 08:13:42 +10:00
parent d2c868d8c9
commit 1f498520be
3 changed files with 13 additions and 12 deletions

View File

@ -1 +1,2 @@
Fixes: [18154] cmd: Support for launching programs based on file association
Disabled: True

View File

@ -1,4 +1,4 @@
From 8ed97a5ccc82d6d55cca547d201bffee52094505 Mon Sep 17 00:00:00 2001
From be1665ad0d88598c409f6a1d699562c2dd0d525a Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Wed, 29 May 2019 16:01:45 -0600
Subject: [PATCH] wcmd: Add junction point support to mklink.
@ -9,7 +9,7 @@ Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
1 file changed, 47 insertions(+), 1 deletion(-)
diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index 9b8cfd389b9..fd4b024d59a 100644
index 5b15c0f397a..6d7512275ce 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -31,6 +31,9 @@
@ -22,7 +22,7 @@ index 9b8cfd389b9..fd4b024d59a 100644
WINE_DEFAULT_DEBUG_CHANNEL(cmd);
@@ -4096,6 +4099,49 @@ RETURN_CODE WCMD_color(void)
@@ -4091,6 +4094,49 @@ RETURN_CODE WCMD_color(void)
return errorlevel = return_code;
}
@ -72,15 +72,15 @@ index 9b8cfd389b9..fd4b024d59a 100644
/****************************************************************************
* WCMD_mklink
*/
@@ -4144,7 +4190,7 @@ void WCMD_mklink(WCHAR *args)
else if(!junction)
ret = CreateSymbolicLinkW(file1, file2, isdir);
else
- WINE_TRACE("Juction links currently not supported.\n");
+ ret = WCMD_create_junction(file1, file2);
@@ -4141,7 +4187,7 @@ RETURN_CODE WCMD_mklink(WCHAR *args)
else if(!junction)
ret = CreateSymbolicLinkW(file1, file2, isdir);
else
- TRACE("Junction links currently not supported.\n");
+ ret = WCMD_create_junction(file1, file2);
}
if(!ret)
WCMD_output_stderr(WCMD_LoadMessage(WCMD_READFAIL), file1);
if (ret) return errorlevel = NO_ERROR;
--
2.43.0

View File

@ -1 +1 @@
8179609faddee580621529f8b1fffba9a50fb650
c1d5cae54b80449308dd8f9aaa85a1a6a5bd2025