Rebase against 20d86f34a066657048610803e7143232efa6c0d3.

patches/mfplat-streaming-support/0050-winegstreamer-Implement-MF_SD_LANGUAGE.patch

@@ -40,7 +40,7 @@ index 2efa3bd26ac..2b9f10e7b37 100644
 +        .size = size,
 +    };
 +
-+    return !__wine_unix_call(unix_handle, unix_wg_parser_stream_get_language, &params);
++    return !__wine_unix_call(__wine_unixlib_handle, unix_wg_parser_stream_get_language, &params);
 +}
 +
  void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate,

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "81a6c8c882e9d00a3f459983d8281327f25e333a"
+	echo "20d86f34a066657048610803e7143232efa6c0d3"
 }
 
 # Show version information

patches/wininet-Cleanup/0004-wininet-Strip-filename-if-no-path-is-set-in-cookie.patch

@@ -23,7 +23,7 @@ index c770c312ba9..d95b39bd9ce 100644
      if(request->hdr.dwFlags & INTERNET_FLAG_NO_COOKIES)
          return;
  
-+    path = heap_strdupW(request->path);
++    path = wcsdup(request->path);
 +    if (!path)
 +        return;
 +
@@ -42,7 +42,7 @@ index c770c312ba9..d95b39bd9ce 100644
      }
  
      LeaveCriticalSection( &request->headers_section );
-+    heap_free(path);
++    free(path);
  }
  
  static void strip_spaces(LPWSTR start)

patches/wininet-Cleanup/0005-wininet-Replacing-header-fields-should-fail-if-they-.patch

@@ -1,4 +1,4 @@
-From ec84f3463bb1750c51e062b80c3ce16dabb972e0 Mon Sep 17 00:00:00 2001
+From 10bdb80d18fa95c3bffd61217015e1512b14e0d7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 16 May 2015 03:16:15 +0200
 Subject: [PATCH] wininet: Replacing header fields should fail if they do not
@@ -12,10 +12,10 @@ a way that it behaves identical to the old code in such situations.
  1 file changed, 99 insertions(+), 98 deletions(-)
 
 diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
-index 575ebab24c6..132ed61e1de 100644
+index 18be0683d3a..645e7825a5a 100644
 --- a/dlls/wininet/http.c
 +++ b/dlls/wininet/http.c
-@@ -6112,130 +6112,131 @@ static LPWSTR * HTTP_InterpretHttpHeader(LPCWSTR buffer)
+@@ -6113,130 +6113,131 @@ static LPWSTR * HTTP_InterpretHttpHeader(LPCWSTR buffer)
  
  static DWORD HTTP_ProcessHeader(http_request_t *request, LPCWSTR field, LPCWSTR value, DWORD dwModifier)
  {
@@ -97,15 +97,15 @@ index 575ebab24c6..132ed61e1de 100644
 -        HTTP_DeleteCustomHeader( request, index );
 +            goto out;
 +        }
- 
--        if (value && value[0])
++
 +        /* do not add new header if FLAG_ADD_IF_NEW is set */
 +        if (dwModifier & HTTP_ADDREQ_FLAG_ADD_IF_NEW)
 +         {
 +            res = ERROR_HTTP_INVALID_HEADER; /* FIXME */
 +            goto out;
 +        }
-+
+ 
+-        if (value && value[0])
 +        /* handle appending to existing header */
 +        if (dwModifier & COALESCEFLAGS)
          {
@@ -144,7 +144,7 @@ index 575ebab24c6..132ed61e1de 100644
 -            LeaveCriticalSection( &request->headers_section );
 -            return res;
 -        }
-+            lpsztmp = heap_realloc(lphttpHdr->lpszValue, (len+1)*sizeof(WCHAR));
++            lpsztmp = realloc(lphttpHdr->lpszValue, (len+1)*sizeof(WCHAR));
 +            if (lpsztmp)
 +            {
 +                lphttpHdr->lpszValue = lpsztmp;
@@ -166,7 +166,7 @@ index 575ebab24c6..132ed61e1de 100644
 +            }
 +            else
 +             {
-+                WARN("heap_realloc (%d bytes) failed\n",len+1);
++                WARN("realloc (%d bytes) failed\n",len+1);
 +                res = ERROR_OUTOFMEMORY;
 +             }
 +
@@ -206,7 +206,7 @@ index 575ebab24c6..132ed61e1de 100644
 +        hdr.lpszValue = (LPWSTR)value;
 +        hdr.wFlags = hdr.wCount = 0;
  
--        lpsztmp = heap_realloc(lphttpHdr->lpszValue, (len+1)*sizeof(WCHAR));
+-        lpsztmp = realloc(lphttpHdr->lpszValue, (len + 1) * sizeof(WCHAR));
 -        if (lpsztmp)
 -        {
 -            lphttpHdr->lpszValue = lpsztmp;
@@ -227,7 +227,7 @@ index 575ebab24c6..132ed61e1de 100644
 -        }
 -        else
 -        {
--            WARN("heap_realloc (%d bytes) failed\n",len+1);
+-            WARN("realloc (%d bytes) failed\n",len+1);
 -            res = ERROR_OUTOFMEMORY;
 -        }
 +        res = HTTP_InsertCustomHeader( request, &hdr );
@@ -246,5 +246,5 @@ index 575ebab24c6..132ed61e1de 100644
  
  /***********************************************************************
 -- 
-2.35.1
+2.38.1
 

staging/upstream-commit

@@ -1 +1 @@
-81a6c8c882e9d00a3f459983d8281327f25e333a
+20d86f34a066657048610803e7143232efa6c0d3