Rebase against 4be4e282b737a7cfbccf18552a581ee6de3ac13c.

[winsta-WinStationEnumerateW]
Removed patch to add stub for winsta.WinStationEnumerateW (accepted upstream).

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

@@ -1,44 +1,42 @@
-From fe2b318c4d9cee458cc4db4d41c028a8b783282d Mon Sep 17 00:00:00 2001
+From 413b8907e3c4747d83ccacf8657554552ff18620 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: fsutil: Add fsutil program with support for creating hard links.
 
 ---
- configure.ac                |   1 +
- programs/fsutil/Makefile.in |   8 +++
- programs/fsutil/fsutil.rc   |  34 ++++++++++
- programs/fsutil/main.c      | 151 ++++++++++++++++++++++++++++++++++++++++++++
- programs/fsutil/resources.h |  25 ++++++++
- 5 files changed, 219 insertions(+)
- create mode 100644 programs/fsutil/Makefile.in
+ configure.ac                |   2 +-
+ programs/fsutil/Makefile.in |   3 +
+ programs/fsutil/fsutil.rc   |  34 ++++++++++++
+ programs/fsutil/main.c      | 131 ++++++++++++++++++++++++++++++++++++++++++--
+ programs/fsutil/resources.h |  25 +++++++++
+ 5 files changed, 188 insertions(+), 7 deletions(-)
  create mode 100644 programs/fsutil/fsutil.rc
- create mode 100644 programs/fsutil/main.c
  create mode 100644 programs/fsutil/resources.h
 
 diff --git a/configure.ac b/configure.ac
-index 20478df..8cd1f4a 100644
+index 597b84e..1968321 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3459,6 +3459,7 @@ WINE_CONFIG_PROGRAM(expand,,[install])
+@@ -3463,7 +3463,7 @@ WINE_CONFIG_PROGRAM(expand,,[install])
  WINE_CONFIG_PROGRAM(explorer,,[clean,install])
  WINE_CONFIG_PROGRAM(extrac32,,[install])
  WINE_CONFIG_PROGRAM(findstr,,[install])
+-WINE_CONFIG_PROGRAM(fsutil,,[install])
 +WINE_CONFIG_PROGRAM(fsutil,,[clean,install])
  WINE_CONFIG_PROGRAM(hh,,[install])
  WINE_CONFIG_PROGRAM(hostname,,[clean,install])
  WINE_CONFIG_PROGRAM(icacls,,[install])
 diff --git a/programs/fsutil/Makefile.in b/programs/fsutil/Makefile.in
-new file mode 100644
-index 0000000..7433695
---- /dev/null
+index f339c4c..7433695 100644
+--- a/programs/fsutil/Makefile.in
 +++ b/programs/fsutil/Makefile.in
-@@ -0,0 +1,8 @@
-+MODULE    = fsutil.exe
-+APPMODE   = -mconsole -municode
+@@ -1,5 +1,8 @@
+ MODULE    = fsutil.exe
+ APPMODE   = -mconsole -municode
 +IMPORTS   = user32
-+
-+C_SRCS = \
-+	main.c
+ 
+ C_SRCS = \
+ 	main.c
 +
 +RC_SRCS = fsutil.rc
 diff --git a/programs/fsutil/fsutil.rc b/programs/fsutil/fsutil.rc
@@ -82,37 +80,29 @@ index 0000000..593f817
 +    STRING_HARDLINK_CREATE_USAGE, "Syntax: fsutil hardlink create old new\n\n"
 +}
 diff --git a/programs/fsutil/main.c b/programs/fsutil/main.c
-new file mode 100644
-index 0000000..ff58dd4
---- /dev/null
+index 2bce87e..41370b5 100644
+--- a/programs/fsutil/main.c
 +++ b/programs/fsutil/main.c
-@@ -0,0 +1,151 @@
-+/*
+@@ -1,5 +1,6 @@
+ /*
+  * Copyright 2016 Austin English
 + * Copyright 2016 Michael Müller
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-+ */
-+
+  *
+  * 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 @@
+  * 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"
-+
-+WINE_DEFAULT_DEBUG_CHANNEL(fsutil);
-+
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(fsutil);
+ 
 +static void output_write(const WCHAR *str, DWORD wlen)
 +{
 +    DWORD count, ret;
@@ -214,15 +204,20 @@ index 0000000..ff58dd4
 +    return ret;
 +}
 +
-+int wmain(int argc, WCHAR *argv[])
-+{
+ int wmain(int argc, WCHAR *argv[])
+ {
+-    int i;
 +    static const WCHAR hardlinkW[]={'h','a','r','d','l','i','n','k',0};
 +    int i, ret = 0;
-+
-+    for (i = 0; i < argc; i++)
+ 
+-    WINE_FIXME("stub:");
+     for (i = 0; i < argc; i++)
+-        WINE_FIXME(" %s", wine_dbgstr_w(argv[i]));
+-    WINE_FIXME("\n");
 +        WINE_TRACE(" %s", wine_dbgstr_w(argv[i]));
 +    WINE_TRACE("\n");
-+
+ 
+-    return 0;
 +    if (argc > 1)
 +    {
 +        if (!strcmpiW(argv[1], hardlinkW))
@@ -237,7 +232,7 @@ index 0000000..ff58dd4
 +
 +    output_string(STRING_USAGE);
 +    return ret;
-+}
+ }
 diff --git a/programs/fsutil/resources.h b/programs/fsutil/resources.h
 new file mode 100644
 index 0000000..b85826a
@@ -270,5 +265,5 @@ index 0000000..b85826a
 +#define STRING_HARDLINK_USAGE           104
 +#define STRING_HARDLINK_CREATE_USAGE    105
 -- 
-2.7.1
+2.8.0