Rebase against 7096ab45444d7b7cbb926b5a51af0cbc46960ed3

patches/Staging/0003-loader-Add-commandline-option-patches-to-show-the-pa.patch

@@ -1,4 +1,4 @@
-From d216f85a593a09e7983d9178fb3e1f20bfcf08cc Mon Sep 17 00:00:00 2001
+From 63d2046a8f4388fbc7c12a07ae5f412fccc1b202 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 29 May 2014 23:43:45 +0200
 Subject: [PATCH] loader: Add commandline option --patches to show the patch
@@ -14,7 +14,7 @@ Subject: [PATCH] loader: Add commandline option --patches to show the patch
  6 files changed, 58 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
-index c29a1c26c..8906e1942 100644
+index c29a1c26c26..8906e194272 100644
 --- a/dlls/ntdll/misc.c
 +++ b/dlls/ntdll/misc.c
 @@ -60,6 +60,14 @@ const char * CDECL NTDLL_wine_get_version(void)
@@ -33,10 +33,10 @@ index c29a1c26c..8906e1942 100644
   *                  wine_get_build_id   (NTDLL.@)
   */
 diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
-index 7aa953ca6..cf7d5b6f9 100644
+index e61a2578da5..52db67fd978 100644
 --- a/dlls/ntdll/ntdll.spec
 +++ b/dlls/ntdll/ntdll.spec
-@@ -1566,6 +1566,7 @@
+@@ -1571,6 +1571,7 @@
  
  # Version
  @ cdecl wine_get_version() NTDLL_wine_get_version
@@ -45,7 +45,7 @@ index 7aa953ca6..cf7d5b6f9 100644
  @ cdecl wine_get_host_version(ptr ptr) NTDLL_wine_get_host_version
  
 diff --git a/include/wine/library.h b/include/wine/library.h
-index a6fe28059..511bf4722 100644
+index f338c4da190..1f992da6062 100644
 --- a/include/wine/library.h
 +++ b/include/wine/library.h
 @@ -47,6 +47,7 @@ extern const char *wine_get_data_dir(void);
@@ -57,7 +57,7 @@ index a6fe28059..511bf4722 100644
  extern void wine_init_argv0_path( const char *argv0 );
  extern void wine_exec_wine_binary( const char *name, char **argv, const char *env_var );
 diff --git a/libs/wine/config.c b/libs/wine/config.c
-index 2a3314cbf..5b66c063d 100644
+index 2a3314cbfda..5b66c063db6 100644
 --- a/libs/wine/config.c
 +++ b/libs/wine/config.c
 @@ -504,6 +504,12 @@ const char *wine_get_version(void)
@@ -74,22 +74,22 @@ index 2a3314cbf..5b66c063d 100644
  const char *wine_get_build_id(void)
  {
 diff --git a/libs/wine/wine.map b/libs/wine/wine.map
-index 3f2c430fa..ca46979f5 100644
+index 7ea849b908e..a7359ee7872 100644
 --- a/libs/wine/wine.map
 +++ b/libs/wine/wine.map
-@@ -28,6 +28,7 @@ WINE_1.0
-     wine_get_ss;
+@@ -22,6 +22,7 @@ WINE_1.0
+     wine_get_server_dir;
      wine_get_user_name;
      wine_get_version;
 +    wine_get_patches;
      wine_init;
      wine_init_argv0_path;
-     wine_ldt_alloc_entries;
+     wine_mmap_add_reserved_area;
 diff --git a/loader/main.c b/loader/main.c
-index f197cf802..f6629128d 100644
+index 407c897892d..d97d6b28bf8 100644
 --- a/loader/main.c
 +++ b/loader/main.c
-@@ -54,7 +54,8 @@ static void check_command_line( int argc, char *argv[] )
+@@ -53,7 +53,8 @@ static void check_command_line( int argc, char *argv[] )
      static const char usage[] =
          "Usage: wine PROGRAM [ARGUMENTS...]   Run the specified program\n"
          "       wine --help                   Display this help and exit\n"
@@ -99,7 +99,7 @@ index f197cf802..f6629128d 100644
  
      if (argc <= 1)
      {
-@@ -71,6 +72,45 @@ static void check_command_line( int argc, char *argv[] )
+@@ -70,6 +71,45 @@ static void check_command_line( int argc, char *argv[] )
          printf( "%s\n", wine_get_build_id() );
          exit(0);
      }
@@ -146,5 +146,5 @@ index f197cf802..f6629128d 100644
  
  
 -- 
-2.25.0
+2.25.1
 

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

@@ -1,4 +1,4 @@
-From df12fdb8d4cdf11d9f72a068923a5b0097e36bdb Mon Sep 17 00:00:00 2001
+From f600092be294a5bb42e42abcd20cc784d1ca5eab 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 1f992da6062..60d6b525c75 100644
 --- a/include/wine/library.h
 +++ b/include/wine/library.h
 @@ -44,6 +44,7 @@ extern "C" {
@@ -167,10 +167,10 @@ 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 53e33c496a9..eb7dfb59fb8 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
+@@ -1073,6 +1073,42 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize
      return ret;
  }
  
@@ -214,7 +214,7 @@ index 2a569f5b739..5f10c3f9d3e 100644
   *		wine_dlsym
   */
 diff --git a/libs/wine/wine.map b/libs/wine/wine.map
-index ca46979f5b9..22a4e73b05b 100644
+index a7359ee7872..9c4c86dde4d 100644
 --- a/libs/wine/wine.map
 +++ b/libs/wine/wine.map
 @@ -9,6 +9,7 @@ WINE_1.0
@@ -225,14 +225,14 @@ index ca46979f5b9..22a4e73b05b 100644
      wine_dlclose;
      wine_dll_enum_load_path;
      wine_dll_set_callback;
-@@ -24,6 +25,7 @@ WINE_1.0
-     wine_get_es;
-     wine_get_fs;
-     wine_get_gs;
+@@ -19,6 +20,7 @@ WINE_1.0
+     wine_get_build_id;
+     wine_get_config_dir;
+     wine_get_data_dir;
 +    wine_get_libs;
      wine_get_server_dir;
-     wine_get_ss;
      wine_get_user_name;
+     wine_get_version;
 diff --git a/loader/main.c b/loader/main.c
 index d97d6b28bf8..49dc996e354 100644
 --- a/loader/main.c