mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Appease the blessed version of gcc (4.5) when -Werror is enabled.
This commit is contained in:
parent
ce013a8a78
commit
944a550aeb
@ -70,19 +70,23 @@ clean:
|
||||
# | * kernel32: Silence repeated CompareStringEx FIXME. [by Sebastian Lackner]
|
||||
# | * wined3d: Silence repeated resource_check_usage FIXME. [rev 2, by Erich E. Hoover]
|
||||
# | * wined3d: Silence repeated wined3d_swapchain_present FIXME. [by Sebastian Lackner]
|
||||
# | * Appease the blessed version of gcc (4.5) when -Werror is enabled. [by Erich E. Hoover]
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/kernel32/locale.c, dlls/wined3d/resource.c, dlls/wined3d/swapchain.c
|
||||
# | * dlls/d3d9/tests/visual.c, dlls/kernel32/locale.c, dlls/netapi32/netapi32.c, dlls/winealsa.drv/mmdevdrv.c,
|
||||
# | dlls/wined3d/glsl_shader.c, dlls/wined3d/resource.c, dlls/wined3d/swapchain.c, server/object.c, tools/makedep.c
|
||||
# |
|
||||
.INTERMEDIATE: Miscellaneous.ok
|
||||
Miscellaneous.ok:
|
||||
$(call APPLY_PATCH,Miscellaneous/0001-wined3d-Silence-repeated-resource_check_usage-FIXME.patch)
|
||||
$(call APPLY_PATCH,Miscellaneous/0002-kernel32-Silence-repeated-CompareStringEx-FIXME.patch)
|
||||
$(call APPLY_PATCH,Miscellaneous/0003-wined3d-Silence-repeated-wined3d_swapchain_present-F.patch)
|
||||
$(call APPLY_PATCH,Miscellaneous/0004-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch)
|
||||
@( \
|
||||
echo '+ { "Miscellaneous", "Sebastian Lackner", "kernel32: Silence repeated CompareStringEx FIXME." },'; \
|
||||
echo '+ { "Miscellaneous", "Erich E. Hoover", "wined3d: Silence repeated resource_check_usage FIXME. [rev 2]" },'; \
|
||||
echo '+ { "Miscellaneous", "Sebastian Lackner", "wined3d: Silence repeated wined3d_swapchain_present FIXME." },'; \
|
||||
echo '+ { "Miscellaneous", "Erich E. Hoover", "Appease the blessed version of gcc (4.5) when -Werror is enabled." },'; \
|
||||
) > Miscellaneous.ok
|
||||
|
||||
# Patchset Pipelight
|
||||
|
@ -0,0 +1,95 @@
|
||||
From fec987aaff3478e5325df368cce471109fe3c064 Mon Sep 17 00:00:00 2001
|
||||
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
|
||||
Date: Fri, 8 Aug 2014 19:33:14 -0600
|
||||
Subject: Appease the blessed version of gcc (4.5) when -Werror is enabled.
|
||||
|
||||
---
|
||||
dlls/d3d9/tests/visual.c | 2 +-
|
||||
dlls/netapi32/netapi32.c | 2 +-
|
||||
dlls/winealsa.drv/mmdevdrv.c | 2 +-
|
||||
dlls/wined3d/glsl_shader.c | 2 +-
|
||||
server/object.c | 2 +-
|
||||
tools/makedep.c | 2 +-
|
||||
6 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
|
||||
index 117c8eb..3988628 100644
|
||||
--- a/dlls/d3d9/tests/visual.c
|
||||
+++ b/dlls/d3d9/tests/visual.c
|
||||
@@ -11163,7 +11163,7 @@ static void yuv_layout_test(void)
|
||||
IDirect3D9 *d3d;
|
||||
D3DCOLOR color;
|
||||
DWORD ref_color;
|
||||
- BYTE *buf, *chroma_buf, *u_buf, *v_buf;
|
||||
+ BYTE *buf, *chroma_buf, *u_buf = NULL, *v_buf = NULL;
|
||||
UINT width = 20, height = 16;
|
||||
IDirect3DDevice9 *device;
|
||||
ULONG refcount;
|
||||
diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c
|
||||
index d2a61fa..bb7ac1c 100644
|
||||
--- a/dlls/netapi32/netapi32.c
|
||||
+++ b/dlls/netapi32/netapi32.c
|
||||
@@ -779,7 +779,7 @@ static NET_API_STATUS share_info_to_samba( DWORD level, const BYTE *buf, unsigne
|
||||
static NET_API_STATUS share_add( LMSTR servername, DWORD level, LPBYTE buf, LPDWORD parm_err )
|
||||
{
|
||||
char *server = NULL;
|
||||
- unsigned char *info;
|
||||
+ unsigned char *info = NULL;
|
||||
NET_API_STATUS status;
|
||||
|
||||
if (servername && !(server = strdup_unixcp( servername ))) return ERROR_OUTOFMEMORY;
|
||||
diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c
|
||||
index a4c02bf..909db53 100644
|
||||
--- a/dlls/winealsa.drv/mmdevdrv.c
|
||||
+++ b/dlls/winealsa.drv/mmdevdrv.c
|
||||
@@ -353,7 +353,7 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const cha
|
||||
{
|
||||
WCHAR *ret;
|
||||
const WCHAR *prefix;
|
||||
- DWORD len_wchars = 0, chunk1_len, copied = 0, prefix_len;
|
||||
+ DWORD len_wchars = 0, chunk1_len = 0, copied = 0, prefix_len;
|
||||
|
||||
static const WCHAR dashW[] = {' ','-',' ',0};
|
||||
static const size_t dashW_len = (sizeof(dashW) / sizeof(*dashW)) - 1;
|
||||
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
|
||||
index 1097d87..38d6cbd 100644
|
||||
--- a/dlls/wined3d/glsl_shader.c
|
||||
+++ b/dlls/wined3d/glsl_shader.c
|
||||
@@ -5798,7 +5798,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
|
||||
GLhandleARB vs_id = 0;
|
||||
GLhandleARB gs_id = 0;
|
||||
GLhandleARB ps_id = 0;
|
||||
- struct list *ps_list, *vs_list;
|
||||
+ struct list *ps_list = NULL, *vs_list = NULL;
|
||||
|
||||
if (!(context->shader_update_mask & (1 << WINED3D_SHADER_TYPE_VERTEX)))
|
||||
{
|
||||
diff --git a/server/object.c b/server/object.c
|
||||
index 11ef0ce..133c6b5 100644
|
||||
--- a/server/object.c
|
||||
+++ b/server/object.c
|
||||
@@ -428,7 +428,7 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd,
|
||||
{
|
||||
struct security_descriptor new_sd, *new_sd_ptr;
|
||||
int present;
|
||||
- const SID *owner, *group;
|
||||
+ const SID *owner = NULL, *group = NULL;
|
||||
const ACL *sacl, *dacl;
|
||||
char *ptr;
|
||||
|
||||
diff --git a/tools/makedep.c b/tools/makedep.c
|
||||
index 396a1e3..1261785 100644
|
||||
--- a/tools/makedep.c
|
||||
+++ b/tools/makedep.c
|
||||
@@ -1480,7 +1480,7 @@ static char *get_make_variable( struct makefile *make, const char *name )
|
||||
*/
|
||||
static char *get_expanded_make_variable( struct makefile *make, const char *name )
|
||||
{
|
||||
- char *p, *end, *var, *expand, *tmp;
|
||||
+ char *p, *end, *var, *expand, *tmp = NULL;
|
||||
|
||||
expand = get_make_variable( make, name );
|
||||
if (!expand) return NULL;
|
||||
--
|
||||
1.7.9.5
|
||||
|
@ -9,3 +9,8 @@ Title: wined3d: Silence repeated resource_check_usage FIXME.
|
||||
Revision: 1
|
||||
Author: Sebastian Lackner
|
||||
Title: wined3d: Silence repeated wined3d_swapchain_present FIXME.
|
||||
|
||||
Revision: 1
|
||||
Author: Erich E. Hoover
|
||||
Title: Appease the blessed version of gcc (4.5) when -Werror is enabled.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user