wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against d04a54857cc84f881393e4bc794185650a302084.

Browse Source 
[makefiles-Revert_libwine_Import]
Disabled patch, the problem should be fixed in the development branch.
This commit is contained in:
Sebastian Lackner 2016-03-29 02:43:56 +02:00
parent 0a391faaba
commit c43b0d8ac0
7 changed files with 20 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
patches/Compiler_Warnings/0012-quartz-Avoid-implicit-cast-of-interface-pointer.patch
View File

@ -1,39 +0,0 @@
From afaa960b059c2e6bf75635c4e2d96be774ece41a Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Tue, 22 Mar 2016 22:45:29 +0100
Subject: quartz: Avoid implicit cast of interface pointer.
---
dlls/quartz/acmwrapper.c | 2 +-
dlls/quartz/avidec.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c
index d9a94a9..3c1c7cf 100644
--- a/dlls/quartz/acmwrapper.c
+++ b/dlls/quartz/acmwrapper.c
@@ -55,7 +55,7 @@ static const IBaseFilterVtbl ACMWrapper_Vtbl;
static inline ACMWrapperImpl *impl_from_TransformFilter( TransformFilter *iface )
{
- return CONTAINING_RECORD(iface, ACMWrapperImpl, tf.filter);
+ return CONTAINING_RECORD(iface, ACMWrapperImpl, tf);
}
static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSample)
diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c
index 1a58844..eb9b223 100644
--- a/dlls/quartz/avidec.c
+++ b/dlls/quartz/avidec.c
@@ -54,7 +54,7 @@ static const IBaseFilterVtbl AVIDec_Vtbl;
static inline AVIDecImpl *impl_from_TransformFilter( TransformFilter *iface )
{
- return CONTAINING_RECORD(iface, AVIDecImpl, tf.filter);
+ return CONTAINING_RECORD(iface, AVIDecImpl, tf);
}
static HRESULT WINAPI AVIDec_StartStreaming(TransformFilter* pTransformFilter)
--
2.7.1

0
patches/Compiler_Warnings/0013-rpcrt4-Avoid-implicit-cast-of-interface-pointer.patch → patches/Compiler_Warnings/0012-rpcrt4-Avoid-implicit-cast-of-interface-pointer.patch
View File

0
patches/Compiler_Warnings/0014-vbscript-Avoid-implicit-cast-of-interface-pointer.patch → patches/Compiler_Warnings/0013-vbscript-Avoid-implicit-cast-of-interface-pointer.patch
View File

0
patches/Compiler_Warnings/0015-include-Check-element-type-in-CONTAINING_RECORD-and-.patch → patches/Compiler_Warnings/0014-include-Check-element-type-in-CONTAINING_RECORD-and-.patch
View File

2
patches/makefiles-Revert_libwine_Import/definition
View File

@ -1 +1,3 @@
Fixes: [!40355] Revert commit to import libwine only for Windows builds
# Fixed with 8f567028123cd7a3c8180f9ad2c867add34795e3?
Disabled: true

35
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "4315caeff699325cd681b9beb7d22908b098411b"
echo "d04a54857cc84f881393e4bc794185650a302084"
}
# Show version information
@ -187,7 +187,6 @@ patch_enable_all ()
enable_libs_Debug_Channel="$1"
enable_libs_Unicode_Collation="$1"
enable_makedep_PARENTSPEC="$1"
enable_makefiles_Revert_libwine_Import="$1"
enable_mfplat_MFTRegister="$1"
enable_mmsystem_dll16_MIDIHDR_Refcount="$1"
enable_mountmgr_DosDevices="$1"
@ -739,9 +738,6 @@ patch_enable ()
makedep-PARENTSPEC)
enable_makedep_PARENTSPEC="$2"
;;
makefiles-Revert_libwine_Import)
enable_makefiles_Revert_libwine_Import="$2"
;;
mfplat-MFTRegister)
enable_mfplat_MFTRegister="$2"
;;
@ -2396,9 +2392,9 @@ fi
# | Modified files:
# | * dlls/amstream/mediastreamfilter.c, dlls/d2d1/brush.c, dlls/d2d1/geometry.c, dlls/d3d11/view.c, dlls/d3d8/texture.c,
# | dlls/d3d9/tests/visual.c, dlls/d3d9/texture.c, dlls/ddraw/viewport.c, dlls/dsound/primary.c, dlls/dwrite/layout.c,
# | dlls/msxml3/schema.c, dlls/netapi32/netapi32.c, dlls/oleaut32/oleaut.c, dlls/quartz/acmwrapper.c, dlls/quartz/avidec.c,
# | dlls/rpcrt4/cstub.c, dlls/vbscript/vbdisp.c, dlls/winealsa.drv/mmdevdrv.c, dlls/wined3d/glsl_shader.c,
# | include/wine/list.h, include/wine/rbtree.h, include/winnt.h, tools/makedep.c
# | dlls/msxml3/schema.c, dlls/netapi32/netapi32.c, dlls/oleaut32/oleaut.c, dlls/rpcrt4/cstub.c, dlls/vbscript/vbdisp.c,
# | dlls/winealsa.drv/mmdevdrv.c, dlls/wined3d/glsl_shader.c, include/wine/list.h, include/wine/rbtree.h, include/winnt.h,
# | tools/makedep.c
# |
if test "$enable_Compiler_Warnings" -eq 1; then
patch_apply Compiler_Warnings/0001-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch
@ -2412,10 +2408,9 @@ if test "$enable_Compiler_Warnings" -eq 1; then
patch_apply Compiler_Warnings/0009-dwrite-Avoid-implicit-cast-of-interface-pointer.patch
patch_apply Compiler_Warnings/0010-msxml3-Avoid-implicit-cast-of-interface-pointer.patch
patch_apply Compiler_Warnings/0011-oleaut32-Avoid-implicit-cast-of-interface-pointer.patch
patch_apply Compiler_Warnings/0012-quartz-Avoid-implicit-cast-of-interface-pointer.patch
patch_apply Compiler_Warnings/0013-rpcrt4-Avoid-implicit-cast-of-interface-pointer.patch
patch_apply Compiler_Warnings/0014-vbscript-Avoid-implicit-cast-of-interface-pointer.patch
patch_apply Compiler_Warnings/0015-include-Check-element-type-in-CONTAINING_RECORD-and-.patch
patch_apply Compiler_Warnings/0012-rpcrt4-Avoid-implicit-cast-of-interface-pointer.patch
patch_apply Compiler_Warnings/0013-vbscript-Avoid-implicit-cast-of-interface-pointer.patch
patch_apply Compiler_Warnings/0014-include-Check-element-type-in-CONTAINING_RECORD-and-.patch
(
echo '+ { "Erich E. Hoover", "Appease the blessed version of gcc (4.5) when -Werror is enabled.", 1 },';
echo '+ { "Sebastian Lackner", "dsound: Avoid implicit cast of interface pointer.", 1 },';
@ -2428,7 +2423,6 @@ if test "$enable_Compiler_Warnings" -eq 1; then
echo '+ { "Sebastian Lackner", "dwrite: Avoid implicit cast of interface pointer.", 1 },';
echo '+ { "Sebastian Lackner", "msxml3: Avoid implicit cast of interface pointer.", 1 },';
echo '+ { "Sebastian Lackner", "oleaut32: Avoid implicit cast of interface pointer.", 1 },';
echo '+ { "Sebastian Lackner", "quartz: Avoid implicit cast of interface pointer.", 1 },';
echo '+ { "Sebastian Lackner", "rpcrt4: Avoid implicit cast of interface pointer.", 1 },';
echo '+ { "Sebastian Lackner", "vbscript: Avoid implicit cast of interface pointer.", 1 },';
echo '+ { "Sebastian Lackner", "include: Check element type in CONTAINING_RECORD and similar macros.", 1 },';
@ -4427,21 +4421,6 @@ if test "$enable_makedep_PARENTSPEC" -eq 1; then
) >> "$patchlist"
fi
# Patchset makefiles-Revert_libwine_Import
# |
# | This patchset fixes the following Wine bugs:
# | * [#40355] Revert commit to import libwine only for Windows builds
# |
# | Modified files:
# | * tools/makedep.c
# |
if test "$enable_makefiles_Revert_libwine_Import" -eq 1; then
patch_apply makefiles-Revert_libwine_Import/0001-Revert-makefiles-Explicitly-import-libwine-only-for-.patch
(
echo '+ { "Erich E. Hoover", "Revert \"makefiles: Explicitly import libwine only for Windows builds.\".", 1 },';
) >> "$patchlist"
fi
# Patchset mfplat-MFTRegister
# |
# | This patchset fixes the following Wine bugs:

22
patches/winecfg-Staging/0001-winecfg-Add-staging-tab-for-CSMT.patch
View File

@ -1,4 +1,4 @@
From 3c9eab9f6e96d05a6e5ca0f82d6b52a07092c526 Mon Sep 17 00:00:00 2001
From d88860b3dd92769f14c45c92f9640ee4a9e8efe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 14 Dec 2014 20:42:45 +0100
Subject: winecfg: Add staging tab for CSMT.
@ -14,7 +14,7 @@ Subject: winecfg: Add staging tab for CSMT.
create mode 100644 programs/winecfg/staging.c
diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in
index 4e66e04..1cf7031 100644
index 7b52a69..c86fdd0 100644
--- a/programs/winecfg/Makefile.in
+++ b/programs/winecfg/Makefile.in
@@ -11,6 +11,7 @@ C_SRCS = \
@ -26,10 +26,10 @@ index 4e66e04..1cf7031 100644
winecfg.c \
x11drvdlg.c
diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c
index 6ac5f89..17909dc 100644
index b8a85fe..de209a9 100644
--- a/programs/winecfg/main.c
+++ b/programs/winecfg/main.c
@@ -60,7 +60,7 @@ PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam)
@@ -58,7 +58,7 @@ PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam)
return 0;
}
@ -38,7 +38,7 @@ index 6ac5f89..17909dc 100644
static INT_PTR
doPropertySheet (HINSTANCE hInstance, HWND hOwner)
@@ -141,6 +141,16 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner)
@@ -139,6 +139,16 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner)
psp[pg].lParam = 0;
pg++;
@ -56,7 +56,7 @@ index 6ac5f89..17909dc 100644
* Fill out the (General) PROPSHEETPAGE data structure
* for the property sheet
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
index fffc4da..7d11050 100644
index 0c0b038..54c67c2 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -45,6 +45,7 @@
@ -75,8 +75,8 @@ index fffc4da..7d11050 100644
#define IDC_WINVER 1012
#define IDC_DESKTOP_WIDTH 1023
#define IDC_DESKTOP_HEIGHT 1024
@@ -202,6 +204,9 @@
#define IDC_SYSPARAMS_MENU_HILIGHT 8430
@@ -210,6 +212,9 @@
#define IDC_SYSPARAMS_MENU_HIGHLIGHT 8430
#define IDC_SYSPARAMS_MENUBAR 8431
+/* Staging tab */
@ -193,7 +193,7 @@ index 110856a..a949474 100644
/* Drive management */
diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc
index 9f763a7..ad3e842 100644
index 72c3e1b..dedc039 100644
--- a/programs/winecfg/winecfg.rc
+++ b/programs/winecfg/winecfg.rc
@@ -39,6 +39,7 @@ BEGIN
@ -204,7 +204,7 @@ index 9f763a7..ad3e842 100644
IDS_TAB_ABOUT "About"
IDS_WINECFG_TITLE "Wine configuration"
IDS_WINECFG_TITLE_APP "Wine configuration for %s"
@@ -297,6 +298,15 @@ BEGIN
@@ -308,6 +309,15 @@ BEGIN
PUSHBUTTON "B&rowse...",IDC_BROWSE_SFPATH,195,195,50,13,WS_DISABLED
END
@ -221,5 +221,5 @@ index 9f763a7..ad3e842 100644
/* @makedep: winecfg.ico */
--
2.2.1
2.7.1