wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 02d723045ff15d2bda5475b8b6fe212ee3483cd8.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-11-14 02:15:17 +01:00
parent e3182b014c
commit 30ac478614
8 changed files with 37 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch
View File

@ -1,4 +1,4 @@
From 0f53f98831d1dcc1030467c1f736fbe0b7f4fb80 Mon Sep 17 00:00:00 2001
From bfbe1cfd28797365a7341add7a330568b3846e89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 17 Jan 2016 17:07:35 +0100
Subject: ext-ms-win-xaml-pal-l1-1-0: Add dll and add stub for
@ -15,11 +15,11 @@ Subject: ext-ms-win-xaml-pal-l1-1-0: Add dll and add stub for
create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/main.c
diff --git a/configure.ac b/configure.ac
index 456a638..dc1f2ac 100644
index 670c2fc..8e44524 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3018,6 +3018,7 @@ WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-ntuser-window-l1-1-1)
@@ -3025,6 +3025,7 @@ WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-rgn-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dc-access-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0)
+WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)

8
patches/api-ms-win-Stub_DLLs/0010-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch
View File

@ -1,4 +1,4 @@
From db1db629d2bce149edc99cd534d5e1b5e17a1e82 Mon Sep 17 00:00:00 2001
From eef0f09e4274a5c6b748386a2b1a99615d495460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 17 Jan 2016 17:12:45 +0100
Subject: ext-ms-win-appmodel-usercontext-l1-1-0: Add dll and add stub for
@ -15,17 +15,17 @@ Subject: ext-ms-win-appmodel-usercontext-l1-1-0: Add dll and add stub for
create mode 100644 dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c
diff --git a/configure.ac b/configure.ac
index f3cb281..7566ca4 100644
index 8e44524..18b1d96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3007,6 +3007,7 @@ WINE_CONFIG_DLL(esent)
@@ -3009,6 +3009,7 @@ WINE_CONFIG_DLL(esent)
WINE_CONFIG_DLL(evr)
WINE_CONFIG_DLL(explorerframe,,[clean])
WINE_CONFIG_TEST(dlls/explorerframe/tests)
+WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-gdi-dc-create-l1-1-1)
WINE_CONFIG_DLL(ext-ms-win-gdi-dc-l1-2-0)
WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
diff --git a/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in
new file mode 100644
index 0000000..16eee75

10
patches/api-ms-win-Stub_DLLs/0015-ext-ms-win-ntuser-mouse-l1-1-0-Add-dll.patch
View File

@ -1,4 +1,4 @@
From 2ac5a2b7834581439ac86301f52d99615be5ed7b Mon Sep 17 00:00:00 2001
From 703b9bd81221bd985ec79697e035e60a6fbcbc6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 23 Jan 2016 21:00:39 +0100
Subject: ext-ms-win-ntuser-mouse-l1-1-0: Add dll.
@ -13,11 +13,11 @@ Subject: ext-ms-win-ntuser-mouse-l1-1-0: Add dll.
create mode 100644 dlls/ext-ms-win-ntuser-mouse-l1-1-0/ext-ms-win-ntuser-mouse-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index c9f0c5f..2f33428 100644
index c5d7a4e..377d146 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3016,6 +3016,7 @@ WINE_CONFIG_DLL(ext-ms-win-gdi-dc-create-l1-1-1)
WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
@@ -3020,6 +3020,7 @@ WINE_CONFIG_DLL(ext-ms-win-gdi-draw-l1-1-1)
WINE_CONFIG_DLL(ext-ms-win-gdi-render-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-ntuser-message-l1-1-1)
+WINE_CONFIG_DLL(ext-ms-win-ntuser-mouse-l1-1-0)
@ -43,7 +43,7 @@ index 0000000..22128a2
+@ stdcall SetCapture(long) user32.SetCapture
+@ stdcall TrackMouseEvent(ptr) user32.TrackMouseEvent
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 3af936d..3414560 100755
index 45fa346..576dc5f 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -286,6 +286,7 @@ my @dll_groups =

12
patches/api-ms-win-Stub_DLLs/0016-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch
View File

@ -1,4 +1,4 @@
From 3fe011af661f4a7ecd91f63e8b924b52513de5fd Mon Sep 17 00:00:00 2001
From bc9d6818548e009b387d32677e19d56018a9f59c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 23 Jan 2016 21:02:52 +0100
Subject: ext-ms-win-uxtheme-themes-l1-1-0: Add dll.
@ -13,11 +13,11 @@ Subject: ext-ms-win-uxtheme-themes-l1-1-0: Add dll.
create mode 100644 dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index 2f33428..0f011a8 100644
index 377d146..be65d14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3023,6 +3023,7 @@ WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-ntuser-window-l1-1-1)
@@ -3030,6 +3030,7 @@ WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-rgn-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dc-access-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0)
+WINE_CONFIG_DLL(ext-ms-win-uxtheme-themes-l1-1-0)
@ -62,10 +62,10 @@ index 0000000..0a96983
+@ stdcall OpenThemeDataEx(ptr wstr long) uxtheme.OpenThemeDataEx
+@ stdcall SetWindowTheme(ptr wstr wstr) uxtheme.SetWindowTheme
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 3414560..787cadb 100755
index 576dc5f..1dde434 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -322,6 +322,10 @@ my @dll_groups =
@@ -329,6 +329,10 @@ my @dll_groups =
"api-ms-win-core-winrt-string-l1-1-0",
],
[

16
patches/api-ms-win-Stub_DLLs/0018-ext-ms-win-rtcore-ntuser-syscolors-l1-1-0-Add-dll.patch
View File

@ -1,4 +1,4 @@
From ece581793994baf72c3da6a6eb53d96473f616ad Mon Sep 17 00:00:00 2001
From 6c31a75359f023d3152378144efdee5f34078147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 23 Jan 2016 21:06:59 +0100
Subject: ext-ms-win-rtcore-ntuser-syscolors-l1-1-0: Add dll.
@ -13,12 +13,12 @@ Subject: ext-ms-win-rtcore-ntuser-syscolors-l1-1-0: Add dll.
create mode 100644 dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index 8925496..ebe0713 100644
index e865969..4e7869f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3023,6 +3023,7 @@ WINE_CONFIG_DLL(ext-ms-win-ntuser-rectangle-ext-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-ntuser-window-l1-1-1)
@@ -3030,6 +3030,7 @@ WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-object-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-rgn-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dc-access-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0)
+WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-syscolors-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0)
@ -40,12 +40,12 @@ index 0000000..626c778
+@ stdcall GetSysColor(long) user32.GetSysColor
+@ stdcall SetSysColors(long ptr ptr) user32.SetSysColors
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 48f5be8..e2e5463 100755
index 40129d0..1230505 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -293,6 +293,7 @@ my @dll_groups =
"ext-ms-win-ntuser-uicontext-ext-l1-1-0",
@@ -294,6 +294,7 @@ my @dll_groups =
"ext-ms-win-ntuser-window-l1-1-1",
"ext-ms-win-rtcore-ntuser-dc-access-l1-1-0",
"ext-ms-win-rtcore-ntuser-dpi-l1-1-0",
+ "ext-ms-win-rtcore-ntuser-syscolors-l1-1-0",
"ext-ms-win-rtcore-ntuser-sysparams-l1-1-0",

18
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "f7187ecbd62f778649e055af61cd2c6786ead7f1"
echo "02d723045ff15d2bda5475b8b6fe212ee3483cd8"
}
# Show version information
@ -307,7 +307,6 @@ patch_enable_all ()
enable_shell32_Placeholder_Icons="$1"
enable_shell32_Progress_Dialog="$1"
enable_shell32_RunDLL_CallEntry16="$1"
enable_shell32_Run_Dialog="$1"
enable_shell32_SFGAO_HASSUBFOLDER="$1"
enable_shell32_SHCreateSessionKey="$1"
enable_shell32_SHFileOperation_Move="$1"
@ -1103,9 +1102,6 @@ patch_enable ()
shell32-RunDLL_CallEntry16)
enable_shell32_RunDLL_CallEntry16="$2"
;;
shell32-Run_Dialog)
enable_shell32_Run_Dialog="$2"
;;
shell32-SFGAO_HASSUBFOLDER)
enable_shell32_SFGAO_HASSUBFOLDER="$2"
;;
@ -6492,18 +6488,6 @@ if test "$enable_shell32_RunDLL_CallEntry16" -eq 1; then
) >> "$patchlist"
fi
# Patchset shell32-Run_Dialog
# |
# | Modified files:
# | * dlls/shell32/shell32.rc
# |
if test "$enable_shell32_Run_Dialog" -eq 1; then
patch_apply shell32-Run_Dialog/0001-shell32-Add-caption-to-Run-dialog.patch
(
echo '+ { "Jared Smudde", "shell32: Add caption to Run dialog.", 1 },';
) >> "$patchlist"
fi
# Patchset shell32-SFGAO_HASSUBFOLDER
# |
# | This patchset fixes the following Wine bugs:

24
patches/shell32-Run_Dialog/0001-shell32-Add-caption-to-Run-dialog.patch
View File

@ -1,24 +0,0 @@
From 1bece0c817599701648b4cd177cf13babe1342e8 Mon Sep 17 00:00:00 2001
From: Jared Smudde <computerwhiz02@hotmail.com>
Date: Fri, 5 Jun 2015 01:43:04 +0200
Subject: shell32: Add caption to Run dialog.
---
dlls/shell32/shell32.rc | 1 +
1 file changed, 1 insertion(+)
diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
index 847d2ce..3a16da3 100644
--- a/dlls/shell32/shell32.rc
+++ b/dlls/shell32/shell32.rc
@@ -330,6 +330,7 @@ FONT 10, "MS Shell Dlg"
SHELL_RUN_DLG DIALOG 0, 0, 235, 83
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Run"
FONT 8, "MS Shell Dlg"
{
ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
--
2.4.2

18
patches/wined3d-check_format_support/0002-d3d11-Implement-ID3D11Device_CheckFormatSupport.patch
View File

@ -1,4 +1,4 @@
From f6d0d352d926895be13d0ec39b04c3d0da97d7dd Mon Sep 17 00:00:00 2001
From ce5eb9e41f77ae797dcc4d653cdc99e4ff9351f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 28 Aug 2016 04:08:38 +0200
Subject: d3d11: Implement ID3D11Device_CheckFormatSupport.
@ -41,28 +41,28 @@ index 72e6a71..131cb9d 100644
static HRESULT STDMETHODCALLTYPE d3d11_device_CheckMultisampleQualityLevels(ID3D11Device *iface,
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index ed4987e..70a6788 100644
index 123676d..84a51ff 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -10603,6 +10603,8 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE
@@ -10515,6 +10515,7 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE
if (formats[i].fl_required <= feature_level)
{
+ todo_wine_if(formats[i].format == DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM ||
+ formats[i].format == DXGI_FORMAT_R32_UINT)
+ todo_wine_if(formats[i].format == DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM)
ok(supported, "Format %#x - %s not supported, feature_level %#x, format support %#x.\n",
format, feature_name, feature_level, format_support[format]);
continue;
@@ -10616,6 +10618,8 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE
@@ -10528,6 +10529,9 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE
continue;
}
+ todo_wine_if(formats[i].format == DXGI_FORMAT_R16G16B16A16_FLOAT ||
+ formats[i].format == DXGI_FORMAT_R10G10B10A2_UNORM)
+ formats[i].format == DXGI_FORMAT_R10G10B10A2_UNORM ||
+ formats[i].format == DXGI_FORMAT_R32_UINT)
ok(!supported, "Format %#x - %s supported, feature level %#x, format support %#x.\n",
format, feature_name, feature_level, format_support[format]);
}
@@ -10623,11 +10627,18 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE
@@ -10535,11 +10539,18 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE
static void test_required_format_support(const D3D_FEATURE_LEVEL feature_level)
{
@ -81,7 +81,7 @@ index ed4987e..70a6788 100644
HRESULT hr;
static const struct format_support index_buffers[] =
@@ -10644,11 +10655,29 @@ static void test_required_format_support(const D3D_FEATURE_LEVEL feature_level)
@@ -10556,11 +10567,29 @@ static void test_required_format_support(const D3D_FEATURE_LEVEL feature_level)
return;
}