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 d6d0d96402b9c187877f11da173f8fbbf62ba072.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-08-13 05:24:18 +02:00
parent c46fab6261
commit 436e1adc84
4 changed files with 6 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
patches/Compiler_Warnings/0009-shell32-tests-Avoid-misleading-indentation-warnings.patch
View File

@ -1,26 +0,0 @@
From 173e27263954c449c3657701e9d7489c603f1306 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 30 Jul 2016 23:58:37 +0200
Subject: shell32/tests: Avoid misleading indentation warnings.
---
dlls/shell32/tests/shellole.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c
index e8cf744..99f0ccb 100644
--- a/dlls/shell32/tests/shellole.c
+++ b/dlls/shell32/tests/shellole.c
@@ -872,7 +872,9 @@ static void test_SHCreateSessionKey(void)
}
if (0) /* crashes on native */
+{
hr = pSHCreateSessionKey(KEY_READ, NULL);
+}
hkey = (HKEY)0xdeadbeef;
hr = pSHCreateSessionKey(0, &hkey);
--
2.9.0

26
patches/Compiler_Warnings/0010-shlwapi-tests-Avoid-misleading-indentation-warnings.patch
View File

@ -1,26 +0,0 @@
From f590ced17854c6830cd15b63e757ef5798095cb1 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 30 Jul 2016 23:58:52 +0200
Subject: shlwapi/tests: Avoid misleading indentation warnings.
---
dlls/shlwapi/tests/ordinal.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c
index 74cad7d..b26fd4f 100644
--- a/dlls/shlwapi/tests/ordinal.c
+++ b/dlls/shlwapi/tests/ordinal.c
@@ -3225,7 +3225,9 @@ static void test_IUnknown_GetClassID(void)
HRESULT hr;
if (0) /* crashes on native systems */
+{
hr = pIUnknown_GetClassID(NULL, NULL);
+}
memset(&clsid, 0xcc, sizeof(clsid));
memset(&clsid3, 0xcc, sizeof(clsid3));
--
2.9.0

13
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "dca0e38d82c737cd8aeab63e08cf1990d05d9671"
echo "d6d0d96402b9c187877f11da173f8fbbf62ba072"
}
# Show version information
@ -2333,17 +2333,14 @@ fi
# | * dlls/amstream/mediastreamfilter.c, dlls/comctl32/listview.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/msvcirt/tests/msvcirt.c, dlls/msxml3/schema.c, dlls/netapi32/netapi32.c,
# | dlls/oleaut32/oleaut.c, dlls/oleaut32/tests/safearray.c, dlls/rpcrt4/cstub.c, dlls/shell32/tests/shellole.c,
# | dlls/shlwapi/tests/ordinal.c, dlls/vbscript/vbdisp.c, dlls/winealsa.drv/mmdevdrv.c, dlls/wined3d/glsl_shader.c,
# | include/d3dtypes.h, include/wine/list.h, include/wine/rbtree.h, include/winnt.h, server/request.c, server/sock.c,
# | tools/makedep.c
# | dlls/oleaut32/oleaut.c, dlls/oleaut32/tests/safearray.c, dlls/rpcrt4/cstub.c, dlls/vbscript/vbdisp.c,
# | dlls/winealsa.drv/mmdevdrv.c, dlls/wined3d/glsl_shader.c, include/d3dtypes.h, include/wine/list.h,
# | include/wine/rbtree.h, include/winnt.h, server/request.c, server/sock.c, tools/makedep.c
# |
if test "$enable_Compiler_Warnings" -eq 1; then
patch_apply Compiler_Warnings/0001-comctl32-Avoid-misleading-indentation-warnings.patch
patch_apply Compiler_Warnings/0005-msvcirt-tests-Avoid-misleading-indentation-warnings.patch
patch_apply Compiler_Warnings/0006-oleaut32-tests-Avoid-misleading-indentation-warnings.patch
patch_apply Compiler_Warnings/0009-shell32-tests-Avoid-misleading-indentation-warnings.patch
patch_apply Compiler_Warnings/0010-shlwapi-tests-Avoid-misleading-indentation-warnings.patch
patch_apply Compiler_Warnings/0015-include-Avoid-shift-overflow-warning.patch
patch_apply Compiler_Warnings/0017-server-Workaround-duplicate-condition-warning-of-GCC.patch
patch_apply Compiler_Warnings/0018-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch
@ -2364,8 +2361,6 @@ if test "$enable_Compiler_Warnings" -eq 1; then
echo '+ { "Sebastian Lackner", "comctl32: Avoid misleading indentation warnings.", 1 },';
echo '+ { "Sebastian Lackner", "msvcirt/tests: Avoid misleading indentation warnings.", 1 },';
echo '+ { "Sebastian Lackner", "oleaut32/tests: Avoid misleading indentation warnings.", 1 },';
echo '+ { "Sebastian Lackner", "shell32/tests: Avoid misleading indentation warnings.", 1 },';
echo '+ { "Sebastian Lackner", "shlwapi/tests: Avoid misleading indentation warnings.", 1 },';
echo '+ { "Sebastian Lackner", "include: Avoid shift overflow warning.", 1 },';
echo '+ { "Sebastian Lackner", "server: Workaround duplicate condition warning of GCC 6.", 1 },';
echo '+ { "Erich E. Hoover", "Appease the blessed version of gcc (4.5) when -Werror is enabled.", 1 },';

4
patches/wined3d-CSMT_Main/9999-IfDefined.patch
View File

@ -7919,7 +7919,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -4499,7 +4499,11 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w
@@ -4503,7 +4503,11 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w
float y_offset = context->render_offscreen
? (center_offset - (2.0f * y) - h) / h
: (center_offset - (2.0f * y) - h) / -h;
@ -7931,7 +7931,7 @@ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
state->render_states[WINED3D_RS_ZENABLE] : WINED3D_ZB_FALSE;
float z_scale = zenable ? 2.0f : 0.0f;
float z_offset = zenable ? -1.0f : 0.0f;
@@ -5296,7 +5300,11 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d
@@ -5300,7 +5304,11 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d
break;
}
}