You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against 1bb953c6766c9cc4372ca23a7c5b7de101324218
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From dcbf5bcf5fc813040532be9a4adc1999b74c189d Mon Sep 17 00:00:00 2001
|
||||
From 76d0bfce8f6fec167e44afefc63dbbf4e52beda2 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 c141d96392..3e10bb4dee 100644
|
||||
index 557cec20cf8..46d65328a91 100644
|
||||
--- a/include/wine/library.h
|
||||
+++ b/include/wine/library.h
|
||||
@@ -89,6 +89,11 @@ extern int wine_mmap_is_in_reserved_area( void *addr, size_t size );
|
||||
@@ -79,6 +79,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 c141d96392..3e10bb4dee 100644
|
||||
|
||||
/* LDT management */
|
||||
diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c
|
||||
index f2b5adc1d2..baa466c776 100644
|
||||
index f2b5adc1d29..baa466c7766 100644
|
||||
--- a/libs/wine/mmap.c
|
||||
+++ b/libs/wine/mmap.c
|
||||
@@ -52,7 +52,9 @@ struct reserved_area
|
||||
@@ -240,10 +240,10 @@ index f2b5adc1d2..baa466c776 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 72ffed80c0..448ab98572 100644
|
||||
index 8e3382168d5..8d367d7b756 100644
|
||||
--- a/libs/wine/wine.map
|
||||
+++ b/libs/wine/wine.map
|
||||
@@ -112,6 +112,10 @@ WINE_1.0
|
||||
@@ -59,6 +59,10 @@ WINE_1.0
|
||||
wine_mmap_enum_reserved_areas;
|
||||
wine_mmap_is_in_reserved_area;
|
||||
wine_mmap_remove_reserved_area;
|
||||
@@ -251,9 +251,9 @@ index 72ffed80c0..448ab98572 100644
|
||||
+ wine_mmap_enum_free_areas;
|
||||
+ wine_mmap_is_in_free_area;
|
||||
+ wine_mmap_remove_free_area;
|
||||
wine_pthread_get_functions;
|
||||
wine_pthread_set_functions;
|
||||
wine_set_fs;
|
||||
wine_set_gs;
|
||||
wine_utf8_mbstowcs;
|
||||
--
|
||||
2.24.1
|
||||
2.17.1
|
||||
|
||||
|
Reference in New Issue
Block a user