You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against 0fe003435e90dc32dd405a62af8fbcc20afc925d
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 8289235edb964f494c221044e36f2ea4294721ae Mon Sep 17 00:00:00 2001
|
||||
From b0eec9e5d8736bfa86096fd2d69cfb73dba7a5fe 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
|
||||
@@ -14,7 +14,7 @@ Subject: [PATCH] fsutil: Add fsutil program with support for creating hard
|
||||
create mode 100644 programs/fsutil/resources.h
|
||||
|
||||
diff --git a/programs/fsutil/Makefile.in b/programs/fsutil/Makefile.in
|
||||
index 64307e83ac..e10bd433ba 100644
|
||||
index 64307e83aca..e10bd433baa 100644
|
||||
--- a/programs/fsutil/Makefile.in
|
||||
+++ b/programs/fsutil/Makefile.in
|
||||
@@ -1,6 +1,9 @@
|
||||
@@ -29,7 +29,7 @@ index 64307e83ac..e10bd433ba 100644
|
||||
+RC_SRCS = fsutil.rc
|
||||
diff --git a/programs/fsutil/fsutil.rc b/programs/fsutil/fsutil.rc
|
||||
new file mode 100644
|
||||
index 0000000000..593f8175a2
|
||||
index 00000000000..593f8175a23
|
||||
--- /dev/null
|
||||
+++ b/programs/fsutil/fsutil.rc
|
||||
@@ -0,0 +1,34 @@
|
||||
@@ -68,7 +68,7 @@ index 0000000000..593f8175a2
|
||||
+ 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 2bce87edc8..6f7974ad1d 100644
|
||||
index eb4e3412976..ffef8aecbb1 100644
|
||||
--- a/programs/fsutil/main.c
|
||||
+++ b/programs/fsutil/main.c
|
||||
@@ -1,5 +1,6 @@
|
||||
@@ -191,7 +191,7 @@ index 2bce87edc8..6f7974ad1d 100644
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
int wmain(int argc, WCHAR *argv[])
|
||||
int __cdecl wmain(int argc, WCHAR *argv[])
|
||||
{
|
||||
- int i;
|
||||
+ static const WCHAR hardlinkW[]={'h','a','r','d','l','i','n','k',0};
|
||||
@@ -222,7 +222,7 @@ index 2bce87edc8..6f7974ad1d 100644
|
||||
}
|
||||
diff --git a/programs/fsutil/resources.h b/programs/fsutil/resources.h
|
||||
new file mode 100644
|
||||
index 0000000000..b85826ac42
|
||||
index 00000000000..b85826ac421
|
||||
--- /dev/null
|
||||
+++ b/programs/fsutil/resources.h
|
||||
@@ -0,0 +1,25 @@
|
||||
@@ -252,5 +252,5 @@ index 0000000000..b85826ac42
|
||||
+#define STRING_HARDLINK_USAGE 104
|
||||
+#define STRING_HARDLINK_CREATE_USAGE 105
|
||||
--
|
||||
2.23.0.rc1
|
||||
2.17.1
|
||||
|
||||
|
Reference in New Issue
Block a user