Rebase against 9642f35922b79cebacdc774eb54619e389ccd531.

This commit is contained in:
Zebediah Figura
2020-02-05 17:42:46 -06:00
parent 0d7a4f0c73
commit 991bebfee7
9 changed files with 83 additions and 274 deletions

View File

@@ -1,4 +1,4 @@
From 76d0bfce8f6fec167e44afefc63dbbf4e52beda2 Mon Sep 17 00:00:00 2001
From 11d770c9800f37a9148b776836fdb24f8c43d403 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.
@@ -10,10 +10,10 @@ Subject: [PATCH] libs/wine: Add functions for managing free area list.
3 files changed, 67 insertions(+), 17 deletions(-)
diff --git a/include/wine/library.h b/include/wine/library.h
index 557cec20cf8..46d65328a91 100644
index a6fe28059..006c59ba3 100644
--- a/include/wine/library.h
+++ b/include/wine/library.h
@@ -79,6 +79,11 @@ extern int wine_mmap_is_in_reserved_area( void *addr, size_t size );
@@ -76,6 +76,11 @@ 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 );
@@ -26,7 +26,7 @@ index 557cec20cf8..46d65328a91 100644
/* LDT management */
diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c
index f2b5adc1d29..baa466c7766 100644
index f2b5adc1d..baa466c77 100644
--- a/libs/wine/mmap.c
+++ b/libs/wine/mmap.c
@@ -52,7 +52,9 @@ struct reserved_area
@@ -240,10 +240,10 @@ index f2b5adc1d29..baa466c7766 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 8e3382168d5..8d367d7b756 100644
index f0c94a950..3fc30237e 100644
--- a/libs/wine/wine.map
+++ b/libs/wine/wine.map
@@ -59,6 +59,10 @@ WINE_1.0
@@ -51,6 +51,10 @@ WINE_1.0
wine_mmap_enum_reserved_areas;
wine_mmap_is_in_reserved_area;
wine_mmap_remove_reserved_area;
@@ -253,7 +253,7 @@ index 8e3382168d5..8d367d7b756 100644
+ wine_mmap_remove_free_area;
wine_set_fs;
wine_set_gs;
wine_utf8_mbstowcs;
wine_wctype_table;
--
2.17.1
2.25.0