Rebase against 893080e4df5a45929320ebb88b8668eea316476c.

patches/wow64cpu-Wow64Transition/0002-ntdll-Add-a-stub-implementation-of-Wow64Transition.patch

@@ -1,4 +1,4 @@
-From aea7b0a4493b0f7cf8a9074197b3aa9a46fa4dee Mon Sep 17 00:00:00 2001
+From 68293a760784f2b4fd2fe79bbba443d76b17e11a Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Wed, 8 Aug 2018 20:00:15 -0500
 Subject: [PATCH] ntdll: Add a stub implementation of Wow64Transition.
@@ -9,18 +9,18 @@ Subject: [PATCH] ntdll: Add a stub implementation of Wow64Transition.
  2 files changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index d32b57612d5..e2c7a3bd14f 100644
+index 6155996b7c4..0e99604eb2b 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
-@@ -4490,6 +4490,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
-     return TRUE;
+@@ -4287,6 +4287,7 @@ NTSTATUS WINAPI NtLoadDriver( const UNICODE_STRING *DriverServiceName )
+     return STATUS_NOT_IMPLEMENTED;
  }
  
 +void *Wow64Transition;
  
  /***********************************************************************
-  *           __wine_process_init
-@@ -4500,12 +4501,13 @@ void __wine_process_init(void)
+  *           NtUnloadDriver   (NTDLL.@)
+@@ -4345,12 +4346,13 @@ void __wine_process_init(void)
      static const WCHAR ntdllW[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\',
                                     's','y','s','t','e','m','3','2','\\',
                                     'n','t','d','l','l','.','d','l','l',0};
@@ -35,7 +35,7 @@ index d32b57612d5..e2c7a3bd14f 100644
      NTSTATUS status;
      ANSI_STRING func_name;
      UNICODE_STRING nt_name;
-@@ -4551,6 +4553,13 @@ void __wine_process_init(void)
+@@ -4400,6 +4402,13 @@ void __wine_process_init(void)
          MESSAGE( "wine: could not load kernel32.dll, status %x\n", status );
          exit(1);
      }
@@ -50,10 +50,10 @@ index d32b57612d5..e2c7a3bd14f 100644
      if ((status = LdrGetProcedureAddress( wm->ldr.DllBase, &func_name,
                                            0, (void **)&kernel32_start_process )) != STATUS_SUCCESS)
 diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
-index c50e83b5aa7..6d9cb826624 100644
+index b97eed0bc7d..9e2f6e418eb 100644
 --- a/dlls/ntdll/ntdll.spec
 +++ b/dlls/ntdll/ntdll.spec
-@@ -1100,6 +1100,7 @@
+@@ -1103,6 +1103,7 @@
  @ stdcall WinSqmIsOptedIn()
  @ stdcall WinSqmSetDWORD(ptr long long)
  @ stdcall WinSqmStartSession(ptr long long)
@@ -62,5 +62,5 @@ index c50e83b5aa7..6d9cb826624 100644
  @ stdcall -private ZwAccessCheck(ptr long long ptr ptr ptr ptr ptr) NtAccessCheck
  @ stdcall -private ZwAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) NtAccessCheckAndAuditAlarm
 -- 
-2.26.0
+2.26.2