Rebase against 7096ab45444d7b7cbb926b5a51af0cbc46960ed3

patches/ntdll-ForceBottomUpAlloc/0005-libs-wine-Add-functions-for-managing-free-area-list.patch

@@ -1,19 +1,19 @@
-From 11d770c9800f37a9148b776836fdb24f8c43d403 Mon Sep 17 00:00:00 2001
+From 20012afe9a7e47f06550c9802e62d66ac9f9abba Mon Sep 17 00:00:00 2001
 From: Paul Gofman <gofmanp@gmail.com>
 Date: Tue, 14 Jan 2020 21:28:57 +0300
 Subject: [PATCH] libs/wine: Add functions for managing free area list.
 
 ---
- include/wine/library.h |  5 +++
+ include/wine/library.h |  6 ++++
  libs/wine/mmap.c       | 75 ++++++++++++++++++++++++++++++++----------
  libs/wine/wine.map     |  4 +++
- 3 files changed, 67 insertions(+), 17 deletions(-)
+ 3 files changed, 68 insertions(+), 17 deletions(-)
 
 diff --git a/include/wine/library.h b/include/wine/library.h
-index a6fe28059..006c59ba3 100644
+index 60d6b525c75..70b6a0b3055 100644
 --- a/include/wine/library.h
 +++ b/include/wine/library.h
-@@ -76,6 +76,11 @@ extern int wine_mmap_is_in_reserved_area( void *addr, size_t size );
+@@ -79,6 +79,12 @@ extern int wine_mmap_is_in_reserved_area( void *addr, size_t size );
  extern int wine_mmap_enum_reserved_areas( int (*enum_func)(void *base, size_t size, void *arg),
                                            void *arg, int top_down );
  
@@ -22,11 +22,12 @@ index a6fe28059..006c59ba3 100644
 +extern int wine_mmap_is_in_free_area( void *addr, size_t size );
 +extern int wine_mmap_enum_free_areas( int (*enum_func)(void *base, size_t size, void *arg),
 +                                          void *arg, int top_down );
- #ifdef __i386__
- 
- /* LDT management */
++
+ #ifdef __cplusplus
+ }
+ #endif
 diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c
-index f2b5adc1d..baa466c77 100644
+index f2b5adc1d29..baa466c7766 100644
 --- a/libs/wine/mmap.c
 +++ b/libs/wine/mmap.c
 @@ -52,7 +52,9 @@ struct reserved_area
@@ -240,10 +241,10 @@ index f2b5adc1d..baa466c77 100644
 +    return wine_mmap_enum_areas(&free_areas_list, enum_func, arg, top_down);
 +}
 diff --git a/libs/wine/wine.map b/libs/wine/wine.map
-index f0c94a950..3fc30237e 100644
+index 9c4c86dde4d..32bf99bd6e6 100644
 --- a/libs/wine/wine.map
 +++ b/libs/wine/wine.map
-@@ -51,6 +51,10 @@ WINE_1.0
+@@ -31,6 +31,10 @@ WINE_1.0
      wine_mmap_enum_reserved_areas;
      wine_mmap_is_in_reserved_area;
      wine_mmap_remove_reserved_area;
@@ -251,9 +252,9 @@ index f0c94a950..3fc30237e 100644
 +    wine_mmap_enum_free_areas;
 +    wine_mmap_is_in_free_area;
 +    wine_mmap_remove_free_area;
-     wine_set_fs;
-     wine_set_gs;
      wine_wctype_table;
+ 
+     /* the following functions are obsolete and only exported for backwards compatibility */
 -- 
-2.25.0
+2.25.1