mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Rebase against ae8f605ede0054c8e380e809c196f2621d9cf423.
This commit is contained in:
parent
7c57b6eba4
commit
649c35ff92
@ -1,36 +0,0 @@
|
||||
From a95984145caa33f4f5b85f76708559c3696db33f Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sat, 7 Mar 2015 18:09:37 +0100
|
||||
Subject: [PATCH] ntdll: Process APC calls before starting process.
|
||||
|
||||
alesliehughes - rebase conflict - not sure if this is correct anymore.
|
||||
---
|
||||
dlls/ntdll/loader.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
|
||||
index 77a16b3..49e8619 100644
|
||||
--- a/dlls/ntdll/loader.c
|
||||
+++ b/dlls/ntdll/loader.c
|
||||
@@ -3113,6 +3113,7 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2,
|
||||
ULONG_PTR unknown3, ULONG_PTR unknown4 )
|
||||
{
|
||||
static const WCHAR globalflagW[] = {'G','l','o','b','a','l','F','l','a','g',0};
|
||||
+ LARGE_INTEGER timeout;
|
||||
NTSTATUS status;
|
||||
WINE_MODREF *wm;
|
||||
PEB *peb = NtCurrentTeb()->Peb;
|
||||
@@ -3152,6 +3153,10 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2,
|
||||
debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), status );
|
||||
NtTerminateProcess( GetCurrentProcess(), status );
|
||||
}
|
||||
+
|
||||
+ timeout.QuadPart = 0;
|
||||
+ NtDelayExecution( TRUE, &timeout );
|
||||
+
|
||||
server_init_process_done();
|
||||
}
|
||||
|
||||
--
|
||||
1.9.1
|
||||
|
@ -1,17 +0,0 @@
|
||||
Fixes: Process APC calls before starting process
|
||||
Disabled: true
|
||||
|
||||
# This patch is for an old snapshot build of Cygwin. It was originally posted
|
||||
# in bug 24018, and a more detailed description is in bug 34865:
|
||||
#
|
||||
# https://bugs.winehq.org/show_bug.cgi?id=24018#c12
|
||||
# https://bugs.winehq.org/show_bug.cgi?id=34865#c2
|
||||
#
|
||||
# Basic summary: user APCs which are queued in DllMain and in TLS callbacks
|
||||
# need to be executed after all dlls are loaded and loader lock is released
|
||||
# but before process entry.
|
||||
# It broke due to recent reworking of the loader code. Alistair tried to rebase
|
||||
# it but, with no explanation of the bug, did it incorrectly.
|
||||
# The bug is potentially still valid (as given by comment 13 of the first link)
|
||||
# so I'm not going to remove it. However, there is almost surely no application
|
||||
# that needs it, so I have disabled it and removed all dependences on it.
|
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "27da4fa4498c3b6e0e46c72a9cdd13b620726e92"
|
||||
echo "ae8f605ede0054c8e380e809c196f2621d9cf423"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -247,7 +247,6 @@ patch_enable_all ()
|
||||
enable_packager_DllMain="$1"
|
||||
enable_pdh_PdhLookupPerfNameByIndex_processor="$1"
|
||||
enable_quartz_MediaSeeking_Positions="$1"
|
||||
enable_quartz_Silence_FIXMEs="$1"
|
||||
enable_riched20_Class_Tests="$1"
|
||||
enable_riched20_IText_Interface="$1"
|
||||
enable_server_Desktop_Refcount="$1"
|
||||
@ -870,9 +869,6 @@ patch_enable ()
|
||||
quartz-MediaSeeking_Positions)
|
||||
enable_quartz_MediaSeeking_Positions="$2"
|
||||
;;
|
||||
quartz-Silence_FIXMEs)
|
||||
enable_quartz_Silence_FIXMEs="$2"
|
||||
;;
|
||||
riched20-Class_Tests)
|
||||
enable_riched20_Class_Tests="$2"
|
||||
;;
|
||||
@ -5540,18 +5536,6 @@ if test "$enable_quartz_MediaSeeking_Positions" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset quartz-Silence_FIXMEs
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/quartz/parser.c
|
||||
# |
|
||||
if test "$enable_quartz_Silence_FIXMEs" -eq 1; then
|
||||
patch_apply quartz-Silence_FIXMEs/0001-quartz-Don-t-print-FIXME-for-IAMFilterMiscFlags-in-p.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Christian Costa", "quartz: Don'\''t print FIXME for IAMFilterMiscFlags in parsers.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset riched20-Class_Tests
|
||||
# |
|
||||
# | Modified files:
|
||||
|
@ -1,30 +0,0 @@
|
||||
From 9d18943140ce1ee26d238bf257a8b52cc6332e8e Mon Sep 17 00:00:00 2001
|
||||
From: Christian Costa <titan.costa@gmail.com>
|
||||
Date: Fri, 19 Feb 2016 10:01:14 +0100
|
||||
Subject: quartz: Don't print FIXME for IAMFilterMiscFlags in parsers.
|
||||
|
||||
---
|
||||
dlls/quartz/parser.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c
|
||||
index fd98787..fcc88a7 100644
|
||||
--- a/dlls/quartz/parser.c
|
||||
+++ b/dlls/quartz/parser.c
|
||||
@@ -155,8 +155,12 @@ HRESULT WINAPI Parser_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID *
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
- if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow))
|
||||
+ if (!IsEqualIID(riid, &IID_IPin) &&
|
||||
+ !IsEqualIID(riid, &IID_IVideoWindow) &&
|
||||
+ !IsEqualIID(riid, &IID_IAMFilterMiscFlags))
|
||||
+ {
|
||||
FIXME("No interface for %s!\n", qzdebugstr_guid(riid));
|
||||
+ }
|
||||
|
||||
return E_NOINTERFACE;
|
||||
}
|
||||
--
|
||||
2.7.0
|
||||
|
@ -1 +0,0 @@
|
||||
Fixes: Silence repeated FIXME message in Parser_QueryInterface
|
Loading…
x
Reference in New Issue
Block a user