wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Update 0001-ntdll-Ensure-process-dlls-are-not-attached-too-early.patch

Browse Source 
Don't know if this works but it appears to allow the patch to be applied.
This commit is contained in:
Brandon Amaro 2018-02-17 13:29:34 -08:00 committed by GitHub
parent 7622ec9450
commit f2fd3be62d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
patches/ntdll-Attach_Process_DLLs/0001-ntdll-Ensure-process-dlls-are-not-attached-too-early.patch
View File

@ -11,19 +11,18 @@ diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 518a99f590..94668e8ba4 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -64,6 +64,7 @@ WINE_DECLARE_DEBUG_CHANNEL(pid);
typedef DWORD (CALLBACK *DLLENTRYPROC)(HMODULE,DWORD,LPVOID);
@@ -64,6 +64,7 @@ typedef DWORD (CALLBACK *DLLENTRYPROC)(H
typedef void (CALLBACK *LDRENUMPROC)(LDR_MODULE *, void *, BOOLEAN *);
static BOOL imports_fixup_done = FALSE; /* set once the imports have been fixed up, before attaching them */
+static BOOL process_attaching = TRUE; /* set on process attach to avoid calling callbacks too early */
static BOOL process_detaching = FALSE; /* set on process detach to avoid deadlocks with thread detach */
static int free_lib_count; /* recursion depth of LdrUnloadDll calls */
@@ -452,7 +453,20 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS
if (load_dll( load_path, mod_name, 0, &wm ) == STATUS_SUCCESS &&
!(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS))
{
- if (process_attach( wm, NULL ) != STATUS_SUCCESS)
@@ -459,6 +460,19 @@ static FARPROC find_forwarded_export( HM
current_modref->deps = deps;
}
}
+ if (process_attaching)
+ {
+ WINE_MODREF **deps, *prev = get_modref( module );
@ -37,18 +36,17 @@ index 518a99f590..94668e8ba4 100644
+ prev->deps[prev->nDeps++] = wm;
+ }
+ }
+ else if (process_attach( wm, NULL ) != STATUS_SUCCESS)
else if (process_attach( wm, NULL ) != STATUS_SUCCESS)
{
LdrUnloadDll( wm->ldr.BaseAddress );
wm = NULL;
@@ -3005,6 +3019,7 @@ static NTSTATUS attach_process_dlls( void *wm )
{
NTSTATUS status;
@@ -2995,6 +3009,7 @@ NTSTATUS attach_dlls( CONTEXT *context )
WINE_MODREF *wm;
LPCWSTR load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer;
+ process_attaching = FALSE;
pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL );
RtlEnterCriticalSection( &loader_section );
if (process_detaching) return STATUS_SUCCESS;
--
2.12.2