Rebase against 00a0e2cd8c4df240371ddd22516e4e3544a142ce.

patches/Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch

@@ -1,48 +1,60 @@
-From 0a8a91199763c531cebeed0f60581df2e5ed36cf Mon Sep 17 00:00:00 2001
+From 0ade58381888bf379212b2d1cc9e449774d3548c Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 2 Oct 2014 19:44:31 +0200
-Subject: [PATCH] kernel32: Add winediag message to show warning, that this
- isn't vanilla wine.
+Subject: [PATCH] ntdll: Print a warning message specifying the wine-staging
+ branch name and version.
 
 ---
- dlls/kernel32/process.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
+ dlls/ntdll/loader.c | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
 
-diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index 9d725e1a43b..9c678039dad 100644
---- a/dlls/kernel32/process.c
-+++ b/dlls/kernel32/process.c
-@@ -60,6 +60,7 @@
- 
- WINE_DEFAULT_DEBUG_CHANNEL(process);
- WINE_DECLARE_DEBUG_CHANNEL(relay);
+diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
+index 65abf889cb2..d0fede661ce 100644
+--- a/dlls/ntdll/loader.c
++++ b/dlls/ntdll/loader.c
+@@ -44,6 +44,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay);
+ WINE_DECLARE_DEBUG_CHANNEL(snoop);
+ WINE_DECLARE_DEBUG_CHANNEL(loaddll);
+ WINE_DECLARE_DEBUG_CHANNEL(imports);
 +WINE_DECLARE_DEBUG_CHANNEL(winediag);
  
- typedef struct
- {
-@@ -125,6 +126,7 @@ static inline DWORD call_process_entry( PEB *peb, LPTHREAD_START_ROUTINE entry )
+ #ifdef _WIN64
+ #define DEFAULT_SECURITY_COOKIE_64  (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232)
+@@ -3486,6 +3487,7 @@ static void process_breakpoint(void)
+     __ENDTRY
  }
- #endif
  
 +extern const char * CDECL wine_get_version(void);
- /***********************************************************************
-  *           __wine_start_process
-  *
-@@ -146,6 +148,14 @@ void CDECL __wine_start_process( LPTHREAD_START_ROUTINE entry, PEB *peb )
-     TRACE_(relay)( "\1Starting process %s (entryproc=%p)\n",
-                    debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), entry );
  
-+    if (CreateEventA(0, 0, 0, "__winestaging_warn_event") && GetLastError() != ERROR_ALREADY_EXISTS)
+ /******************************************************************
+  *		LdrInitializeThunk (NTDLL.@)
+@@ -3496,6 +3498,9 @@ static void process_breakpoint(void)
+ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR unknown3, ULONG_PTR unknown4 )
+ {
+     static const unsigned int fls_slot_count = 8 * sizeof(NtCurrentTeb()->Peb->FlsBitmapBits);
++    OBJECT_ATTRIBUTES staging_event_attr;
++    UNICODE_STRING staging_event_string;
++    HANDLE staging_event;
+     static int attach_done;
+     int i;
+     NTSTATUS status;
+@@ -3514,6 +3519,16 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
+     entry = (void **)&context->u.s.X0;
+ #endif
+ 
++    RtlInitUnicodeString( &staging_event_string, L"__wine_staging_warn_event" );
++    InitializeObjectAttributes( &staging_event_attr, &staging_event_string, OBJ_OPENIF, NULL, NULL );
++    if (NtCreateEvent( &staging_event, EVENT_ALL_ACCESS, &staging_event_attr, NotificationEvent, FALSE ) == STATUS_SUCCESS)
 +    {
-+        FIXME_(winediag)("Wine Staging %s is a testing version containing experimental patches.\n", wine_get_version());
++        FIXME_(winediag)("wine-staging %s is a testing version containing experimental patches.\n", wine_get_version());
 +        FIXME_(winediag)("Please mention your exact version when filing bug reports on winehq.org.\n");
 +    }
 +    else
-+        WARN_(winediag)("Wine Staging %s is a testing version containing experimental patches.\n", wine_get_version());
++        WARN_(winediag)("wine-staging %s is a testing version containing experimental patches.\n", wine_get_version());
 +
-     __TRY
-     {
-         ExitThread( call_process_entry( peb, entry ));
+     if (process_detaching) NtTerminateThread( GetCurrentThread(), 0 );
+ 
+     RtlEnterCriticalSection( &loader_section );
 -- 
 2.28.0
 

patches/Staging/definition

@@ -0,0 +1 @@
+Depends: ntdll-FLS_Callbacks