wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 9642f35922b79cebacdc774eb54619e389ccd531.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 540ee9ebdee96f7c67224bfae699375c8cb4c90c Mon Sep 17 00:00:00 2001
From 5c9a371d0da2f0835ab86afb4f9264634a993375 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 511bf4722a0..557cec20cf8 100644
index 511bf4722..557cec20c 100644
--- a/include/wine/library.h
+++ b/include/wine/library.h
@@ -44,6 +44,7 @@ extern "C" {
@@ -32,7 +32,7 @@ index 511bf4722a0..557cec20cf8 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 5b66c063db6..e0988513e14 100644
index 5b66c063d..e0988513e 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 5b66c063db6..e0988513e14 100644
const char *wine_get_server_dir(void)
{
diff --git a/libs/wine/loader.c b/libs/wine/loader.c
index 2a569f5b739..5f10c3f9d3e 100644
index 2a569f5b7..5f10c3f9d 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,27 +214,27 @@ index 2a569f5b739..5f10c3f9d3e 100644
* wine_dlsym
*/
diff --git a/libs/wine/wine.map b/libs/wine/wine.map
index 5edee0d9235..8e3382168d5 100644
index 13b8d4715..3cfd3a24c 100644
--- a/libs/wine/wine.map
+++ b/libs/wine/wine.map
@@ -16,6 +16,7 @@ WINE_1.0
@@ -13,6 +13,7 @@ WINE_1.0
wine_cp_get_table;
wine_cp_mbstowcs;
wine_cp_wcstombs;
wine_cpsymbol_mbstowcs;
wine_cpsymbol_wcstombs;
+ wine_dladdr;
wine_dlclose;
wine_dll_enum_load_path;
wine_dll_set_callback;
@@ -32,6 +33,7 @@ WINE_1.0
@@ -28,6 +29,7 @@ WINE_1.0
wine_get_es;
wine_get_fs;
wine_get_gs;
+ wine_get_libs;
wine_get_server_dir;
wine_get_sortkey;
wine_get_ss;
wine_get_user_name;
diff --git a/loader/main.c b/loader/main.c
index f6629128de1..a2dc40c51cc 100644
index f6629128d..a2dc40c51 100644
--- a/loader/main.c
+++ b/loader/main.c
@@ -36,6 +36,12 @@
@@ -309,5 +309,5 @@ index f6629128de1..a2dc40c51cc 100644
--
2.17.1
2.25.0