wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Updated fsutil-Stub_Program patchset

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2019-08-16 20:08:23 +10:00
parent 924665da6f
commit 010c308abd
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
patches/fsutil-Stub_Program/0001-fsutil-Add-fsutil-program-with-support-for-creating-.patch
View File

@ -1,27 +1,26 @@
From 7edfe7dd563c746ab2eb896b36dc9f6cafb13a91 Mon Sep 17 00:00:00 2001
From 8289235edb964f494c221044e36f2ea4294721ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 1 Apr 2016 01:29:51 +0200
Subject: [PATCH] fsutil: Add fsutil program with support for creating hard
links.
---
programs/fsutil/Makefile.in | 5 +-
programs/fsutil/Makefile.in | 3 +
programs/fsutil/fsutil.rc | 34 ++++++++++
programs/fsutil/main.c | 131 ++++++++++++++++++++++++++++++++++--
programs/fsutil/main.c | 130 ++++++++++++++++++++++++++++++++++--
programs/fsutil/resources.h | 25 +++++++
4 files changed, 188 insertions(+), 7 deletions(-)
4 files changed, 186 insertions(+), 6 deletions(-)
create mode 100644 programs/fsutil/fsutil.rc
create mode 100644 programs/fsutil/resources.h
diff --git a/programs/fsutil/Makefile.in b/programs/fsutil/Makefile.in
index 64307e83a..1cc7f87e2 100644
index 64307e83ac..e10bd433ba 100644
--- a/programs/fsutil/Makefile.in
+++ b/programs/fsutil/Makefile.in
@@ -1,6 +1,9 @@
MODULE = fsutil.exe
-EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
+EXTRADLLFLAGS = -mconsole -municode
EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
+IMPORTS = user32
C_SRCS = \
@ -30,7 +29,7 @@ index 64307e83a..1cc7f87e2 100644
+RC_SRCS = fsutil.rc
diff --git a/programs/fsutil/fsutil.rc b/programs/fsutil/fsutil.rc
new file mode 100644
index 000000000..593f8175a
index 0000000000..593f8175a2
--- /dev/null
+++ b/programs/fsutil/fsutil.rc
@@ -0,0 +1,34 @@
@ -69,7 +68,7 @@ index 000000000..593f8175a
+ STRING_HARDLINK_CREATE_USAGE, "Syntax: fsutil hardlink create old new\n\n"
+}
diff --git a/programs/fsutil/main.c b/programs/fsutil/main.c
index 2bce87edc..508419682 100644
index 2bce87edc8..6f7974ad1d 100644
--- a/programs/fsutil/main.c
+++ b/programs/fsutil/main.c
@@ -1,5 +1,6 @@
@ -79,13 +78,12 @@ index 2bce87edc..508419682 100644
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -16,18 +17,136 @@
@@ -16,18 +17,135 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "wine/debug.h"
+#include <windows.h>
+#include <wine/unicode.h>
+#include <wine/debug.h>
+
+#include "resources.h"
@ -179,7 +177,7 @@ index 2bce87edc..508419682 100644
+
+ if (argc > 2)
+ {
+ if (!strcmpiW(argv[2], createW))
+ if (!_wcsicmp(argv[2], createW))
+ return create_hardlink(argc, argv);
+ else
+ {
@ -209,7 +207,7 @@ index 2bce87edc..508419682 100644
- return 0;
+ if (argc > 1)
+ {
+ if (!strcmpiW(argv[1], hardlinkW))
+ if (!_wcsicmp(argv[1], hardlinkW))
+ return hardlink(argc, argv);
+ else
+ {
@ -224,7 +222,7 @@ index 2bce87edc..508419682 100644
}
diff --git a/programs/fsutil/resources.h b/programs/fsutil/resources.h
new file mode 100644
index 000000000..b85826ac4
index 0000000000..b85826ac42
--- /dev/null
+++ b/programs/fsutil/resources.h
@@ -0,0 +1,25 @@
@ -254,5 +252,5 @@ index 000000000..b85826ac4
+#define STRING_HARDLINK_USAGE 104
+#define STRING_HARDLINK_CREATE_USAGE 105
--
2.21.0
2.23.0.rc1