Release v5.5

This causes wine-protocol-* to be created, and thus any
http/https/ftp will routed via wine.

patches/Staging/0004-loader-Add-commandline-option-check-libs.patch

@@ -1,4 +1,4 @@
-From c07a490a6950f4efe563e38ca78b1aa459dfad86 Mon Sep 17 00:00:00 2001
+From df12fdb8d4cdf11d9f72a068923a5b0097e36bdb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Wed, 28 May 2014 19:50:51 +0200
 Subject: [PATCH] loader: Add commandline option --check-libs.
@@ -12,7 +12,7 @@ Subject: [PATCH] loader: Add commandline option --check-libs.
  5 files changed, 213 insertions(+), 1 deletion(-)
 
 diff --git a/include/wine/library.h b/include/wine/library.h
-index 511bf4722..557cec20c 100644
+index 511bf4722a0..557cec20cf8 100644
 --- a/include/wine/library.h
 +++ b/include/wine/library.h
 @@ -44,6 +44,7 @@ extern "C" {
@@ -32,7 +32,7 @@ index 511bf4722..557cec20c 100644
  extern void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsize );
  extern int wine_dlclose( void *handle, char *error, size_t errorsize );
 diff --git a/libs/wine/config.c b/libs/wine/config.c
-index 5b66c063d..e0988513e 100644
+index 5b66c063db6..e0988513e14 100644
 --- a/libs/wine/config.c
 +++ b/libs/wine/config.c
 @@ -470,6 +470,130 @@ const char *wine_get_build_dir(void)
@@ -167,7 +167,7 @@ index 5b66c063d..e0988513e 100644
  const char *wine_get_server_dir(void)
  {
 diff --git a/libs/wine/loader.c b/libs/wine/loader.c
-index 2a569f5b7..5f10c3f9d 100644
+index 2a569f5b739..5f10c3f9d3e 100644
 --- a/libs/wine/loader.c
 +++ b/libs/wine/loader.c
 @@ -1072,6 +1072,42 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize
@@ -214,7 +214,7 @@ index 2a569f5b7..5f10c3f9d 100644
   *		wine_dlsym
   */
 diff --git a/libs/wine/wine.map b/libs/wine/wine.map
-index ca46979f5..22a4e73b0 100644
+index ca46979f5b9..22a4e73b05b 100644
 --- a/libs/wine/wine.map
 +++ b/libs/wine/wine.map
 @@ -9,6 +9,7 @@ WINE_1.0
@@ -234,7 +234,7 @@ index ca46979f5..22a4e73b0 100644
      wine_get_ss;
      wine_get_user_name;
 diff --git a/loader/main.c b/loader/main.c
-index f6629128d..a2dc40c51 100644
+index d97d6b28bf8..49dc996e354 100644
 --- a/loader/main.c
 +++ b/loader/main.c
 @@ -36,6 +36,12 @@
@@ -247,10 +247,10 @@ index f6629128d..a2dc40c51 100644
 +#ifdef HAVE_LINK_H
 +# include <link.h>
 +#endif
- #include <pthread.h>
  
  #include "wine/library.h"
-@@ -55,7 +61,8 @@ static void check_command_line( int argc, char *argv[] )
+ #include "main.h"
+@@ -54,7 +60,8 @@ static void check_command_line( int argc, char *argv[] )
          "Usage: wine PROGRAM [ARGUMENTS...]   Run the specified program\n"
          "       wine --help                   Display this help and exit\n"
          "       wine --version                Output version information and exit\n"
@@ -260,7 +260,7 @@ index f6629128d..a2dc40c51 100644
  
      if (argc <= 1)
      {
-@@ -111,6 +118,47 @@ static void check_command_line( int argc, char *argv[] )
+@@ -110,6 +117,47 @@ static void check_command_line( int argc, char *argv[] )
  
          exit(0);
      }
@@ -309,5 +309,5 @@ index f6629128d..a2dc40c51 100644
  
  
 -- 
-2.25.0
+2.25.1
 

patches/comctl32-version_6/0001-comctl32-Bump-version-to-6.0.patch

@@ -1,4 +1,4 @@
-From ad23e816eb724d81032306f8ac6d4faa96ccaf4a Mon Sep 17 00:00:00 2001
+From 3a94f82a0cf783abf7c7d17335914bed3c6791bb Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Tue, 12 Nov 2019 18:13:20 +0800
 Subject: [PATCH] comctl32: Bump version to 6.0.
@@ -40,7 +40,7 @@ index c9aa1ba6253..be6e2425193 100644
  #define WINE_PRODUCTVERSION_STR WINE_FILEVERSION_STR
  
 diff --git a/include/commctrl.h b/include/commctrl.h
-index 700b335fbb7..029a4b45457 100644
+index dfd2f4a37d2..0784478ce14 100644
 --- a/include/commctrl.h
 +++ b/include/commctrl.h
 @@ -51,7 +51,7 @@ enum _LI_METRIC
@@ -50,8 +50,8 @@ index 700b335fbb7..029a4b45457 100644
 -#define COMCTL32_VERSION                5  /* dll version */
 +#define COMCTL32_VERSION                6  /* dll version */
  
- #ifndef _WIN32_IE
- #define _WIN32_IE 0x0400
+ #define ICC_LISTVIEW_CLASSES   0x00000001  /* listview, header */
+ #define ICC_TREEVIEW_CLASSES   0x00000002  /* treeview, tooltips */
 -- 
-2.24.1
+2.25.1
 

patches/d3dx9_36-DrawText/0001-d3dx9_36-Implement-ID3DXFontImpl_DrawText.patch

@@ -1,316 +0,0 @@
-From 4693069d7c35e2c186943b2394ab4a657253c5e1 Mon Sep 17 00:00:00 2001
-From: Christian Costa <titan.costa@gmail.com>
-Date: Sun, 26 May 2013 19:42:08 +0200
-Subject: [PATCH] d3dx9_36: Implement ID3DXFontImpl_DrawText.
-
-Changes by Sebastian Lackner <sebastian@fds-team.de>:
-* Use pitch value for locked buffer instead of assuming that pitch = width * bytesperpixel
-* Avoid one for loop to simplify code
-* Ensure that DrawText doesn't dereference a NULL pointer when count != 0.
-
-Changes by Christian Costa <titan.costa@gmail.com>
-* Use dedicated variables for text width & height instead of reusing rect.right and rect.bottom
-* Remove useless test in pixel conversion
-* Remove left over 'partial stub' in fixme
-
-Changes by Sebastian Lackner <sebastian@fds-team.de>:
-* Replace code to convert text from ascii to widechar
-* Strip terminating NULL chars before drawing text
----
- dlls/d3dx9_36/font.c | 214 +++++++++++++++++++++++++++++++++++++++----
- 1 file changed, 195 insertions(+), 19 deletions(-)
-
-diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c
-index cb09af22f57..89a60c9baf1 100644
---- a/dlls/d3dx9_36/font.c
-+++ b/dlls/d3dx9_36/font.c
-@@ -32,6 +32,12 @@ struct d3dx_font
- 
-     HDC hdc;
-     HFONT hfont;
-+
-+    UINT tex_width;
-+    UINT tex_height;
-+    IDirect3DTexture9 *texture;
-+    HBITMAP bitmap;
-+    BYTE *bits;
- };
- 
- static inline struct d3dx_font *impl_from_ID3DXFont(ID3DXFont *iface)
-@@ -60,19 +66,27 @@ static HRESULT WINAPI ID3DXFontImpl_QueryInterface(ID3DXFont *iface, REFIID riid
- static ULONG WINAPI ID3DXFontImpl_AddRef(ID3DXFont *iface)
- {
-     struct d3dx_font *This = impl_from_ID3DXFont(iface);
--    ULONG ref=InterlockedIncrement(&This->ref);
-+    ULONG ref = InterlockedIncrement(&This->ref);
-+
-     TRACE("%p increasing refcount to %u\n", iface, ref);
-+
-     return ref;
- }
- 
- static ULONG WINAPI ID3DXFontImpl_Release(ID3DXFont *iface)
- {
-     struct d3dx_font *This = impl_from_ID3DXFont(iface);
--    ULONG ref=InterlockedDecrement(&This->ref);
-+    ULONG ref = InterlockedDecrement(&This->ref);
- 
-     TRACE("%p decreasing refcount to %u\n", iface, ref);
- 
--    if(ref==0) {
-+    if (!ref)
-+    {
-+        if (This->texture)
-+        {
-+            IDirect3DTexture9_Release(This->texture);
-+            DeleteObject(This->bitmap);
-+        }
-         DeleteObject(This->hfont);
-         DeleteDC(This->hdc);
-         IDirect3DDevice9_Release(This->device);
-@@ -175,17 +189,170 @@ static HRESULT WINAPI ID3DXFontImpl_PreloadTextW(ID3DXFont *iface, const WCHAR *
- static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, ID3DXSprite *sprite,
-         const char *string, INT count, RECT *rect, DWORD format, D3DCOLOR color)
- {
--    FIXME("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x stub!\n",
-+    LPWSTR stringW;
-+    INT countW, ret = 0;
-+
-+    TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x\n",
-             iface,  sprite, debugstr_a(string), count, wine_dbgstr_rect(rect), format, color);
--    return 1;
-+
-+    if (!string || count <= 0)
-+        return 0;
-+
-+    countW = MultiByteToWideChar(CP_ACP, 0, string, count, NULL, 0);
-+    stringW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR));
-+    if (stringW)
-+    {
-+        MultiByteToWideChar(CP_ACP, 0, string, count, stringW, countW);
-+        ret = ID3DXFont_DrawTextW(iface, sprite, stringW, countW, rect, format, color);
-+        HeapFree(GetProcessHeap(), 0, stringW);
-+    }
-+
-+    return ret;
- }
- 
- static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite,
-         const WCHAR *string, INT count, RECT *rect, DWORD format, D3DCOLOR color)
- {
--    FIXME("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x stub!\n",
-+    struct d3dx_font *This = impl_from_ID3DXFont(iface);
-+    RECT calc_rect = *rect;
-+    INT height;
-+
-+    TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x\n",
-             iface,  sprite, debugstr_w(string), count, wine_dbgstr_rect(rect), format, color);
--    return 1;
-+
-+    if (!string || count <= 0)
-+        return 0;
-+
-+    /* Strip terminating NULL characters */
-+    while (count > 0 && !string[count-1])
-+        count--;
-+
-+    height = DrawTextW(This->hdc, string, count, &calc_rect, format | DT_CALCRECT);
-+
-+    if (format & DT_CALCRECT)
-+    {
-+        *rect = calc_rect;
-+        return height;
-+    }
-+
-+    if (height && (calc_rect.left < calc_rect.right))
-+    {
-+        D3DLOCKED_RECT locked_rect;
-+        D3DXVECTOR3 position;
-+        UINT text_width, text_height;
-+        RECT text_rect;
-+        ID3DXSprite *target = sprite;
-+        HRESULT hr;
-+        int i, j;
-+
-+        /* Get rect position and dimensions */
-+        position.x = calc_rect.left;
-+        position.y = calc_rect.top;
-+        position.z = 0;
-+        text_width = calc_rect.right - calc_rect.left;
-+        text_height = calc_rect.bottom - calc_rect.top;
-+        text_rect.left = 0;
-+        text_rect.top = 0;
-+        text_rect.right = text_width;
-+        text_rect.bottom = text_height;
-+
-+        /* We need to flush as it seems all draws in the begin/end sequence use only the latest updated texture */
-+        if (sprite)
-+            ID3DXSprite_Flush(sprite);
-+
-+        /* Extend texture and DIB section to contain text */
-+        if ((text_width > This->tex_width) || (text_height > This->tex_height))
-+        {
-+            BITMAPINFOHEADER header;
-+
-+            if (text_width > This->tex_width)
-+                This->tex_width = make_pow2(text_width);
-+            if (text_height > This->tex_height)
-+                This->tex_height = make_pow2(text_height);
-+
-+            if (This->texture)
-+            {
-+                IDirect3DTexture9_Release(This->texture);
-+                DeleteObject(This->bitmap);
-+            }
-+
-+            hr = D3DXCreateTexture(This->device, This->tex_width, This->tex_height, 1, D3DUSAGE_DYNAMIC,
-+                                   D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &This->texture);
-+            if (FAILED(hr))
-+            {
-+                This->texture = NULL;
-+                return 0;
-+            }
-+
-+            header.biSize = sizeof(header);
-+            header.biWidth = This->tex_width;
-+            header.biHeight = -This->tex_height;
-+            header.biPlanes = 1;
-+            header.biBitCount = 32;
-+            header.biCompression = BI_RGB;
-+            header.biSizeImage = sizeof(DWORD) * This->tex_width * This->tex_height;
-+            header.biXPelsPerMeter = 0;
-+            header.biYPelsPerMeter = 0;
-+            header.biClrUsed = 0;
-+            header.biClrImportant = 0;
-+
-+            This->bitmap = CreateDIBSection(This->hdc, (const BITMAPINFO*)&header,
-+                                            DIB_RGB_COLORS, (void**)&This->bits, NULL, 0);
-+            if (!This->bitmap)
-+            {
-+                IDirect3DTexture9_Release(This->texture);
-+                This->texture = NULL;
-+                return 0;
-+            }
-+
-+            SelectObject(This->hdc, This->bitmap);
-+        }
-+
-+        if (FAILED(IDirect3DTexture9_LockRect(This->texture, 0, &locked_rect, &text_rect, D3DLOCK_DISCARD)))
-+            return 0;
-+
-+        /* Clear rect */
-+        for (i = 0; i < text_height; i++)
-+            memset(This->bits + i * This->tex_width * sizeof(DWORD), 0,
-+                   text_width * sizeof(DWORD));
-+
-+        DrawTextW(This->hdc, string, count, &text_rect, format);
-+
-+        /* All RGB components are equal so take one as alpha and set RGB
-+         * color to white, so it can be modulated with color parameter */
-+        for (i = 0; i < text_height; i++)
-+        {
-+            DWORD *src = (DWORD *)This->bits + i * This->tex_width;
-+            DWORD *dst = (DWORD *)((BYTE *)locked_rect.pBits + i * locked_rect.Pitch);
-+            for (j = 0; j < text_width; j++)
-+            {
-+                *dst++ = (*src++ << 24) | 0xFFFFFF;
-+            }
-+        }
-+
-+        IDirect3DTexture9_UnlockRect(This->texture, 0);
-+
-+        if (!sprite)
-+        {
-+            hr = D3DXCreateSprite(This->device, &target);
-+            if (FAILED(hr))
-+                 return 0;
-+            ID3DXSprite_Begin(target, 0);
-+        }
-+
-+        hr = target->lpVtbl->Draw(target, This->texture, &text_rect, NULL, &position, color);
-+
-+        if (!sprite)
-+        {
-+            ID3DXSprite_End(target);
-+            ID3DXSprite_Release(target);
-+        }
-+
-+        if (FAILED(hr))
-+            return 0;
-+    }
-+
-+    return height;
- }
- 
- static HRESULT WINAPI ID3DXFontImpl_OnLostDevice(ID3DXFont *iface)
-@@ -298,46 +465,55 @@ HRESULT WINAPI D3DXCreateFontIndirectW(IDirect3DDevice9 *device, const D3DXFONT_
- 
-     TRACE("(%p, %p, %p)\n", device, desc, font);
- 
--    if( !device || !desc || !font ) return D3DERR_INVALIDCALL;
-+    if (!device || !desc || !font) return D3DERR_INVALIDCALL;
- 
--    /* the device MUST support D3DFMT_A8R8G8B8 */
-+    TRACE("desc: %d %d %d %d %d %d %d %d %d %s\n", desc->Height, desc->Width, desc->Weight, desc->MipLevels, desc->Italic,
-+            desc->CharSet, desc->OutputPrecision, desc->Quality, desc->PitchAndFamily, debugstr_w(desc->FaceName));
-+
-+    /* The device MUST support D3DFMT_A8R8G8B8 */
-     IDirect3DDevice9_GetDirect3D(device, &d3d);
-     IDirect3DDevice9_GetCreationParameters(device, &cpars);
-     IDirect3DDevice9_GetDisplayMode(device, 0, &mode);
-     hr = IDirect3D9_CheckDeviceFormat(d3d, cpars.AdapterOrdinal, cpars.DeviceType, mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_A8R8G8B8);
--    if(FAILED(hr)) {
-+    if (FAILED(hr))
-+    {
-         IDirect3D9_Release(d3d);
-         return D3DXERR_INVALIDDATA;
-     }
-     IDirect3D9_Release(d3d);
- 
--    object = HeapAlloc(GetProcessHeap(), 0, sizeof(struct d3dx_font));
--    if(object==NULL) {
--        *font=NULL;
-+    object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct d3dx_font));
-+    if (!object)
-+    {
-+        *font = NULL;
-         return E_OUTOFMEMORY;
-     }
-     object->ID3DXFont_iface.lpVtbl = &D3DXFont_Vtbl;
--    object->ref=1;
--    object->device=device;
--    object->desc=*desc;
-+    object->ref = 1;
-+    object->device = device;
-+    object->desc = *desc;
- 
-     object->hdc = CreateCompatibleDC(NULL);
--    if( !object->hdc ) {
-+    if (!object->hdc)
-+    {
-         HeapFree(GetProcessHeap(), 0, object);
-         return D3DXERR_INVALIDDATA;
-     }
- 
-     object->hfont = CreateFontW(desc->Height, desc->Width, 0, 0, desc->Weight, desc->Italic, FALSE, FALSE, desc->CharSet,
-                                 desc->OutputPrecision, CLIP_DEFAULT_PRECIS, desc->Quality, desc->PitchAndFamily, desc->FaceName);
--    if( !object->hfont ) {
-+    if (!object->hfont)
-+    {
-         DeleteDC(object->hdc);
-         HeapFree(GetProcessHeap(), 0, object);
-         return D3DXERR_INVALIDDATA;
-     }
-     SelectObject(object->hdc, object->hfont);
-+    SetTextColor(object->hdc, 0x00ffffff);
-+    SetBkColor(object->hdc, 0x00000000);
- 
-     IDirect3DDevice9_AddRef(device);
--    *font=&object->ID3DXFont_iface;
-+    *font = &object->ID3DXFont_iface;
- 
-     return D3D_OK;
- }
--- 
-2.25.0
-

patches/d3dx9_36-DrawText/0002-d3dx9_36-Fix-horizontal-centering-in-ID3DXFont_DrawT.patch

@@ -1,32 +0,0 @@
-From 93b91dc6b0ccaf6c9babab7adb218454df93b750 Mon Sep 17 00:00:00 2001
-From: Christian Costa <titan.costa@gmail.com>
-Date: Sun, 4 Jan 2015 18:43:42 +0100
-Subject: d3dx9_36: Fix horizontal centering in ID3DXFont_DrawText.
-
-Fix remaining text issues in Air Strike.
-Should fix text placement in Stronghold Kingdoms.
----
- dlls/d3dx9_36/font.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c
-index 368c784..fa52859 100644
---- a/dlls/d3dx9_36/font.c
-+++ b/dlls/d3dx9_36/font.c
-@@ -254,6 +254,13 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite,
-         return height;
-     }
- 
-+    if (format & DT_CENTER)
-+    {
-+        UINT new_width = calc_rect.right - calc_rect.left;
-+        calc_rect.left = (rect->right + rect->left - new_width) / 2;
-+        calc_rect.right = calc_rect.left + new_width;
-+    }
-+
-     if (height && (calc_rect.left < calc_rect.right))
-     {
-         D3DLOCKED_RECT locked_rect;
--- 
-2.2.1
-

patches/d3dx9_36-DrawText/0003-d3dx9_36-Support-NULL-terminated-strings-in-ID3DXFon.patch

@@ -1,47 +0,0 @@
-From 0b6fc918564f580a9d62f14d76da83349075574f Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Fri, 4 Dec 2015 09:22:35 +1100
-Subject: [PATCH] d3dx9_36: Support NULL terminated strings in
- ID3DXFont_DrawText
-
-Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
----
- dlls/d3dx9_36/font.c       | 10 ++++++++--
- dlls/d3dx9_36/tests/core.c |  1 -
- 2 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c
-index ad1eb2383e4..83fec560fc5 100644
---- a/dlls/d3dx9_36/font.c
-+++ b/dlls/d3dx9_36/font.c
-@@ -210,9 +210,12 @@ static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, ID3DXSprite *sprite,
-     TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x\n",
-             iface,  sprite, debugstr_a(string), count, wine_dbgstr_rect(rect), format, color);
- 
--    if (!string || count <= 0)
-+    if (!string || count == 0)
-         return 0;
- 
-+    if (count < 0)
-+       count = -1;
-+
-     countW = MultiByteToWideChar(CP_ACP, 0, string, count, NULL, 0);
-     stringW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR));
-     if (stringW)
-@@ -235,9 +238,12 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite,
-     TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x\n",
-             iface,  sprite, debugstr_w(string), count, wine_dbgstr_rect(rect), format, color);
- 
--    if (!string || count <= 0)
-+    if (!string || count == 0)
-         return 0;
- 
-+    if (count < 0)
-+       count = lstrlenW(string);
-+
-     /* Strip terminating NULL characters */
-     while (count > 0 && !string[count-1])
-         count--;
--- 
-2.17.1
-

patches/d3dx9_36-DrawText/0004-d3dx9_36-ID3DXFont_DrawText-calc_rect-can-be-null.patch

@@ -1,43 +0,0 @@
-From ccf7cfe0cd7cbaa15ee34b4390dd6c30cf7e84ec Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Sat, 5 Dec 2015 15:31:06 +1100
-Subject: [PATCH] d3dx9_36: ID3DXFont_DrawText calc_rect can be null
-
-Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
----
- dlls/d3dx9_36/font.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c
-index 83fec560fc5..f5c704ebabb 100644
---- a/dlls/d3dx9_36/font.c
-+++ b/dlls/d3dx9_36/font.c
-@@ -232,7 +232,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite,
-         const WCHAR *string, INT count, RECT *rect, DWORD format, D3DCOLOR color)
- {
-     struct d3dx_font *This = impl_from_ID3DXFont(iface);
--    RECT calc_rect = *rect;
-+    RECT calc_rect;
-     INT height;
- 
-     TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x\n",
-@@ -248,11 +248,15 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite,
-     while (count > 0 && !string[count-1])
-         count--;
- 
-+    if (rect)
-+        calc_rect = *rect;
-+
-     height = DrawTextW(This->hdc, string, count, &calc_rect, format | DT_CALCRECT);
- 
-     if (format & DT_CALCRECT)
-     {
--        *rect = calc_rect;
-+        if (rect)
-+            *rect = calc_rect;
-         return height;
-     }
- 
--- 
-2.17.1
-

patches/d3dx9_36-DrawText/definition

@@ -1,3 +0,0 @@
-Fixes: [24754] Support for ID3DXFont::DrawTextA/W
-#Disabled since it's in the process of being upstreamed.
-Disabled: true

patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch

@@ -1,15 +1,15 @@
-From e920f461eaf4c5d19c0cfc8e9c9a40671269dd93 Mon Sep 17 00:00:00 2001
+From 1c52fd394b75313b41023d53c011ab861dc79b66 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 6 Oct 2014 05:06:06 +0200
 Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR.
 
 ---
  dlls/dbghelp/Makefile.in  | 2 +-
- dlls/dbghelp/elf_module.c | 8 +++++---
- 2 files changed, 6 insertions(+), 4 deletions(-)
+ dlls/dbghelp/elf_module.c | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in
-index f08464cd422..aa7a767110b 100644
+index 39d3bfc8641..ab66ff5b6c5 100644
 --- a/dlls/dbghelp/Makefile.in
 +++ b/dlls/dbghelp/Makefile.in
 @@ -1,6 +1,6 @@
@@ -21,24 +21,17 @@ index f08464cd422..aa7a767110b 100644
  EXTRAINCL = $(Z_CFLAGS)
  EXTRALIBS = $(Z_LIBS) $(CORESERVICES_LIBS) $(COREFOUNDATION_LIBS)
 diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c
-index 96b16fd5c0c..611533ee098 100644
+index 0b60524fc44..f2d6e84e3ea 100644
 --- a/dlls/dbghelp/elf_module.c
 +++ b/dlls/dbghelp/elf_module.c
-@@ -1644,9 +1644,11 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename,
-     if (!ret && !strchrW(filename, '/'))
-     {
-         ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr,
--                                      getenv("PATH"), elf_info) ||
--            elf_load_file_from_path(pcs, filename, load_offset, dyn_addr,
--                                    getenv("LD_LIBRARY_PATH"), elf_info);
-+                                      getenv("PATH"), elf_info);
-+        if (!ret) ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr,
-+                                                getenv("LD_LIBRARY_PATH"), elf_info);
-+        if (!ret) ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr,
-+                                                BINDIR, elf_info);
-         if (!ret) ret = elf_load_file_from_dll_path(pcs, filename,
-                                                     load_offset, dyn_addr, elf_info);
+@@ -1379,6 +1379,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename,
+ 
+         ret = search_unix_path(filename, getenv("PATH"), elf_load_file_cb, &load_elf)
+             || search_unix_path(filename, getenv("LD_LIBRARY_PATH"), elf_load_file_cb, &load_elf)
++            || search_unix_path(filename, BINDIR, elf_load_file_cb, &load_elf)
+             || search_dll_path(filename, elf_load_file_cb, &load_elf);
      }
+ 
 -- 
-2.20.1
+2.25.1
 

patches/ddraw-Rendering_Targets/0001-ddraw-Create-rendering-targets-in-video-memory-if-po.patch

@@ -1,4 +1,4 @@
-From da87296baa62ed82f5334236ef9b259aac818e5d Mon Sep 17 00:00:00 2001
+From 2097fbe83a66a3a423bdd148ecfc4f16c1237110 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Wed, 29 Jul 2015 17:09:50 +0200
 Subject: [PATCH] ddraw: Create rendering targets in video memory if possible.
@@ -12,10 +12,10 @@ Based on a patch by Henri Verbeet.
  4 files changed, 56 insertions(+), 15 deletions(-)
 
 diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
-index 535f33f1c7d..00fd337ead4 100644
+index 050f625f7..9655f9e47 100644
 --- a/dlls/ddraw/ddraw.c
 +++ b/dlls/ddraw/ddraw.c
-@@ -4298,7 +4298,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid,
+@@ -4214,7 +4214,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid,
      TRACE("iface %p, riid %s, surface %p, device %p.\n", iface, debugstr_guid(riid), surface, device);
  
      wined3d_mutex_lock();
@@ -24,7 +24,7 @@ index 535f33f1c7d..00fd337ead4 100644
      {
          *device = &object->IDirect3DDevice7_iface;
      }
-@@ -4327,7 +4327,7 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid,
+@@ -4243,7 +4243,7 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid,
          return CLASS_E_NOAGGREGATION;
  
      wined3d_mutex_lock();
@@ -33,7 +33,7 @@ index 535f33f1c7d..00fd337ead4 100644
      {
          *device = &device_impl->IDirect3DDevice3_iface;
      }
-@@ -4353,7 +4353,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid,
+@@ -4269,7 +4269,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid,
              iface, debugstr_guid(riid), surface, device);
  
      wined3d_mutex_lock();
@@ -43,10 +43,10 @@ index 535f33f1c7d..00fd337ead4 100644
          *device = &device_impl->IDirect3DDevice2_iface;
      }
 diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
-index 42a7a85e4ec..1a7e48fdffa 100644
+index f4fe970a6..ba0ec73d8 100644
 --- a/dlls/ddraw/ddraw_private.h
 +++ b/dlls/ddraw/ddraw_private.h
-@@ -310,6 +310,7 @@ struct d3d_device
+@@ -313,6 +313,7 @@ struct d3d_device
      IUnknown IUnknown_inner;
      LONG ref;
      UINT version;
@@ -54,8 +54,8 @@ index 42a7a85e4ec..1a7e48fdffa 100644
  
      IUnknown *outer_unknown;
      struct wined3d_device *wined3d_device;
-@@ -356,7 +357,7 @@ struct d3d_device
-     struct wined3d_stateblock *recording, *state, *update_state;
+@@ -360,7 +361,7 @@ struct d3d_device
+     const struct wined3d_stateblock_state *stateblock_state;
  };
  
 -HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface,
@@ -64,10 +64,10 @@ index 42a7a85e4ec..1a7e48fdffa 100644
  enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device *device) DECLSPEC_HIDDEN;
  
 diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
-index 7acc8e0db0b..390d9a9040d 100644
+index 048ba7fba..ce74a0fb8 100644
 --- a/dlls/ddraw/device.c
 +++ b/dlls/ddraw/device.c
-@@ -1856,7 +1856,7 @@ static HRESULT d3d_device7_SetRenderTarget(IDirect3DDevice7 *iface,
+@@ -1858,7 +1858,7 @@ static HRESULT d3d_device7_SetRenderTarget(IDirect3DDevice7 *iface,
          return DDERR_INVALIDCAPS;
      }
  
@@ -76,7 +76,7 @@ index 7acc8e0db0b..390d9a9040d 100644
      {
          WARN("Surface %p is not in video memory.\n", target_impl);
          wined3d_mutex_unlock();
-@@ -1932,7 +1932,7 @@ static HRESULT WINAPI d3d_device3_SetRenderTarget(IDirect3DDevice3 *iface,
+@@ -1934,7 +1934,7 @@ static HRESULT WINAPI d3d_device3_SetRenderTarget(IDirect3DDevice3 *iface,
          return DDERR_INVALIDPIXELFORMAT;
      }
  
@@ -85,7 +85,7 @@ index 7acc8e0db0b..390d9a9040d 100644
      {
          WARN("Surface %p is not in video memory.\n", target_impl);
          IDirectDrawSurface4_AddRef(target);
-@@ -1981,7 +1981,7 @@ static HRESULT WINAPI d3d_device2_SetRenderTarget(IDirect3DDevice2 *iface,
+@@ -1983,7 +1983,7 @@ static HRESULT WINAPI d3d_device2_SetRenderTarget(IDirect3DDevice2 *iface,
          return DDERR_INVALIDPIXELFORMAT;
      }
  
@@ -94,7 +94,7 @@ index 7acc8e0db0b..390d9a9040d 100644
      {
          WARN("Surface %p is not in video memory.\n", target_impl);
          IDirectDrawSurface_AddRef(target);
-@@ -6956,7 +6956,7 @@ static void ddraw_reset_viewport_state(struct ddraw *ddraw)
+@@ -6951,7 +6951,7 @@ static void ddraw_reset_viewport_state(struct ddraw *ddraw)
      wined3d_stateblock_set_scissor_rect(ddraw->state, &rect);
  }
  
@@ -103,7 +103,7 @@ index 7acc8e0db0b..390d9a9040d 100644
          struct ddraw_surface *target, IUnknown *rt_iface, UINT version, IUnknown *outer_unknown)
  {
      static const struct wined3d_matrix ident =
-@@ -6979,6 +6979,7 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw,
+@@ -6974,6 +6974,7 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw,
      device->IUnknown_inner.lpVtbl = &d3d_device_inner_vtbl;
      device->ref = 1;
      device->version = version;
@@ -111,7 +111,7 @@ index 7acc8e0db0b..390d9a9040d 100644
  
      if (outer_unknown)
          device->outer_unknown = outer_unknown;
-@@ -7036,14 +7037,18 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw,
+@@ -7032,14 +7033,18 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw,
      return D3D_OK;
  }
  
@@ -133,7 +133,7 @@ index 7acc8e0db0b..390d9a9040d 100644
  
      if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_3DDEVICE)
              || (target->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER))
-@@ -7066,7 +7071,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn
+@@ -7062,7 +7067,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn
          return DDERR_OUTOFMEMORY;
      }
  
@@ -142,7 +142,7 @@ index 7acc8e0db0b..390d9a9040d 100644
      {
          WARN("Surface %p is not in video memory.\n", target);
          return D3DERR_SURFACENOTINVIDMEM;
-@@ -7084,7 +7089,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn
+@@ -7080,7 +7085,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn
          return DDERR_OUTOFMEMORY;
      }
  
@@ -152,7 +152,7 @@ index 7acc8e0db0b..390d9a9040d 100644
          WARN("Failed to initialize device, hr %#x.\n", hr);
          heap_free(object);
 diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
-index da8913c521c..8b40e7de4b8 100644
+index 85c1ef496..01522f515 100644
 --- a/dlls/ddraw/surface.c
 +++ b/dlls/ddraw/surface.c
 @@ -223,7 +223,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface,
@@ -164,7 +164,7 @@ index da8913c521c..8b40e7de4b8 100644
                          1, &This->device1, (IUnknown *)&This->IDirectDrawSurface_iface)))
                  {
                      This->device1 = NULL;
-@@ -6201,7 +6201,42 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
+@@ -6192,7 +6192,42 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
  
      if (desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY)
      {
@@ -196,7 +196,7 @@ index da8913c521c..8b40e7de4b8 100644
 +         * possible.
 +         */
 +        if (bind_flags
-+                && SUCCEEDED(hr = wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT,
++                && SUCCEEDED(hr = wined3d_check_device_format(ddraw->wined3d, ddraw->wined3d_adapter,
 +                WINED3D_DEVICE_TYPE_HAL, mode.format_id, 0,
 +                bind_flags, WINED3D_RTYPE_TEXTURE_2D, wined3d_desc.format)))
 +        {
@@ -209,5 +209,5 @@ index da8913c521c..8b40e7de4b8 100644
      }
      else
 -- 
-2.25.0
+2.25.1
 

patches/ddraw-Texture_Wrong_Caps/0001-ddraw-Allow-setting-texture-without-DDSCAPS_TEXTURE-.patch

@@ -1,4 +1,4 @@
-From 882c25ffe94d7e8869ed5a364120cf0c5f2ef241 Mon Sep 17 00:00:00 2001
+From a6f14f05fefc9510f673b47092cbc62a2366ccf9 Mon Sep 17 00:00:00 2001
 From: Paul Gofman <gofmanp@gmail.com>
 Date: Thu, 4 Apr 2019 02:25:00 +0300
 Subject: [PATCH] ddraw: Allow setting texture without DDSCAPS_TEXTURE for
@@ -6,26 +6,15 @@ Subject: [PATCH] ddraw: Allow setting texture without DDSCAPS_TEXTURE for
 
 Signed-off-by: Paul Gofman <gofmanp@gmail.com>
 ---
- dlls/ddraw/device.c       |  22 +++++--
+ dlls/ddraw/device.c       |  20 ++++--
  dlls/ddraw/tests/ddraw4.c | 128 +++++++++++++++++++++++++++++++++++++-
- 2 files changed, 141 insertions(+), 9 deletions(-)
+ 2 files changed, 141 insertions(+), 7 deletions(-)
 
 diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
-index e2643e6589..a43bca7a14 100644
+index 11e60f80c..324475303 100644
 --- a/dlls/ddraw/device.c
 +++ b/dlls/ddraw/device.c
-@@ -2921,10 +2921,8 @@ static HRESULT WINAPI d3d_device3_SetLightState(IDirect3DDevice3 *iface,
-                 wined3d_mutex_unlock();
-                 return DDERR_INVALIDPARAMS;
-             }
--
-             material_activate(m);
-         }
--
-         device->material = value;
-     }
-     else if (state == D3DLIGHTSTATE_COLORMODEL)
-@@ -4807,7 +4805,8 @@ static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface,
+@@ -4798,7 +4798,8 @@ static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface,
      struct ddraw_surface *surf = unsafe_impl_from_IDirectDrawSurface7(texture);
      struct wined3d_texture *wined3d_texture = NULL;
  
@@ -35,7 +24,7 @@ index e2643e6589..a43bca7a14 100644
  
      if (surf && (surf->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE))
          wined3d_texture = surf->wined3d_texture;
-@@ -4845,19 +4844,30 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface,
+@@ -4834,19 +4835,30 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface,
  {
      struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
      struct ddraw_surface *tex = unsafe_impl_from_IDirect3DTexture2(texture);
@@ -58,7 +47,7 @@ index e2643e6589..a43bca7a14 100644
 +        wined3d_texture = NULL;
 +    }
 +
-+    wined3d_device_set_texture(device->wined3d_device, stage, wined3d_texture);
++    wined3d_stateblock_set_texture(device->state, stage, wined3d_texture);
  
      fixup_texture_alpha_op(device);
  
@@ -70,7 +59,7 @@ index e2643e6589..a43bca7a14 100644
  
  static const struct tss_lookup
 diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
-index e3146ca45d..8861244e05 100644
+index e1d5bac18..e18f3c638 100644
 --- a/dlls/ddraw/tests/ddraw4.c
 +++ b/dlls/ddraw/tests/ddraw4.c
 @@ -330,7 +330,7 @@ static IDirectDraw4 *create_ddraw(void)
@@ -132,7 +121,7 @@ index e3146ca45d..8861244e05 100644
  static IDirect3DViewport3 *create_viewport(IDirect3DDevice3 *device, UINT x, UINT y, UINT w, UINT h)
  {
      IDirect3DViewport3 *viewport;
-@@ -16819,6 +16830,116 @@ static void test_surface_format_conversion_alpha(void)
+@@ -16980,6 +16991,116 @@ static void test_surface_format_conversion_alpha(void)
      DestroyWindow(window);
  }
  
@@ -249,7 +238,7 @@ index e3146ca45d..8861244e05 100644
  START_TEST(ddraw4)
  {
      DDDEVICEIDENTIFIER identifier;
-@@ -16951,6 +17072,7 @@ START_TEST(ddraw4)
+@@ -17112,6 +17233,7 @@ START_TEST(ddraw4)
      test_gdi_surface();
      test_alphatest();
      test_clipper_refcount();
@@ -258,5 +247,5 @@ index e3146ca45d..8861244e05 100644
      test_d32_support();
      test_surface_format_conversion_alpha();
 -- 
-2.17.1
+2.25.1
 

patches/kernel32-FindFirstFile/0001-kernel32-Strip-invalid-characters-from-mask-in-FindF.patch

@@ -1,4 +1,4 @@
-From 339d3f797f4ba20feac9c887dc79734cd15a2c10 Mon Sep 17 00:00:00 2001
+From 6b8f0a1f1283cb47bf1156745a42e50bb32d3d2f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 6 Feb 2016 18:31:25 +0100
 Subject: [PATCH] kernel32: Strip invalid characters from mask in
@@ -9,10 +9,10 @@ Subject: [PATCH] kernel32: Strip invalid characters from mask in
  1 file changed, 22 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c
-index 89c5f85cb20..542531e895c 100644
+index 6591a110732..fd411b7baac 100644
 --- a/dlls/kernelbase/file.c
 +++ b/dlls/kernelbase/file.c
-@@ -795,6 +795,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_
+@@ -790,6 +790,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_
      WCHAR *mask;
      BOOL has_wildcard = FALSE;
      FIND_FIRST_INFO *info = NULL;
@@ -20,7 +20,7 @@ index 89c5f85cb20..542531e895c 100644
      UNICODE_STRING nt_name;
      OBJECT_ATTRIBUTES attr;
      IO_STATUS_BLOCK io;
-@@ -826,6 +827,8 @@ HANDLE WINAPI DECLSPEC_HOTPATCH FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_
+@@ -821,6 +822,8 @@ HANDLE WINAPI DECLSPEC_HOTPATCH FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_
          return INVALID_HANDLE_VALUE;
      }
  
@@ -28,8 +28,8 @@ index 89c5f85cb20..542531e895c 100644
 +
      if (!mask && (device = RtlIsDosDeviceName_U( filename )))
      {
-         static const WCHAR dotW[] = {'.',0};
-@@ -860,8 +863,26 @@ HANDLE WINAPI DECLSPEC_HOTPATCH FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_
+         WCHAR *dir = NULL;
+@@ -854,8 +857,26 @@ HANDLE WINAPI DECLSPEC_HOTPATCH FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_
      }
      else
      {
@@ -57,7 +57,7 @@ index 89c5f85cb20..542531e895c 100644
          size = has_wildcard ? 8192 : max_entry_size;
      }
  
-@@ -922,9 +943,6 @@ HANDLE WINAPI DECLSPEC_HOTPATCH FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_
+@@ -916,9 +937,6 @@ HANDLE WINAPI DECLSPEC_HOTPATCH FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_
      }
      else
      {
@@ -68,5 +68,5 @@ index 89c5f85cb20..542531e895c 100644
                                         FileBothDirectoryInformation, FALSE, &mask_str, TRUE );
          if (status)
 -- 
-2.17.1
+2.25.1
 

patches/kernel32-Job_Tests/0001-kernel32-tests-Add-tests-for-job-object-accounting.patch

@@ -1,4 +1,4 @@
-From e9f5574ee2a3b6a0b2668747aef7d95c176ece8f Mon Sep 17 00:00:00 2001
+From 8781454669b29f8e2a2c0406ed4b48b435354a0c Mon Sep 17 00:00:00 2001
 From: Mark Jansen <mark.jansen@reactos.org>
 Date: Sun, 24 Sep 2017 22:45:22 +0200
 Subject: [PATCH] kernel32/tests: Add tests for job object accounting
@@ -9,10 +9,10 @@ Signed-off-by: Mark Jansen <mark.jansen@reactos.org>
  1 file changed, 95 insertions(+)
 
 diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
-index f181536e7a6..4c2709cce0e 100644
+index 32818042337..2ecd3dc10e8 100644
 --- a/dlls/kernel32/tests/process.c
 +++ b/dlls/kernel32/tests/process.c
-@@ -2423,6 +2423,69 @@ static void _create_process(int line, const char *command, LPPROCESS_INFORMATION
+@@ -2398,6 +2398,69 @@ static void _create_process(int line, const char *command, LPPROCESS_INFORMATION
      ok_(__FILE__, line)(ret, "CreateProcess error %u\n", GetLastError());
  }
  
@@ -82,7 +82,7 @@ index f181536e7a6..4c2709cce0e 100644
  
  static void test_IsProcessInJob(void)
  {
-@@ -2449,11 +2512,15 @@ static void test_IsProcessInJob(void)
+@@ -2423,11 +2486,15 @@ static void test_IsProcessInJob(void)
      ret = pIsProcessInJob(pi.hProcess, job, &out);
      ok(ret, "IsProcessInJob error %u\n", GetLastError());
      ok(!out, "IsProcessInJob returned out=%u\n", out);
@@ -98,7 +98,7 @@ index f181536e7a6..4c2709cce0e 100644
  
      ret = pAssignProcessToJobObject(job, pi.hProcess);
      ok(ret, "AssignProcessToJobObject error %u\n", GetLastError());
-@@ -2462,11 +2529,15 @@ static void test_IsProcessInJob(void)
+@@ -2436,11 +2503,15 @@ static void test_IsProcessInJob(void)
      ret = pIsProcessInJob(pi.hProcess, job, &out);
      ok(ret, "IsProcessInJob error %u\n", GetLastError());
      ok(out, "IsProcessInJob returned out=%u\n", out);
@@ -114,7 +114,7 @@ index f181536e7a6..4c2709cce0e 100644
  
      out = FALSE;
      ret = pIsProcessInJob(pi.hProcess, NULL, &out);
-@@ -2482,6 +2553,8 @@ static void test_IsProcessInJob(void)
+@@ -2454,6 +2525,8 @@ static void test_IsProcessInJob(void)
      ret = pIsProcessInJob(pi.hProcess, job, &out);
      ok(ret, "IsProcessInJob error %u\n", GetLastError());
      ok(out, "IsProcessInJob returned out=%u\n", out);
@@ -123,7 +123,7 @@ index f181536e7a6..4c2709cce0e 100644
  
      CloseHandle(pi.hProcess);
      CloseHandle(pi.hThread);
-@@ -2498,11 +2571,15 @@ static void test_TerminateJobObject(void)
+@@ -2470,11 +2543,15 @@ static void test_TerminateJobObject(void)
  
      job = pCreateJobObjectW(NULL, NULL);
      ok(job != NULL, "CreateJobObject error %u\n", GetLastError());
@@ -139,7 +139,7 @@ index f181536e7a6..4c2709cce0e 100644
  
      ret = pTerminateJobObject(job, 123);
      ok(ret, "TerminateJobObject error %u\n", GetLastError());
-@@ -2510,6 +2587,8 @@ static void test_TerminateJobObject(void)
+@@ -2483,6 +2560,8 @@ static void test_TerminateJobObject(void)
      dwret = WaitForSingleObject(pi.hProcess, 1000);
      ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret);
      if (dwret == WAIT_TIMEOUT) TerminateProcess(pi.hProcess, 0);
@@ -148,7 +148,7 @@ index f181536e7a6..4c2709cce0e 100644
  
      ret = GetExitCodeProcess(pi.hProcess, &dwret);
      ok(ret, "GetExitCodeProcess error %u\n", GetLastError());
-@@ -2529,6 +2608,8 @@ static void test_TerminateJobObject(void)
+@@ -2500,6 +2579,8 @@ static void test_TerminateJobObject(void)
      ret = pAssignProcessToJobObject(job, pi.hProcess);
      ok(!ret, "AssignProcessToJobObject unexpectedly succeeded\n");
      expect_eq_d(ERROR_ACCESS_DENIED, GetLastError());
@@ -157,7 +157,7 @@ index f181536e7a6..4c2709cce0e 100644
  
      CloseHandle(pi.hProcess);
      CloseHandle(pi.hThread);
-@@ -2715,11 +2796,15 @@ static void test_KillOnJobClose(void)
+@@ -2687,11 +2768,15 @@ static void test_KillOnJobClose(void)
          return;
      }
      ok(ret, "SetInformationJobObject error %u\n", GetLastError());
@@ -173,7 +173,7 @@ index f181536e7a6..4c2709cce0e 100644
  
      CloseHandle(job);
  
-@@ -2823,6 +2908,8 @@ static HANDLE test_AddSelfToJob(void)
+@@ -2801,6 +2886,8 @@ static HANDLE test_AddSelfToJob(void)
  
      ret = pAssignProcessToJobObject(job, GetCurrentProcess());
      ok(ret, "AssignProcessToJobObject error %u\n", GetLastError());
@@ -182,16 +182,16 @@ index f181536e7a6..4c2709cce0e 100644
  
      return job;
  }
-@@ -2850,6 +2937,8 @@ static void test_jobInheritance(HANDLE job)
+@@ -2822,6 +2909,8 @@ static void test_jobInheritance(HANDLE job)
      ret = pIsProcessInJob(pi.hProcess, job, &out);
      ok(ret, "IsProcessInJob error %u\n", GetLastError());
      ok(out, "IsProcessInJob returned out=%u\n", out);
 +    test_assigned_proc(job, 2, GetCurrentProcessId(), pi.dwProcessId);
 +    test_accounting(job, 2, 2, 0);
  
-     dwret = WaitForSingleObject(pi.hProcess, 1000);
-     ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret);
-@@ -2878,6 +2967,8 @@ static void test_BreakawayOk(HANDLE job)
+     wait_and_close_child_process(&pi);
+ }
+@@ -2844,6 +2933,8 @@ static void test_BreakawayOk(HANDLE job)
      ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi);
      ok(!ret, "CreateProcessA expected failure\n");
      expect_eq_d(ERROR_ACCESS_DENIED, GetLastError());
@@ -200,24 +200,24 @@ index f181536e7a6..4c2709cce0e 100644
  
      if (ret)
      {
-@@ -2900,6 +2991,8 @@ static void test_BreakawayOk(HANDLE job)
+@@ -2861,6 +2952,8 @@ static void test_BreakawayOk(HANDLE job)
      ret = pIsProcessInJob(pi.hProcess, job, &out);
      ok(ret, "IsProcessInJob error %u\n", GetLastError());
      ok(!out, "IsProcessInJob returned out=%u\n", out);
 +    test_assigned_proc(job, 1, GetCurrentProcessId());
 +    test_accounting(job, 2, 1, 0);
  
-     dwret = WaitForSingleObject(pi.hProcess, 1000);
-     ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret);
-@@ -2917,6 +3010,8 @@ static void test_BreakawayOk(HANDLE job)
+     wait_and_close_child_process(&pi);
+ 
+@@ -2874,6 +2967,8 @@ static void test_BreakawayOk(HANDLE job)
      ret = pIsProcessInJob(pi.hProcess, job, &out);
      ok(ret, "IsProcessInJob error %u\n", GetLastError());
      ok(!out, "IsProcessInJob returned out=%u\n", out);
 +    test_assigned_proc(job, 1, GetCurrentProcessId());
 +    test_accounting(job, 2, 1, 0);
  
-     dwret = WaitForSingleObject(pi.hProcess, 1000);
-     ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret);
+     wait_and_close_child_process(&pi);
+ 
 -- 
-2.23.0
+2.25.1
 

patches/loader-KeyboardLayouts/0001-loader-Add-Keyboard-Layouts-registry-enteries.patch

@@ -1,15 +1,15 @@
-From 09f5111caeb4051ccb58f0a2ffaf87b849af0ffd Mon Sep 17 00:00:00 2001
+From 9ecf6543f498cfc6c1cfb44033746cfd1ba16587 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 1 Jul 2019 09:58:55 +1000
 Subject: [PATCH] loader: Add Keyboard Layouts registry enteries.
 
 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 ---
- loader/wine.inf.in | 209 +++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 209 insertions(+)
+ loader/wine.inf.in | 215 +++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 215 insertions(+)
 
 diff --git a/loader/wine.inf.in b/loader/wine.inf.in
-index 3a73f1fd046..d96d00eb770 100644
+index 6e0cb212531..fc929859be3 100644
 --- a/loader/wine.inf.in
 +++ b/loader/wine.inf.in
 @@ -39,6 +39,7 @@ AddReg=\
@@ -44,10 +44,16 @@ index 3a73f1fd046..d96d00eb770 100644
      MCI,\
      Misc,\
      Tapi,\
-@@ -1159,6 +1163,211 @@ HKLM,System\CurrentControlSet\Control\Nls\Normalization,"5",,"normnfkc.nls"
- HKLM,System\CurrentControlSet\Control\Nls\Normalization,"6",,"normnfkd.nls"
- HKLM,System\CurrentControlSet\Control\Nls\Normalization,"d",,"normidna.nls"
+@@ -1087,6 +1091,217 @@ HKLM,System\CurrentControlSet\Control\Nls\Locale\Alternate Sorts,"00021004",,"a"
+ HKLM,System\CurrentControlSet\Control\Nls\Locale\Alternate Sorts,"00021404",,"9"
+ HKLM,System\CurrentControlSet\Control\Nls\Locale\Alternate Sorts,"00030404",,"9"
  
++HKLM,System\CurrentControlSet\Control\Nls\Normalization,"1",,"normnfc.nls"
++HKLM,System\CurrentControlSet\Control\Nls\Normalization,"2",,"normnfd.nls"
++HKLM,System\CurrentControlSet\Control\Nls\Normalization,"5",,"normnfkc.nls"
++HKLM,System\CurrentControlSet\Control\Nls\Normalization,"6",,"normnfkd.nls"
++HKLM,System\CurrentControlSet\Control\Nls\Normalization,"d",,"normidna.nls"
++
 +[KeyboardLayouts]
 +HKLM,SYSTEM\CurrentControlSet\Control\Keyboard Layouts,,16
 +HKLM,SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000401,,16
@@ -257,5 +263,5 @@ index 3a73f1fd046..d96d00eb770 100644
  HKLM,"Software\Microsoft\OLE","EnableDCOM",,"Y"
  HKLM,"Software\Microsoft\OLE","EnableRemoteConnect",,"N"
 -- 
-2.25.0
+2.25.1
 

patches/ntdll-CriticalSection/0003-ntdll-Use-fast-CS-functions-for-heap-locking.patch

@@ -1,17 +1,17 @@
-From 357104aee69fd26cf997692ba26a5e8bda1111de Mon Sep 17 00:00:00 2001
+From 50e78099e8c5fbd74131e339b8e48488e1581c74 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 5 Aug 2017 03:39:23 +0200
-Subject: ntdll: Use fast CS functions for heap locking.
+Subject: [PATCH] ntdll: Use fast CS functions for heap locking.
 
 ---
- dlls/ntdll/heap.c | 52 ++++++++++++++++++++++++++--------------------------
- 1 file changed, 26 insertions(+), 26 deletions(-)
+ dlls/ntdll/heap.c | 50 +++++++++++++++++++++++------------------------
+ 1 file changed, 25 insertions(+), 25 deletions(-)
 
 diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
-index f4ddd7bd68a..f17356c740e 100644
+index af2a489b727..178f81006d0 100644
 --- a/dlls/ntdll/heap.c
 +++ b/dlls/ntdll/heap.c
-@@ -1527,7 +1527,7 @@ static BOOL HEAP_IsRealArena( HEAP *heapPtr,   /* [in] ptr to the heap */
+@@ -1338,7 +1338,7 @@ static BOOL HEAP_IsRealArena( HEAP *heapPtr,   /* [in] ptr to the heap */
      flags |= heapPtr->flags;
      /* calling HeapLock may result in infinite recursion, so do the critsect directly */
      if (!(flags & HEAP_NO_SERIALIZE))
@@ -20,25 +20,16 @@ index f4ddd7bd68a..f17356c740e 100644
  
      if (block)  /* only check this single memory block */
      {
-@@ -1550,7 +1550,7 @@ static BOOL HEAP_IsRealArena( HEAP *heapPtr,   /* [in] ptr to the heap */
-             ret = HEAP_ValidateInUseArena( subheap, arena, quiet );
- 
-         if (!(flags & HEAP_NO_SERIALIZE))
--            RtlLeaveCriticalSection( &heapPtr->critSection );
-+            leave_critical_section( &heapPtr->critSection );
-         return ret;
-     }
- 
-@@ -1582,7 +1582,7 @@ static BOOL HEAP_IsRealArena( HEAP *heapPtr,   /* [in] ptr to the heap */
-     LIST_FOR_EACH_ENTRY( large_arena, &heapPtr->large_list, ARENA_LARGE, entry )
-         if (!(ret = validate_large_arena( heapPtr, large_arena, quiet ))) break;
+@@ -1384,7 +1384,7 @@ static BOOL HEAP_IsRealArena( HEAP *heapPtr,   /* [in] ptr to the heap */
+     ret = TRUE;
  
+ done:
 -    if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveCriticalSection( &heapPtr->critSection );
 +    if (!(flags & HEAP_NO_SERIALIZE)) leave_critical_section( &heapPtr->critSection );
      return ret;
  }
  
-@@ -1756,9 +1756,9 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, PVOID addr, SIZE_T totalSize, SIZE_T c
+@@ -1558,9 +1558,9 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, PVOID addr, SIZE_T totalSize, SIZE_T c
      if (processHeap)
      {
          HEAP *heapPtr = subheap->heap;
@@ -50,7 +41,7 @@ index f4ddd7bd68a..f17356c740e 100644
      }
      else if (!addr)
      {
-@@ -1796,9 +1796,9 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap )
+@@ -1598,9 +1598,9 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap )
      if (heap == processHeap) return heap; /* cannot delete the main process heap */
  
      /* remove it from the per-process list */
@@ -62,7 +53,7 @@ index f4ddd7bd68a..f17356c740e 100644
  
      heapPtr->critSection.DebugInfo->Spare[0] = 0;
      RtlDeleteCriticalSection( &heapPtr->critSection );
-@@ -1871,12 +1871,12 @@ PVOID WINAPI RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_T size )
+@@ -1673,12 +1673,12 @@ void * WINAPI DECLSPEC_HOTPATCH RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_
      }
      if (rounded_size < HEAP_MIN_DATA_SIZE) rounded_size = HEAP_MIN_DATA_SIZE;
  
@@ -77,7 +68,7 @@ index f4ddd7bd68a..f17356c740e 100644
          if (!ret && (flags & HEAP_GENERATE_EXCEPTIONS)) RtlRaiseStatus( STATUS_NO_MEMORY );
          TRACE("(%p,%08x,%08lx): returning %p\n", heap, flags, size, ret );
          return ret;
-@@ -1888,7 +1888,7 @@ PVOID WINAPI RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_T size )
+@@ -1690,7 +1690,7 @@ void * WINAPI DECLSPEC_HOTPATCH RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_
      {
          TRACE("(%p,%08x,%08lx): returning NULL\n",
                    heap, flags, size  );
@@ -86,7 +77,7 @@ index f4ddd7bd68a..f17356c740e 100644
          if (flags & HEAP_GENERATE_EXCEPTIONS) RtlRaiseStatus( STATUS_NO_MEMORY );
          return NULL;
      }
-@@ -1914,7 +1914,7 @@ PVOID WINAPI RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_T size )
+@@ -1716,7 +1716,7 @@ void * WINAPI DECLSPEC_HOTPATCH RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_
      notify_alloc( pInUse + 1, size, flags & HEAP_ZERO_MEMORY );
      initialize_block( pInUse + 1, size, pInUse->unused_bytes, flags );
  
@@ -95,7 +86,7 @@ index f4ddd7bd68a..f17356c740e 100644
  
      TRACE("(%p,%08x,%08lx): returning %p\n", heap, flags, size, pInUse + 1 );
      return pInUse + 1;
-@@ -1954,7 +1954,7 @@ BOOLEAN WINAPI RtlFreeHeap( HANDLE heap, ULONG flags, PVOID ptr )
+@@ -1756,7 +1756,7 @@ BOOLEAN WINAPI DECLSPEC_HOTPATCH RtlFreeHeap( HANDLE heap, ULONG flags, void *pt
  
      flags &= HEAP_NO_SERIALIZE;
      flags |= heapPtr->flags;
@@ -104,7 +95,7 @@ index f4ddd7bd68a..f17356c740e 100644
  
      /* Inform valgrind we are trying to free memory, so it can throw up an error message */
      notify_free( ptr );
-@@ -1968,12 +1968,12 @@ BOOLEAN WINAPI RtlFreeHeap( HANDLE heap, ULONG flags, PVOID ptr )
+@@ -1770,12 +1770,12 @@ BOOLEAN WINAPI DECLSPEC_HOTPATCH RtlFreeHeap( HANDLE heap, ULONG flags, void *pt
      else
          HEAP_MakeInUseBlockFree( subheap, pInUse );
  
@@ -119,7 +110,7 @@ index f4ddd7bd68a..f17356c740e 100644
      RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_PARAMETER );
      TRACE("(%p,%08x,%p): returning FALSE\n", heap, flags, ptr );
      return FALSE;
-@@ -2015,7 +2015,7 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size
+@@ -1817,7 +1817,7 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size
      flags &= HEAP_GENERATE_EXCEPTIONS | HEAP_NO_SERIALIZE | HEAP_ZERO_MEMORY |
               HEAP_REALLOC_IN_PLACE_ONLY;
      flags |= heapPtr->flags;
@@ -128,7 +119,7 @@ index f4ddd7bd68a..f17356c740e 100644
  
      rounded_size = ROUND_SIZE(size) + HEAP_TAIL_EXTRA_SIZE(flags);
      if (rounded_size < size) goto oom;  /* overflow */
-@@ -2109,19 +2109,19 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size
+@@ -1911,19 +1911,19 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size
  
      ret = pArena + 1;
  done:
@@ -151,7 +142,7 @@ index f4ddd7bd68a..f17356c740e 100644
      RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_PARAMETER );
      TRACE("(%p,%08x,%p,%08lx): returning NULL\n", heap, flags, ptr, size );
      return NULL;
-@@ -2167,7 +2167,7 @@ BOOLEAN WINAPI RtlLockHeap( HANDLE heap )
+@@ -1969,7 +1969,7 @@ BOOLEAN WINAPI RtlLockHeap( HANDLE heap )
  {
      HEAP *heapPtr = HEAP_GetPtr( heap );
      if (!heapPtr) return FALSE;
@@ -160,7 +151,7 @@ index f4ddd7bd68a..f17356c740e 100644
      return TRUE;
  }
  
-@@ -2188,7 +2188,7 @@ BOOLEAN WINAPI RtlUnlockHeap( HANDLE heap )
+@@ -1990,7 +1990,7 @@ BOOLEAN WINAPI RtlUnlockHeap( HANDLE heap )
  {
      HEAP *heapPtr = HEAP_GetPtr( heap );
      if (!heapPtr) return FALSE;
@@ -169,7 +160,7 @@ index f4ddd7bd68a..f17356c740e 100644
      return TRUE;
  }
  
-@@ -2224,7 +2224,7 @@ SIZE_T WINAPI RtlSizeHeap( HANDLE heap, ULONG flags, const void *ptr )
+@@ -2026,7 +2026,7 @@ SIZE_T WINAPI RtlSizeHeap( HANDLE heap, ULONG flags, const void *ptr )
      }
      flags &= HEAP_NO_SERIALIZE;
      flags |= heapPtr->flags;
@@ -178,7 +169,7 @@ index f4ddd7bd68a..f17356c740e 100644
  
      pArena = (const ARENA_INUSE *)ptr - 1;
      if (!validate_block_pointer( heapPtr, &subheap, pArena ))
-@@ -2241,7 +2241,7 @@ SIZE_T WINAPI RtlSizeHeap( HANDLE heap, ULONG flags, const void *ptr )
+@@ -2043,7 +2043,7 @@ SIZE_T WINAPI RtlSizeHeap( HANDLE heap, ULONG flags, const void *ptr )
      {
          ret = (pArena->size & ARENA_SIZE_MASK) - pArena->unused_bytes;
      }
@@ -187,7 +178,7 @@ index f4ddd7bd68a..f17356c740e 100644
  
      TRACE("(%p,%08x,%p): returning %08lx\n", heap, flags, ptr, ret );
      return ret;
-@@ -2288,7 +2288,7 @@ NTSTATUS WINAPI RtlWalkHeap( HANDLE heap, PVOID entry_ptr )
+@@ -2090,7 +2090,7 @@ NTSTATUS WINAPI RtlWalkHeap( HANDLE heap, PVOID entry_ptr )
  
      if (!heapPtr || !entry) return STATUS_INVALID_PARAMETER;
  
@@ -196,7 +187,7 @@ index f4ddd7bd68a..f17356c740e 100644
  
      /* FIXME: enumerate large blocks too */
  
-@@ -2393,7 +2393,7 @@ NTSTATUS WINAPI RtlWalkHeap( HANDLE heap, PVOID entry_ptr )
+@@ -2195,7 +2195,7 @@ NTSTATUS WINAPI RtlWalkHeap( HANDLE heap, PVOID entry_ptr )
      if (TRACE_ON(heap)) HEAP_DumpEntry(entry);
  
  HW_end:
@@ -205,7 +196,7 @@ index f4ddd7bd68a..f17356c740e 100644
      return ret;
  }
  
-@@ -2416,7 +2416,7 @@ ULONG WINAPI RtlGetProcessHeaps( ULONG count, HANDLE *heaps )
+@@ -2218,7 +2218,7 @@ ULONG WINAPI RtlGetProcessHeaps( ULONG count, HANDLE *heaps )
      ULONG total = 1;  /* main heap */
      struct list *ptr;
  
@@ -214,7 +205,7 @@ index f4ddd7bd68a..f17356c740e 100644
      LIST_FOR_EACH( ptr, &processHeap->entry ) total++;
      if (total <= count)
      {
-@@ -2424,7 +2424,7 @@ ULONG WINAPI RtlGetProcessHeaps( ULONG count, HANDLE *heaps )
+@@ -2226,7 +2226,7 @@ ULONG WINAPI RtlGetProcessHeaps( ULONG count, HANDLE *heaps )
          LIST_FOR_EACH( ptr, &processHeap->entry )
              *heaps++ = LIST_ENTRY( ptr, HEAP, entry );
      }
@@ -224,5 +215,5 @@ index f4ddd7bd68a..f17356c740e 100644
  }
  
 -- 
-2.13.1
+2.17.1
 

patches/ntdll-DOS_Attributes/0002-ntdll-Implement-retrieving-DOS-attributes-in-NtQuery.patch

@@ -1,4 +1,4 @@
-From 938f92470a25e590523f78912301177580c61955 Mon Sep 17 00:00:00 2001
+From 4f3272686f4ae084510f96baa5ad52bbf74d3d8d Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Wed, 20 Aug 2014 16:04:34 -0600
 Subject: [PATCH] ntdll: Implement retrieving DOS attributes in
@@ -11,21 +11,21 @@ Subject: [PATCH] ntdll: Implement retrieving DOS attributes in
  3 files changed, 16 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
-index 1ffa675..78ab0ec 100644
+index 43a13cd8fdf..74b346b51e8 100644
 --- a/dlls/ntdll/file.c
 +++ b/dlls/ntdll/file.c
-@@ -176,7 +176,8 @@ int fd_get_file_info( int fd, struct stat *st, ULONG *attr )
- /* get the stat info and file attributes for a file (by name) */
+@@ -183,7 +183,8 @@ int fd_get_file_info( int fd, unsigned int options, struct stat *st, ULONG *attr
  int get_file_info( const char *path, struct stat *st, ULONG *attr )
  {
+     char *parent_path;
 -    int ret;
 +    char hexattr[11];
 +    int len, ret;
  
      *attr = 0;
      ret = lstat( path, st );
-@@ -193,6 +194,9 @@ int get_file_info( const char *path, struct stat *st, ULONG *attr )
-             st->st_mode = (st->st_mode & ~S_IFMT) | (is_dir ? S_IFDIR : S_IFREG);
+@@ -216,6 +217,9 @@ int get_file_info( const char *path, struct stat *st, ULONG *attr )
+         RtlFreeHeap( GetProcessHeap(), 0, parent_path );
      }
      *attr |= get_file_attributes( st );
 +    len = xattr_get( path, SAMBA_XATTR_DOS_ATTRIB, hexattr, sizeof(hexattr)-1 );
@@ -35,10 +35,10 @@ index 1ffa675..78ab0ec 100644
  }
  
 diff --git a/include/wine/port.h b/include/wine/port.h
-index eaa23bc..de6b995 100644
+index 8fec3a34591..570988a9422 100644
 --- a/include/wine/port.h
 +++ b/include/wine/port.h
-@@ -351,6 +351,7 @@ extern int mkstemps(char *template, int suffix_len);
+@@ -363,6 +363,7 @@ extern int mkstemps(char *template, int suffix_len);
  #endif
  
  extern int xattr_fget( int filedes, const char *name, void *value, size_t size );
@@ -47,7 +47,7 @@ index eaa23bc..de6b995 100644
  /* Interlocked functions */
  
 diff --git a/libs/port/xattr.c b/libs/port/xattr.c
-index 94b7713..88e900d 100644
+index 94b77132bbf..88e900dac6d 100644
 --- a/libs/port/xattr.c
 +++ b/libs/port/xattr.c
 @@ -37,3 +37,13 @@ int xattr_fget( int filedes, const char *name, void *value, size_t size )
@@ -65,5 +65,5 @@ index 94b7713..88e900d 100644
 +#endif
 +}
 -- 
-1.9.1
+2.25.1
 

patches/ntdll-DOS_Attributes/0007-ntdll-Perform-the-Unix-style-hidden-file-check-withi.patch

@@ -1,4 +1,4 @@
-From a0b58c6366226c2079da60a4b5d757da4bd728b6 Mon Sep 17 00:00:00 2001
+From e1e41f084c6cdeba3cb44aaa6753b13bc1411df8 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Wed, 20 Aug 2014 11:26:48 -0600
 Subject: [PATCH] ntdll: Perform the Unix-style hidden file check within the
@@ -11,10 +11,10 @@ Subject: [PATCH] ntdll: Perform the Unix-style hidden file check within the
  3 files changed, 10 insertions(+), 17 deletions(-)
 
 diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c
-index c853470..56737b8 100644
+index ba50aa1b807..d6bf1354a5b 100644
 --- a/dlls/ntdll/directory.c
 +++ b/dlls/ntdll/directory.c
-@@ -1267,17 +1267,17 @@ static DWORD WINAPI init_options( RTL_RUN_ONCE *once, void *param, void **contex
+@@ -1274,17 +1274,17 @@ static DWORD WINAPI init_options( RTL_RUN_ONCE *once, void *param, void **contex
   *
   * Check if the specified file should be hidden based on its name and the show dot files option.
   */
@@ -37,7 +37,7 @@ index c853470..56737b8 100644
      if (p == end || *p != '.') return FALSE;
      /* make sure it isn't '.' or '..' */
      if (p + 1 == end) return FALSE;
-@@ -1526,11 +1526,6 @@ static NTSTATUS get_dir_data_entry( struct dir_data *dir_data, void *info_ptr, I
+@@ -1532,11 +1532,6 @@ static NTSTATUS get_dir_data_entry( struct dir_data *dir_data, void *info_ptr, I
      if (class != FileNamesInformation)
      {
          if (st.st_dev != dir_data->id.dev) st.st_ino = 0;  /* ignore inode if on a different device */
@@ -50,11 +50,11 @@ index c853470..56737b8 100644
      }
  
 diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
-index 0dbf612..5926c99 100644
+index 6a935044f46..a0e54c27198 100644
 --- a/dlls/ntdll/file.c
 +++ b/dlls/ntdll/file.c
-@@ -227,6 +227,10 @@ int get_file_info( const char *path, struct stat *st, ULONG *attr )
-             st->st_mode = (st->st_mode & ~S_IFMT) | (is_dir ? S_IFDIR : S_IFREG);
+@@ -250,6 +250,10 @@ int get_file_info( const char *path, struct stat *st, ULONG *attr )
+         RtlFreeHeap( GetProcessHeap(), 0, parent_path );
      }
      *attr |= get_file_attributes( st );
 +    /* convert Unix-style hidden files to a DOS hidden file attribute */
@@ -64,7 +64,7 @@ index 0dbf612..5926c99 100644
      len = xattr_get( path, SAMBA_XATTR_DOS_ATTRIB, hexattr, sizeof(hexattr)-1 );
      if (len == -1) return ret;
      *attr |= get_file_xattr( hexattr, len );
-@@ -3447,8 +3451,6 @@ NTSTATUS WINAPI NtQueryFullAttributesFile( const OBJECT_ATTRIBUTES *attr,
+@@ -3489,8 +3493,6 @@ NTSTATUS WINAPI NtQueryFullAttributesFile( const OBJECT_ATTRIBUTES *attr,
              info->AllocationSize = std.AllocationSize;
              info->EndOfFile      = std.EndOfFile;
              info->FileAttributes = basic.FileAttributes;
@@ -73,7 +73,7 @@ index 0dbf612..5926c99 100644
          }
          RtlFreeAnsiString( &unix_name );
      }
-@@ -3476,11 +3478,7 @@ NTSTATUS WINAPI NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC
+@@ -3518,11 +3520,7 @@ NTSTATUS WINAPI NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC
          else if (!S_ISREG(st.st_mode) && !S_ISDIR(st.st_mode))
              status = STATUS_INVALID_INFO_CLASS;
          else
@@ -86,10 +86,10 @@ index 0dbf612..5926c99 100644
      }
      else WARN("%s not found (%x)\n", debugstr_us(attr->ObjectName), status );
 diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
-index b762ceb..32db62e 100644
+index aeed9b857c2..b1cb9aa6843 100644
 --- a/dlls/ntdll/ntdll_misc.h
 +++ b/dlls/ntdll/ntdll_misc.h
-@@ -164,7 +164,7 @@ extern NTSTATUS fill_file_info( const struct stat *st, ULONG attr, void *ptr,
+@@ -168,7 +168,7 @@ extern NTSTATUS fill_file_info( const struct stat *st, ULONG attr, void *ptr,
                                  FILE_INFORMATION_CLASS class ) DECLSPEC_HIDDEN;
  extern NTSTATUS server_get_unix_name( HANDLE handle, ANSI_STRING *unix_name ) DECLSPEC_HIDDEN;
  extern void init_directories(void) DECLSPEC_HIDDEN;
@@ -99,5 +99,5 @@ index b762ceb..32db62e 100644
  extern NTSTATUS DIR_get_unix_cwd( char **cwd ) DECLSPEC_HIDDEN;
  extern unsigned int DIR_get_drives_info( struct drive_info info[MAX_DOS_DRIVES] ) DECLSPEC_HIDDEN;
 -- 
-1.9.1
+2.25.1
 

patches/ntdll-DOS_Attributes/0008-ntdll-Always-store-SAMBA_XATTR_DOS_ATTRIB-when-path-.patch

@@ -1,4 +1,4 @@
-From 1fe0fcb904363d5ac59b8d30a918f62f622b78b7 Mon Sep 17 00:00:00 2001
+From 08ece1e8da040d80c13348c2ffeb56052779dc53 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 14 Jan 2016 23:09:19 +0100
 Subject: [PATCH] ntdll: Always store SAMBA_XATTR_DOS_ATTRIB when path could be
@@ -9,11 +9,11 @@ Subject: [PATCH] ntdll: Always store SAMBA_XATTR_DOS_ATTRIB when path could be
  1 file changed, 8 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
-index 5926c99..cbd2531 100644
+index a0e54c27198..61b417ef678 100644
 --- a/dlls/ntdll/file.c
 +++ b/dlls/ntdll/file.c
-@@ -227,12 +227,15 @@ int get_file_info( const char *path, struct stat *st, ULONG *attr )
-             st->st_mode = (st->st_mode & ~S_IFMT) | (is_dir ? S_IFDIR : S_IFREG);
+@@ -250,12 +250,15 @@ int get_file_info( const char *path, struct stat *st, ULONG *attr )
+         RtlFreeHeap( GetProcessHeap(), 0, parent_path );
      }
      *attr |= get_file_attributes( st );
 -    /* convert Unix-style hidden files to a DOS hidden file attribute */
@@ -32,7 +32,7 @@ index 5926c99..cbd2531 100644
      *attr |= get_file_xattr( hexattr, len );
      return ret;
  }
-@@ -245,7 +248,7 @@ NTSTATUS set_file_info( const char *path, ULONG attr )
+@@ -268,7 +271,7 @@ NTSTATUS set_file_info( const char *path, ULONG attr )
      /* Note: unix mode already set when called this way */
      attr &= ~FILE_ATTRIBUTE_NORMAL; /* do not store everything, but keep everything Samba can use */
      len = sprintf( hexattr, "0x%x", attr );
@@ -42,5 +42,5 @@ index 5926c99..cbd2531 100644
      else
          xattr_remove( path, SAMBA_XATTR_DOS_ATTRIB );
 -- 
-1.9.1
+2.25.1
 

patches/ntdll-FileDispositionInformation/0003-server-When-combining-root-and-name-make-sure-there-.patch

@@ -1,66 +0,0 @@
-From d3eff4b920f4bc700046779cc44cea186b4cf28a Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Wed, 3 Jun 2015 01:37:34 +0200
-Subject: server: When combining root and name, make sure there is only one
- slash. (v2)
-
-Changes in v2:
-  * Resolve inter-patch conflict.
----
- dlls/ntdll/tests/file.c |  4 ++--
- server/fd.c             | 16 ++++++++++++----
- 2 files changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
-index a24ce35..8b20966 100644
---- a/dlls/ntdll/tests/file.c
-+++ b/dlls/ntdll/tests/file.c
-@@ -2147,8 +2147,8 @@ static void test_file_rename_information(void)
-     res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation );
-     ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res );
-     fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0;
--    todo_wine ok( !lstrcmpiW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n",
--                  wine_dbgstr_w(newpath + 2), wine_dbgstr_w(fni->FileName) );
-+    ok( !lstrcmpiW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n",
-+        wine_dbgstr_w(newpath + 2), wine_dbgstr_w(fni->FileName) );
-     HeapFree( GetProcessHeap(), 0, fni );
- 
-     CloseHandle( handle );
-diff --git a/server/fd.c b/server/fd.c
-index ea328d2..e6bd5e0 100644
---- a/server/fd.c
-+++ b/server/fd.c
-@@ -1730,6 +1730,7 @@ void set_fd_user( struct fd *fd, const struct fd_ops *user_ops, struct object *u
- char *dup_fd_name( struct fd *root, const char *name )
- {
-     char *ret;
-+    int len;
- 
-     if (!root) return strdup( name );
-     if (!root->unix_name) return NULL;
-@@ -1737,11 +1738,18 @@ char *dup_fd_name( struct fd *root, const char *name )
-     /* skip . prefix */
-     if (name[0] == '.' && (!name[1] || name[1] == '/')) name++;
- 
--    if ((ret = malloc( strlen(root->unix_name) + strlen(name) + 2 )))
-+    len = strlen( root->unix_name );
-+    if ((ret = malloc( len + strlen(name) + 2 )))
-     {
--        strcpy( ret, root->unix_name );
--        if (name[0] && name[0] != '/') strcat( ret, "/" );
--        strcat( ret, name );
-+        memcpy( ret, root->unix_name, len );
-+        while (len && ret[len - 1] == '/') len--;
-+        while (name[0] == '/') name++;
-+        if (name[0])
-+        {
-+            ret[ len ] = '/';
-+            strcpy( ret + len + 1, name );
-+        }
-+        else ret[ len ] = 0;
-     }
-     return ret;
- }
--- 
-2.9.0
-

patches/ntdll-HashLinks/0002-ntdll-Use-HashLinks-when-searching-for-a-dll-using-t.patch

@@ -1,4 +1,4 @@
-From bcf36a9100a2452469c0058798073a72e1dba8f9 Mon Sep 17 00:00:00 2001
+From 6e41aeac02672253805dbadf694965cd1fb925bf Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 3 Apr 2017 05:56:19 +0200
 Subject: ntdll: Use HashLinks when searching for a dll using the basename.
@@ -8,11 +8,11 @@ Subject: ntdll: Use HashLinks when searching for a dll using the basename.
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index d9b6b7d1c7..7f0d2e7375 100644
+index 289c15a7be3..88fd86ce2be 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
-@@ -509,10 +509,10 @@ static WINE_MODREF *find_basename_module( LPCWSTR name )
-     if (cached_modref && !strcmpiW( name, cached_modref->ldr.BaseDllName.Buffer ))
+@@ -541,10 +541,10 @@ static WINE_MODREF *find_basename_module( LPCWSTR name )
+     if (cached_modref && RtlEqualUnicodeString( &name_str, &cached_modref->ldr.BaseDllName, TRUE ))
          return cached_modref;
  
 -    mark = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList;
@@ -21,9 +21,9 @@ index d9b6b7d1c7..7f0d2e7375 100644
      {
 -        LDR_MODULE *mod = CONTAINING_RECORD(entry, LDR_MODULE, InLoadOrderModuleList);
 +        LDR_MODULE *mod = CONTAINING_RECORD(entry, LDR_MODULE, HashLinks);
-         if (!strcmpiW( name, mod->BaseDllName.Buffer ))
+         if (RtlEqualUnicodeString( &name_str, &mod->BaseDllName, TRUE ))
          {
              cached_modref = CONTAINING_RECORD(mod, WINE_MODREF, ldr);
 -- 
-2.11.0
+2.25.1
 

patches/ntdll-Junction_Points/0014-ntdll-Correctly-report-file-symbolic-links-as-files.patch

@@ -1,7 +1,7 @@
-From 916221d26598c06a07e84d980ae4c16e92b38ebd Mon Sep 17 00:00:00 2001
+From f1cc7357530e993ca472d496bdcf8f38d931ccb6 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Sat, 30 Mar 2019 12:00:51 -0600
-Subject: ntdll: Correctly report file symbolic links as files.
+Subject: [PATCH] ntdll: Correctly report file symbolic links as files.
 
 Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
 ---
@@ -10,7 +10,7 @@ Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
  2 files changed, 84 insertions(+), 44 deletions(-)
 
 diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
-index 3e1121e521..be594ea517 100644
+index e1f9ef1199c..fd3a48dffec 100644
 --- a/dlls/ntdll/file.c
 +++ b/dlls/ntdll/file.c
 @@ -124,6 +124,9 @@ mode_t FILE_umask = 0;
@@ -23,7 +23,7 @@ index 3e1121e521..be594ea517 100644
  /* fetch the attributes of a file */
  static inline ULONG get_file_attributes( const struct stat *st )
  {
-@@ -160,10 +163,15 @@ int get_file_info( const char *path, struct stat *st, ULONG *attr )
+@@ -171,10 +174,15 @@ int get_file_info( const char *path, struct stat *st, ULONG *attr )
      if (ret == -1) return ret;
      if (S_ISLNK( st->st_mode ))
      {
@@ -41,9 +41,9 @@ index 3e1121e521..be594ea517 100644
 +        if (FILE_DecodeSymlink( path, NULL, NULL, NULL, NULL, &is_dir ) == STATUS_SUCCESS)
 +            st->st_mode = (st->st_mode & ~S_IFMT) | (is_dir ? S_IFDIR : S_IFREG);
      }
-     *attr |= get_file_attributes( st );
-     return ret;
-@@ -1817,48 +1825,33 @@ cleanup:
+     else if (S_ISDIR( st->st_mode ) && (parent_path = RtlAllocateHeap( GetProcessHeap(), 0, strlen(path) + 4 )))
+     {
+@@ -1842,48 +1850,33 @@ cleanup:
  }
  
  
@@ -107,7 +107,7 @@ index 3e1121e521..be594ea517 100644
          p++;
      }
      if (*p++ != '/')
-@@ -1866,7 +1859,7 @@ NTSTATUS FILE_GetSymlink(HANDLE handle, REPARSE_DATA_BUFFER *buffer, ULONG out_s
+@@ -1891,7 +1884,7 @@ NTSTATUS FILE_GetSymlink(HANDLE handle, REPARSE_DATA_BUFFER *buffer, ULONG out_s
          status = STATUS_NOT_IMPLEMENTED;
          goto cleanup;
      }
@@ -116,7 +116,7 @@ index 3e1121e521..be594ea517 100644
      for (i = 0; i < sizeof(ULONG)*8; i++)
      {
          char c = *p++;
-@@ -1881,21 +1874,68 @@ NTSTATUS FILE_GetSymlink(HANDLE handle, REPARSE_DATA_BUFFER *buffer, ULONG out_s
+@@ -1906,21 +1899,68 @@ NTSTATUS FILE_GetSymlink(HANDLE handle, REPARSE_DATA_BUFFER *buffer, ULONG out_s
              status = STATUS_NOT_IMPLEMENTED;
              goto cleanup;
          }
@@ -191,10 +191,10 @@ index 3e1121e521..be594ea517 100644
      /* convert the relative path into an absolute path */
      if (flags == SYMLINK_FLAG_RELATIVE)
 diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
-index b904bc1f2d..fbd824fd10 100644
+index 1f278f63963..dfc3617ec01 100644
 --- a/dlls/ntdll/tests/file.c
 +++ b/dlls/ntdll/tests/file.c
-@@ -5065,13 +5065,13 @@ static void test_reparse_points(void)
+@@ -5188,13 +5188,13 @@ static void test_reparse_points(void)
  
      /* Check deleting a file symlink as if it were a directory */
      bret = RemoveDirectoryW(reparse_path);
@@ -210,7 +210,7 @@ index b904bc1f2d..fbd824fd10 100644
      ok(dwret & FILE_ATTRIBUTE_REPARSE_POINT, "File is not a symlink! (attributes: 0x%x)\n", dwret);
  
      /* Delete the symlink as a file */
-@@ -5080,10 +5080,10 @@ static void test_reparse_points(void)
+@@ -5203,10 +5203,10 @@ static void test_reparse_points(void)
  
      /* Create a blank slate for directory symlink tests */
      bret = CreateDirectoryW(reparse_path, NULL);
@@ -224,5 +224,5 @@ index b904bc1f2d..fbd824fd10 100644
      /* Create the directory symlink */
      HeapFree(GetProcessHeap(), 0, buffer);
 -- 
-2.17.1
+2.25.1