Rebase against 5e42498e634abda051aa59a3faeb2cf10469b1a6.

patches/ntdll-HashLinks/0002-ntdll-Use-HashLinks-when-searching-for-a-dll-using-t.patch

@@ -1,4 +1,4 @@
-From f462fb516150f5f8cd7403e19217311987f6ba5e Mon Sep 17 00:00:00 2001
+From b4ff0ed25c0f95d720d7a7ace07f024512d27af2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 3 Apr 2017 05:56:19 +0200
 Subject: [PATCH] ntdll: Use HashLinks when searching for a dll using the
@@ -9,10 +9,10 @@ Subject: [PATCH] ntdll: Use HashLinks when searching for a dll using the
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index c226c467cd2..c7d590c32dc 100644
+index 272ad323444..f3d39e001c6 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
-@@ -551,10 +551,10 @@ static WINE_MODREF *find_basename_module( LPCWSTR name )
+@@ -547,10 +547,10 @@ static WINE_MODREF *find_basename_module( LPCWSTR name )
      if (cached_modref && RtlEqualUnicodeString( &name_str, &cached_modref->ldr.BaseDllName, TRUE ))
          return cached_modref;
  
@@ -20,11 +20,11 @@ index c226c467cd2..c7d590c32dc 100644
 +    mark = &hash_table[hash_basename(name)];
      for (entry = mark->Flink; entry != mark; entry = entry->Flink)
      {
--        LDR_DATA_TABLE_ENTRY *mod = CONTAINING_RECORD(entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks);
-+        LDR_DATA_TABLE_ENTRY *mod = CONTAINING_RECORD(entry, LDR_DATA_TABLE_ENTRY, HashLinks);
-         if (RtlEqualUnicodeString( &name_str, &mod->BaseDllName, TRUE ))
+-        WINE_MODREF *mod = CONTAINING_RECORD(entry, WINE_MODREF, ldr.InLoadOrderLinks);
++        WINE_MODREF *mod = CONTAINING_RECORD(entry, WINE_MODREF, ldr.HashLinks);
+         if (RtlEqualUnicodeString( &name_str, &mod->ldr.BaseDllName, TRUE ) && !mod->system)
          {
              cached_modref = CONTAINING_RECORD(mod, WINE_MODREF, ldr);
 -- 
-2.26.0
+2.33.0
 

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "28c35689d2d9193cbf7ce5f523fecbaf377ae273"
+	echo "5e42498e634abda051aa59a3faeb2cf10469b1a6"
 }
 
 # Show version information

staging/upstream-commit

@@ -1 +1 @@
-28c35689d2d9193cbf7ce5f523fecbaf377ae273
+5e42498e634abda051aa59a3faeb2cf10469b1a6