Rebase against e7c735b825b504b7742fdfa991a1cbc462e9c622

patches/ntdll-Activation_Context/0001-ntdll-Fix-return-value-for-missing-ACTIVATION_CONTEX.patch

@@ -1,7 +1,7 @@
-From d9e16cb2bde3371d403da8dbbc2c7d63b9a29a27 Mon Sep 17 00:00:00 2001
+From caf668bdbcf74b6f00d6d70ae6030007852a082d Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 16 Mar 2015 03:46:36 +0100
-Subject: ntdll: Fix return value for missing
+Subject: [PATCH] ntdll: Fix return value for missing
  ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION key.
 
 ---
@@ -10,10 +10,10 @@ Subject: ntdll: Fix return value for missing
  2 files changed, 19 insertions(+), 20 deletions(-)
 
 diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c
-index af3dadf..b68c895 100644
+index 4b7096276e8..8effbdbc9bc 100644
 --- a/dlls/kernel32/tests/actctx.c
 +++ b/dlls/kernel32/tests/actctx.c
-@@ -2067,7 +2067,7 @@ static HANDLE create_manifest(const char *filename, const char *data, int line)
+@@ -2365,7 +2365,7 @@ static HANDLE create_manifest(const char *filename, const char *data, int line)
      return handle;
  }
  
@@ -22,7 +22,7 @@ index af3dadf..b68c895 100644
  {
      UNICODE_STRING string_to_findW;
      ACTCTX_SECTION_KEYED_DATA data;
-@@ -2084,7 +2084,6 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should
+@@ -2382,7 +2382,6 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should
      err = GetLastError();
      ok_(__FILE__, line)(ret == should_find,
          "FindActCtxSectionStringA: expected ret = %u, got %u\n", should_find, ret);
@@ -30,7 +30,7 @@ index af3dadf..b68c895 100644
      ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND),
          "FindActCtxSectionStringA: unexpected error %u\n", err);
  
-@@ -2096,7 +2095,6 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should
+@@ -2394,7 +2393,6 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should
      err = GetLastError();
      ok_(__FILE__, line)(ret == should_find,
          "FindActCtxSectionStringW: expected ret = %u, got %u\n", should_find, ret);
@@ -38,7 +38,7 @@ index af3dadf..b68c895 100644
      ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND),
          "FindActCtxSectionStringW: unexpected error %u\n", err);
  
-@@ -2119,7 +2117,7 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should
+@@ -2417,7 +2415,7 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should
      pRtlFreeUnicodeString(&string_to_findW);
  }
  
@@ -47,7 +47,7 @@ index af3dadf..b68c895 100644
  {
      UNICODE_STRING string_to_findW;
      ACTCTX_SECTION_KEYED_DATA data;
-@@ -2131,12 +2129,10 @@ static void ntdll_find(ULONG section, const char *string_to_find, BOOL should_fi
+@@ -2429,12 +2427,10 @@ static void ntdll_find(ULONG section, const char *string_to_find, BOOL should_fi
      data.cbSize = sizeof(data);
  
      ret = pRtlFindActivationContextSectionString(0, NULL, section, &string_to_findW, &data);
@@ -60,7 +60,7 @@ index af3dadf..b68c895 100644
      ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND),
          "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret);
  
-@@ -2154,22 +2150,22 @@ static void test_findsectionstring(void)
+@@ -2452,22 +2448,22 @@ static void test_findsectionstring(void)
      ok(ret, "ActivateActCtx failed: %u\n", GetLastError());
  
      /* first we show the parameter validation from kernel32 */
@@ -95,13 +95,13 @@ index af3dadf..b68c895 100644
 +    ntdll_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass2", TRUE, __LINE__);
 +    ntdll_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass3", FALSE, __LINE__);
  
-     ret = pDeactivateActCtx(0, cookie);
+     ret = DeactivateActCtx(0, cookie);
      ok(ret, "DeactivateActCtx failed: %u\n", GetLastError());
 diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c
-index 4aa1a72..8957fad 100644
+index 59e9671f9a8..c50d1a42fcf 100644
 --- a/dlls/ntdll/actctx.c
 +++ b/dlls/ntdll/actctx.c
-@@ -4431,6 +4431,9 @@ static NTSTATUS find_string(ACTIVATION_CONTEXT* actctx, ULONG section_kind,
+@@ -4842,6 +4842,9 @@ static NTSTATUS find_string(ACTIVATION_CONTEXT* actctx, ULONG section_kind,
  
      switch (section_kind)
      {
@@ -112,5 +112,5 @@ index 4aa1a72..8957fad 100644
          status = find_dll_redirection(actctx, section_name, data);
          break;
 -- 
-2.7.0
+2.17.1
 

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "a10267172046fc16aaa1cd1237701f6867b92fc0"
+	echo "e7c735b825b504b7742fdfa991a1cbc462e9c622"
 }
 
 # Show version information