Rebase against b1930ee4b8a0f77654bbab65c3bc30d721bf5d6a.

[include-webservices]
Removed patch to delete duplicate definition of WS_XML_NODE_POSITION (accepted
upstream).

patches/shell32-Context_Menu/0004-shell32-Correctly-interpret-result-of-SHFileOperatio.patch

@@ -1,35 +0,0 @@
-From 540ec171b1ad3d84c2087f616151103e4a4593df Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sat, 2 Apr 2016 03:47:48 +0200
-Subject: shell32: Correctly interpret result of SHFileOperation in UNIXFS copy
- and delete.
-
----
- dlls/shell32/shfldr_unixfs.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c
-index be1ba81..17998f2 100644
---- a/dlls/shell32/shfldr_unixfs.c
-+++ b/dlls/shell32/shfldr_unixfs.c
-@@ -847,7 +847,7 @@ static HRESULT UNIXFS_copy(LPCWSTR pwszDosSrc, LPCWSTR pwszDosDst)
-         op.pFrom = pwszSrc;
-         op.pTo = pwszDst;
-         op.fFlags = FOF_ALLOWUNDO;
--        if (!SHFileOperationW(&op))
-+        if (SHFileOperationW(&op))
-         {
-             WARN("SHFileOperationW failed\n");
-             res = E_FAIL;
-@@ -1981,7 +1981,7 @@ static HRESULT UNIXFS_delete_with_shfileop(UnixFolder *This, UINT cidl, const LP
-     op.wFunc = FO_DELETE;
-     op.pFrom = wszPathsList;
-     op.fFlags = FOF_ALLOWUNDO;
--    if (!SHFileOperationW(&op))
-+    if (SHFileOperationW(&op))
-     {
-         WARN("SHFileOperationW failed\n");
-         ret = E_FAIL;
--- 
-2.7.1
-