mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Rebase against 99114803b80f6e687f1d4ed11e0808b821cdbf22
This commit is contained in:
Alistair Leslie-Hughes
parent
f3e2363b52
commit
6ce73c283d
@ -1,4 +1,4 @@
|
||||
From b314f9b084341f4d6f9cec5d8b92736b4f9a9ae7 Mon Sep 17 00:00:00 2001
|
||||
From 3c98dd79ccad72249122925b6b748c6ec84db003 Mon Sep 17 00:00:00 2001
|
||||
From: Zebediah Figura <z.figura12@gmail.com>
|
||||
Date: Wed, 13 Jun 2018 10:44:49 -0500
|
||||
Subject: [PATCH] configure: Check for sys/eventfd.h, ppoll(), and shm_open().
|
||||
@ -11,10 +11,10 @@ Although perhaps we shouldn't since the server doesn't do this.
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 11947e5..957d4e1 100644
|
||||
index 4f1c925bf95..662d510317a 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -498,6 +498,7 @@ AC_CHECK_HEADERS(\
|
||||
@@ -511,6 +511,7 @@ AC_CHECK_HEADERS(\
|
||||
sys/elf32.h \
|
||||
sys/epoll.h \
|
||||
sys/event.h \
|
||||
@ -22,7 +22,7 @@ index 11947e5..957d4e1 100644
|
||||
sys/exec_elf.h \
|
||||
sys/filio.h \
|
||||
sys/ioctl.h \
|
||||
@@ -2206,6 +2207,7 @@ AC_CHECK_FUNCS(\
|
||||
@@ -2130,6 +2131,7 @@ AC_CHECK_FUNCS(\
|
||||
pipe2 \
|
||||
poll \
|
||||
port_create \
|
||||
@ -30,9 +30,9 @@ index 11947e5..957d4e1 100644
|
||||
prctl \
|
||||
pread \
|
||||
proc_pidinfo \
|
||||
@@ -2274,6 +2276,16 @@ AC_SEARCH_LIBS(clock_gettime, rt,
|
||||
test "$ac_res" = "none required" || AC_SUBST(RT_LIBS,"$ac_res")])
|
||||
LIBS=$ac_save_LIBS
|
||||
@@ -2204,6 +2206,16 @@ case $host_os in
|
||||
;;
|
||||
esac
|
||||
|
||||
+dnl Check for shm_open which may be in -lrt
|
||||
+if test "$ac_cv_header_sys_mman_h" = "yes" -a "x$RT_LIBS" = "x"
|
||||
@ -48,5 +48,5 @@ index 11947e5..957d4e1 100644
|
||||
if test "x$with_ldap" != "xno"
|
||||
then
|
||||
--
|
||||
1.9.1
|
||||
2.20.1
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 52a0506018b5f61484935142b79e73dbbe0ae9d7 Mon Sep 17 00:00:00 2001
|
||||
From 7ab8094fbbc9adb4a5406fd9a780ab5542a5a3e4 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sat, 5 Aug 2017 03:38:38 +0200
|
||||
Subject: ntdll: Add inline versions of RtlEnterCriticalSection /
|
||||
Subject: [PATCH] ntdll: Add inline versions of RtlEnterCriticalSection /
|
||||
RtlLeaveCriticalSections.
|
||||
|
||||
---
|
||||
@ -9,7 +9,7 @@ Subject: ntdll: Add inline versions of RtlEnterCriticalSection /
|
||||
1 file changed, 38 insertions(+)
|
||||
|
||||
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
|
||||
index 19d1e532759..c6c60090d10 100644
|
||||
index 84866721a07..303cad1764a 100644
|
||||
--- a/dlls/ntdll/ntdll_misc.h
|
||||
+++ b/dlls/ntdll/ntdll_misc.h
|
||||
@@ -27,6 +27,7 @@
|
||||
@ -18,9 +18,9 @@ index 19d1e532759..c6c60090d10 100644
|
||||
#include "winternl.h"
|
||||
+#include "wine/debug.h"
|
||||
#include "wine/server.h"
|
||||
#include "wine/asm.h"
|
||||
|
||||
#define MAX_NT_PATH_LENGTH 277
|
||||
@@ -198,6 +199,43 @@ extern int ntdll_wcstoumbs(DWORD flags, const WCHAR* src, int srclen, char* dst,
|
||||
@@ -214,6 +215,43 @@ extern int ntdll_wcstoumbs(DWORD flags, const WCHAR* src, int srclen, char* dst,
|
||||
extern int CDECL NTDLL__vsnprintf( char *str, SIZE_T len, const char *format, __ms_va_list args ) DECLSPEC_HIDDEN;
|
||||
extern int CDECL NTDLL__vsnwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, __ms_va_list args ) DECLSPEC_HIDDEN;
|
||||
|
||||
@ -65,5 +65,5 @@ index 19d1e532759..c6c60090d10 100644
|
||||
|
||||
enum loadorder
|
||||
--
|
||||
2.13.1
|
||||
2.20.1
|
||||
|
||||
|
||||
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "40fef0fb71b079c1bf9667d80384cc43ec7f11fd"
|
||||
echo "99114803b80f6e687f1d4ed11e0808b821cdbf22"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
|
||||
@ -33,7 +33,7 @@ index 91deda2010..6a57fb20bb 100644
|
||||
+
|
||||
+ hr = IWICBitmapEncoderInfo_GetCLSID(info, &clsid);
|
||||
+ ok(hr == S_OK, "wrong error %#x\n", hr);
|
||||
+ ok(!IsEqualGUID(&clsid_encoder, &clsid), "wrong CLSID %s (%s)\n",
|
||||
+ ok(!IsEqualGUID(clsid_encoder, &clsid), "wrong CLSID %s (%s)\n",
|
||||
+ wine_dbgstr_guid(clsid_encoder), wine_dbgstr_guid(&clsid));
|
||||
+
|
||||
+ IWICBitmapEncoderInfo_Release(info);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 86e5afc80f75ccef2f6f7215a6c1f281c7d4fd39 Mon Sep 17 00:00:00 2001
|
||||
From 7d80b158b2cb555c16e82d3422c25356b78b4d53 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Tue, 22 Mar 2016 23:46:30 +0800
|
||||
Subject: [PATCH] windowscodecs: Improve compatibility of IMILBitmapSource
|
||||
@ -7,14 +7,23 @@ Subject: [PATCH] windowscodecs: Improve compatibility of IMILBitmapSource
|
||||
Based on Focht's investigation. This makes the test application attached
|
||||
to the bug 34764 work.
|
||||
---
|
||||
dlls/windowscodecs/bitmap.c | 184 ++++++++++++++++++++++++++-------
|
||||
dlls/windowscodecs/wincodecs_private.h | 58 +++++++++--
|
||||
2 files changed, 197 insertions(+), 45 deletions(-)
|
||||
dlls/windowscodecs/bitmap.c | 186 +++++++++++++++++++------
|
||||
dlls/windowscodecs/wincodecs_private.h | 58 +++++++-
|
||||
2 files changed, 198 insertions(+), 46 deletions(-)
|
||||
|
||||
diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c
|
||||
index f841496..734c211 100644
|
||||
index e8fe822e84..30a36535f4 100644
|
||||
--- a/dlls/windowscodecs/bitmap.c
|
||||
+++ b/dlls/windowscodecs/bitmap.c
|
||||
@@ -27,7 +27,7 @@
|
||||
#include "objbase.h"
|
||||
|
||||
#include "wincodecs_private.h"
|
||||
-
|
||||
+#include "wine/asm.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
|
||||
@@ -137,6 +137,7 @@ static HRESULT WINAPI BitmapLockImpl_QueryInterface(IWICBitmapLock *iface, REFII
|
||||
}
|
||||
else
|
||||
@ -331,10 +340,10 @@ index f841496..734c211 100644
|
||||
|
||||
HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, UINT stride, UINT datasize, void *view,
|
||||
diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h
|
||||
index 0274ece..0c256be 100644
|
||||
index 2221cc7dce..34a417d130 100644
|
||||
--- a/dlls/windowscodecs/wincodecs_private.h
|
||||
+++ b/dlls/windowscodecs/wincodecs_private.h
|
||||
@@ -31,7 +31,13 @@ DEFINE_GUID(GUID_WineContainerFormatTga, 0x0c44fda1,0xa5c5,0x4298,0x96,0x85,0x47
|
||||
@@ -33,7 +33,13 @@ DEFINE_GUID(GUID_WineContainerFormatTga, 0x0c44fda1,0xa5c5,0x4298,0x96,0x85,0x47
|
||||
|
||||
DEFINE_GUID(GUID_VendorWine, 0xddf46da1,0x7dc1,0x404e,0x98,0xf2,0xef,0xa4,0x8d,0xfc,0x95,0x0a);
|
||||
|
||||
@ -348,7 +357,7 @@ index 0274ece..0c256be 100644
|
||||
#define INTERFACE IMILBitmapSource
|
||||
DECLARE_INTERFACE_(IMILBitmapSource,IUnknown)
|
||||
{
|
||||
@@ -39,16 +45,39 @@ DECLARE_INTERFACE_(IMILBitmapSource,IUnknown)
|
||||
@@ -41,16 +47,39 @@ DECLARE_INTERFACE_(IMILBitmapSource,IUnknown)
|
||||
STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID,void **) PURE;
|
||||
STDMETHOD_(ULONG,AddRef)(THIS) PURE;
|
||||
STDMETHOD_(ULONG,Release)(THIS) PURE;
|
||||
@ -394,7 +403,7 @@ index 0274ece..0c256be 100644
|
||||
#define INTERFACE IMILUnknown1
|
||||
DECLARE_INTERFACE_(IMILUnknown1,IUnknown)
|
||||
{
|
||||
@@ -56,6 +85,19 @@ DECLARE_INTERFACE_(IMILUnknown1,IUnknown)
|
||||
@@ -58,6 +87,19 @@ DECLARE_INTERFACE_(IMILUnknown1,IUnknown)
|
||||
STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID,void **) PURE;
|
||||
STDMETHOD_(ULONG,AddRef)(THIS) PURE;
|
||||
STDMETHOD_(ULONG,Release)(THIS) PURE;
|
||||
@ -414,7 +423,7 @@ index 0274ece..0c256be 100644
|
||||
};
|
||||
#undef INTERFACE
|
||||
|
||||
@@ -67,7 +109,9 @@ DECLARE_INTERFACE_(IMILUnknown2,IUnknown)
|
||||
@@ -69,7 +111,9 @@ DECLARE_INTERFACE_(IMILUnknown2,IUnknown)
|
||||
STDMETHOD_(ULONG,AddRef)(THIS) PURE;
|
||||
STDMETHOD_(ULONG,Release)(THIS) PURE;
|
||||
/*** unknown methods ***/
|
||||
@ -426,5 +435,5 @@ index 0274ece..0c256be 100644
|
||||
#undef INTERFACE
|
||||
|
||||
--
|
||||
1.9.1
|
||||
2.20.1
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user