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

Rebase against ecbb4fa3ea2d3a9e1d3f560c7e0dea008439db5b

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2018-03-30 13:01:06 +11:00
parent ec58b6f6b1
commit 4e3fb17588
7 changed files with 39 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
patches/ddraw-Device_Caps/0003-ddraw-Set-ddsOldCaps-correctly-in-ddraw7_GetCaps.patch
View File

@ -1,4 +1,4 @@
From 51a7344248cfbb0345fdf765f7a6b6af2ee4bb05 Mon Sep 17 00:00:00 2001
From 877a0c022af59c3b863edf358242829565ed7cbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 4 Mar 2016 22:22:42 +0100
Subject: [PATCH] ddraw: Set ddsOldCaps correctly in ddraw7_GetCaps.
@ -12,10 +12,10 @@ Subject: [PATCH] ddraw: Set ddsOldCaps correctly in ddraw7_GetCaps.
5 files changed, 106 insertions(+)
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 74199b6..7179f51 100644
index 33e18b8d6a..2628b7654f 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -1541,6 +1541,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD
@@ -1542,6 +1542,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD
caps.dwCaps |= DDCAPS_ALIGNSTRIDE;
caps.dwAlignStrideAlign = DDRAW_STRIDE_ALIGNMENT;
@ -25,7 +25,7 @@ index 74199b6..7179f51 100644
if(DriverCaps)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 626b07b..a7e5bcd 100644
index 626b07bace..a7e5bcd6e7 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -11247,6 +11247,31 @@ static void test_enum_surfaces(void)
@ -67,7 +67,7 @@ index 626b07b..a7e5bcd 100644
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 1ab1f9c..272f364 100644
index 1ab1f9c591..272f364b7f 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -12646,6 +12646,31 @@ static void test_enum_surfaces(void)
@ -109,7 +109,7 @@ index 1ab1f9c..272f364 100644
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 02b10b5..f114bc4 100644
index 550d73a1bd..f3c020c89c 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -14751,6 +14751,31 @@ static void test_enum_surfaces(void)
@ -151,11 +151,11 @@ index 02b10b5..f114bc4 100644
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 767507f..44fdf2e 100644
index b4910c196c..bf1e1cf120 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -14113,6 +14113,31 @@ static void test_enum_surfaces(void)
IDirectDraw7_Release(ddraw);
@@ -14289,6 +14289,31 @@ static void test_viewport(void)
DestroyWindow(window);
}
+static void test_caps(void)
@ -186,12 +186,12 @@ index 767507f..44fdf2e 100644
START_TEST(ddraw7)
{
DDDEVICEIDENTIFIER2 identifier;
@@ -14247,4 +14272,5 @@ START_TEST(ddraw7)
test_depth_readback();
@@ -14424,4 +14449,5 @@ START_TEST(ddraw7)
test_clear();
test_enum_surfaces();
test_viewport();
+ test_caps();
}
--
1.9.1
2.16.2

14
patches/ddraw-FlipToGDISurface/0001-ddraw-Implement-ddraw7_FlipToGDISurface.patch
View File

@ -1,7 +1,7 @@
From 9a44bb05045ad2a8fbe8b6a15975474ea5be2c6a Mon Sep 17 00:00:00 2001
From 42c768f1f4b5f35b8cb282d7fb44cad2ea7114e4 Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Sun, 8 Jan 2017 22:32:32 +0100
Subject: ddraw: Implement ddraw7_FlipToGDISurface. (v2)
Subject: [PATCH] ddraw: Implement ddraw7_FlipToGDISurface. (v2)
---
dlls/ddraw/ddraw.c | 9 ++++++++-
@ -10,10 +10,10 @@ Subject: ddraw: Implement ddraw7_FlipToGDISurface. (v2)
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 32f0172..6c94eb8 100644
index ca8e2e64f7..e18c358c63 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -2063,7 +2063,14 @@ static HRESULT WINAPI d3d1_Initialize(IDirect3D *iface, REFIID riid)
@@ -2093,7 +2093,14 @@ static HRESULT WINAPI d3d1_Initialize(IDirect3D *iface, REFIID riid)
*****************************************************************************/
static HRESULT WINAPI ddraw7_FlipToGDISurface(IDirectDraw7 *iface)
{
@ -30,7 +30,7 @@ index 32f0172..6c94eb8 100644
return DD_OK;
}
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index a9632de..336c4dd 100644
index a9632de502..336c4dd35b 100644
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -59,6 +59,7 @@ struct FvfToDecl
@ -42,7 +42,7 @@ index a9632de..336c4dd 100644
#define DDRAW_STRIDE_ALIGNMENT 8
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 2d20049..0e4543b 100644
index 2d200493c9..0e4543bf74 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -64,7 +64,7 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface,
@ -55,5 +55,5 @@ index 2d20049..0e4543b 100644
/* Nothing to do, we control the frontbuffer, or at least the parts we
* care about. */
--
2.7.4
2.16.2

21
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "be002fd92b9d72163bf130ab8ade8aa4d9cdbad0"
echo "ecbb4fa3ea2d3a9e1d3f560c7e0dea008439db5b"
}
# Show version information
@ -423,7 +423,6 @@ patch_enable_all ()
enable_wininet_Http_Decoding="$1"
enable_wininet_InternetCrackUrlW="$1"
enable_wininet_Internet_Settings="$1"
enable_wininet_ParseX509EncodedCertificateForListBoxEntry="$1"
enable_winmm_Delay_Import_Depends="$1"
enable_winmm_mciSendCommandA="$1"
enable_wintrust_WinVerifyTrust="$1"
@ -1467,9 +1466,6 @@ patch_enable ()
wininet-Internet_Settings)
enable_wininet_Internet_Settings="$2"
;;
wininet-ParseX509EncodedCertificateForListBoxEntry)
enable_wininet_ParseX509EncodedCertificateForListBoxEntry="$2"
;;
winmm-Delay_Import_Depends)
enable_winmm_Delay_Import_Depends="$2"
;;
@ -8613,21 +8609,6 @@ if test "$enable_wininet_Internet_Settings" -eq 1; then
) >> "$patchlist"
fi
# Patchset wininet-ParseX509EncodedCertificateForListBoxEntry
# |
# | This patchset fixes the following Wine bugs:
# | * [#29842] Add stub for wininet.ParseX509EncodedCertificateForListBoxEntry
# |
# | Modified files:
# | * dlls/wininet/dialogs.c, dlls/wininet/wininet.spec, include/winineti.h
# |
if test "$enable_wininet_ParseX509EncodedCertificateForListBoxEntry" -eq 1; then
patch_apply wininet-ParseX509EncodedCertificateForListBoxEntry/0001-wininet-add-ParseX509EncodedCertificateForListBoxEnt.patch
(
printf '%s\n' '+ { "Austin English", "wininet: Add ParseX509EncodedCertificateForListBoxEntry stub.", 2 },';
) >> "$patchlist"
fi
# Patchset winmm-Delay_Import_Depends
# |
# | This patchset fixes the following Wine bugs:

12
patches/shell32-SHELL_execute/0001-shell32-Properly-fail-when-a-data-object-cannot-be-i.patch
View File

@ -1,4 +1,4 @@
From 9f4fcf82f0a37cc856a191ec9d1f178b9df722c0 Mon Sep 17 00:00:00 2001
From ba48d35b9f8659c1463b6a70b1804df4b4cca4d6 Mon Sep 17 00:00:00 2001
From: Mark Jansen <learn0more+wine@gmail.com>
Date: Sun, 4 Jun 2017 22:12:20 +0200
Subject: [PATCH] shell32: Properly fail when a data object cannot be
@ -10,7 +10,7 @@ Subject: [PATCH] shell32: Properly fail when a data object cannot be
2 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c
index 3034008..8d6364b 100644
index a2d4e5d20f..cdb8e7e152 100644
--- a/dlls/shell32/shlexec.c
+++ b/dlls/shell32/shlexec.c
@@ -1317,6 +1317,7 @@ static HRESULT shellex_load_object_and_run( HKEY hkey, LPCGUID guid, LPSHELLEXEC
@ -55,8 +55,8 @@ index 3034008..8d6364b 100644
- WCHAR *wszApplicationName, *wszParameters, *wszDir, *wcmd;
+ WCHAR *wszApplicationName, *wszParameters, *wszDir, *wcmd = NULL;
DWORD dwApplicationNameLen = MAX_PATH+2;
DWORD parametersLen = sizeof(parametersBuffer) / sizeof(WCHAR);
DWORD wcmdLen = sizeof(wcmdBuffer) / sizeof(WCHAR);
DWORD parametersLen = ARRAY_SIZE(parametersBuffer);
DWORD wcmdLen = ARRAY_SIZE(wcmdBuffer);
@@ -1694,6 +1715,29 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc )
TRACE("-- idlist=%p (%s)\n", sei_tmp.lpIDList, debugstr_w(wszApplicationName));
}
@ -96,7 +96,7 @@ index 3034008..8d6364b 100644
heap_free(wszApplicationName);
diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c
index 7cdae87..f5f1d77 100644
index 7cdae878db..f5f1d77b43 100644
--- a/dlls/shell32/tests/shlexec.c
+++ b/dlls/shell32/tests/shlexec.c
@@ -1829,7 +1829,7 @@ static fileurl_tests_t fileurl_tests[]=
@ -141,5 +141,5 @@ index 7cdae87..f5f1d77 100644
/* Should just run our executable */
--
1.9.1
2.16.2

26
patches/user32-Mouse_Message_Hwnd/0005-server-Add-support-for-a-layered-window-region.-v2.patch
View File

@ -1,7 +1,7 @@
From 90e993f23a08f2782181fee754108a4c52ce3daf Mon Sep 17 00:00:00 2001
From 584864e30e0ef73e0196fa3b2f43735d597578a5 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Wed, 17 May 2017 23:55:55 +0800
Subject: server: Add support for a layered window region. (v3)
Subject: [PATCH] server: Add support for a layered window region. (v3)
---
dlls/user32/tests/input.c | 2 --
@ -11,10 +11,10 @@ Subject: server: Add support for a layered window region. (v3)
4 files changed, 84 insertions(+), 2 deletions(-)
diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
index c4316d3041b..8c8993bf4bd 100644
index 4a2d9c92a5..fa249c5f90 100644
--- a/dlls/user32/tests/input.c
+++ b/dlls/user32/tests/input.c
@@ -2385,13 +2385,11 @@ static void test_Input_mouse(void)
@@ -2393,13 +2393,11 @@ static void test_Input_mouse(void)
if (msg.message == WM_LBUTTONDOWN)
{
@ -29,7 +29,7 @@ index c4316d3041b..8c8993bf4bd 100644
got_button_up = TRUE;
break;
diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c
index 80256dce569..ef23e99dce8 100644
index 165633c64e..c5a3ed338d 100644
--- a/dlls/winex11.drv/bitblt.c
+++ b/dlls/winex11.drv/bitblt.c
@@ -48,6 +48,7 @@
@ -40,9 +40,9 @@ index 80256dce569..ef23e99dce8 100644
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(bitblt);
@@ -1609,6 +1610,48 @@ static inline void add_row( HRGN rgn, RGNDATA *data, int x, int y, int len )
flush_rgn_data( rgn, data );
@@ -1612,6 +1613,48 @@ static inline void add_row( HRGN rgn, RGNDATA *data, int x, int y, int len )
}
#endif
+static void set_layer_region( struct x11drv_window_surface *surface, HRGN hrgn )
+{
@ -89,7 +89,7 @@ index 80256dce569..ef23e99dce8 100644
/***********************************************************************
* update_surface_region
*/
@@ -1627,6 +1670,7 @@ static void update_surface_region( struct x11drv_window_surface *surface )
@@ -1630,6 +1673,7 @@ static void update_surface_region( struct x11drv_window_surface *surface )
if (!surface->is_argb && surface->color_key == CLR_INVALID)
{
XShapeCombineMask( gdi_display, surface->window, ShapeBounding, 0, 0, None, ShapeSet );
@ -97,7 +97,7 @@ index 80256dce569..ef23e99dce8 100644
return;
}
@@ -1737,6 +1781,7 @@ static void update_surface_region( struct x11drv_window_surface *surface )
@@ -1740,6 +1784,7 @@ static void update_surface_region( struct x11drv_window_surface *surface )
HeapFree( GetProcessHeap(), 0, data );
}
@ -106,10 +106,10 @@ index 80256dce569..ef23e99dce8 100644
#endif
}
diff --git a/server/protocol.def b/server/protocol.def
index d90666573dd..50000057838 100644
index 37c3f43921..e7c2b1091b 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -2728,6 +2728,13 @@ enum coords_relative
@@ -2754,6 +2754,13 @@ enum coords_relative
@END
@ -124,7 +124,7 @@ index d90666573dd..50000057838 100644
@REQ(get_update_region)
user_handle_t window; /* handle to the window */
diff --git a/server/window.c b/server/window.c
index 2f2aae483d5..f66f1d6ac6f 100644
index 2f2aae483d..f66f1d6ac6 100644
--- a/server/window.c
+++ b/server/window.c
@@ -72,6 +72,7 @@ struct window
@ -202,5 +202,5 @@ index 2f2aae483d5..f66f1d6ac6f 100644
DECL_HANDLER(get_update_region)
{
--
2.14.1
2.16.2

61
patches/wininet-ParseX509EncodedCertificateForListBoxEntry/0001-wininet-add-ParseX509EncodedCertificateForListBoxEnt.patch
View File

@ -1,61 +0,0 @@
From db29dec04c5c02ab2a96010d42aec00aaeccbec2 Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish@gmail.com>
Date: Wed, 25 Feb 2015 01:04:56 -0600
Subject: wininet: add ParseX509EncodedCertificateForListBoxEntry stub (try 2)
Try 2: Fix prototype/spec file, add to winineti.h
Fixes https://bugs.winehq.org/show_bug.cgi?id=29842
---
dlls/wininet/dialogs.c | 9 +++++++++
dlls/wininet/wininet.spec | 2 +-
include/winineti.h | 1 +
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c
index bf4121b..46b876e 100644
--- a/dlls/wininet/dialogs.c
+++ b/dlls/wininet/dialogs.c
@@ -576,6 +576,15 @@ BOOL WINAPI InternetShowSecurityInfoByURLW(LPCWSTR url, HWND window)
}
/***********************************************************************
+ * ParseX509EncodedCertificateForListBoxEntry (@)
+ */
+DWORD WINAPI ParseX509EncodedCertificateForListBoxEntry(LPBYTE cert, DWORD len, LPSTR szlistbox, LPDWORD listbox)
+{
+ FIXME("stub: %p %d %s %p\n", cert, len, debugstr_a(szlistbox), listbox);
+ return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
* ShowX509EncodedCertificate (@)
*/
DWORD WINAPI ShowX509EncodedCertificate(HWND parent, LPBYTE cert, DWORD len)
diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec
index 3c4bf5a..c4bf442 100644
--- a/dlls/wininet/wininet.spec
+++ b/dlls/wininet/wininet.spec
@@ -216,7 +216,7 @@
@ stdcall IsUrlCacheEntryExpiredA(str long ptr)
@ stdcall IsUrlCacheEntryExpiredW(wstr long ptr)
@ stdcall LoadUrlCacheContent()
-@ stub ParseX509EncodedCertificateForListBoxEntry
+@ stdcall ParseX509EncodedCertificateForListBoxEntry(ptr long str ptr)
@ stdcall PrivacyGetZonePreferenceW(long long ptr ptr ptr)
@ stdcall PrivacySetZonePreferenceW(long long long wstr)
@ stdcall ReadUrlCacheEntryStream(ptr long ptr ptr long)
diff --git a/include/winineti.h b/include/winineti.h
index 5b6f15f..5e38424 100644
--- a/include/winineti.h
+++ b/include/winineti.h
@@ -120,6 +120,7 @@ BOOL WINAPI InternetQueryFortezzaStatus(DWORD*,DWORD_PTR);
BOOL WINAPI IsUrlCacheEntryExpiredA(LPCSTR,DWORD,FILETIME*);
BOOL WINAPI IsUrlCacheEntryExpiredW(LPCWSTR,DWORD,FILETIME*);
#define IsUrlCacheEntryExpired WINELIB_NAME_AW(IsUrlCacheEntryExpired)
+DWORD WINAPI ParseX509EncodedCertificateForListBoxEntry(LPBYTE,DWORD,LPSTR,LPDWORD);
BOOL WINAPI SetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA,DWORD);
BOOL WINAPI SetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW,DWORD);
#define SetUrlCacheConfigInfo WINELIB_NAME_AW(SetUrlCacheConfigInfo)
--
2.3.2

1
patches/wininet-ParseX509EncodedCertificateForListBoxEntry/definition
View File

@ -1 +0,0 @@
Fixes: [29842] Add stub for wininet.ParseX509EncodedCertificateForListBoxEntry