wine-commits April 2015

wine-commits@winehq.org

2 participants
451 discussions

Henri Verbeet : wined3d: Slightly simplify get_info_log_line().
by Alexandre Julliard 21 Apr '15

21 Apr '15

Module: wine Branch: master Commit: 6e4ad78ff4aa501adb38c5e0a880d4842b7d05a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4ad78ff4aa501adb38c5e0a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 12:25:53 2015 +0200 wined3d: Slightly simplify get_info_log_line(). --- dlls/wined3d/glsl_shader.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 84fc1a2..655bb33 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -279,11 +279,9 @@ static void shader_glsl_append_imm_vec4(struct wined3d_shader_buffer *buffer, co shader_addline(buffer, "vec4(%s, %s, %s, %s)", str[0], str[1], str[2], str[3]); } -/* Extract a line from the info log. - * Note that this modifies the source string. */ -static char *get_info_log_line(char **ptr) +static const char *get_info_log_line(const char **ptr) { - char *p, *q; + const char *p, *q; p = *ptr; if (!(q = strstr(p, "\n"))) @@ -292,7 +290,6 @@ static char *get_info_log_line(char **ptr) *ptr += strlen(p); return p; } - *q = '\0'; *ptr = q + 1; return p; @@ -316,7 +313,7 @@ static void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLuint id * that if there are errors. */ if (length > 1) { - char *ptr, *line; + const char *ptr, *line; log = HeapAlloc(GetProcessHeap(), 0, length); /* The info log is supposed to be zero-terminated, but at least some @@ -333,12 +330,12 @@ static void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLuint id if (gl_info->quirks & WINED3D_QUIRK_INFO_LOG_SPAM) { WARN("Info log received from GLSL shader #%u:\n", id); - while ((line = get_info_log_line(&ptr))) WARN(" %s\n", line); + while ((line = get_info_log_line(&ptr))) WARN(" %.*s", (int)(ptr - line), line); } else { FIXME("Info log received from GLSL shader #%u:\n", id); - while ((line = get_info_log_line(&ptr))) FIXME(" %s\n", line); + while ((line = get_info_log_line(&ptr))) FIXME(" %.*s", (int)(ptr - line), line); } HeapFree(GetProcessHeap(), 0, log); } @@ -373,7 +370,7 @@ static void shader_glsl_dump_program_source(const struct wined3d_gl_info *gl_inf GL_EXTCALL(glGetAttachedShaders(program, shader_count, NULL, shaders)); for (i = 0; i < shader_count; ++i) { - char *ptr, *line; + const char *ptr, *line; GLint tmp; GL_EXTCALL(glGetShaderiv(shaders[i], GL_SHADER_SOURCE_LENGTH, &tmp)); @@ -401,7 +398,7 @@ static void shader_glsl_dump_program_source(const struct wined3d_gl_info *gl_inf ptr = source; GL_EXTCALL(glGetShaderSource(shaders[i], source_size, NULL, source)); - while ((line = get_info_log_line(&ptr))) FIXME(" %s\n", line); + while ((line = get_info_log_line(&ptr))) FIXME(" %.*s", (int)(ptr - line), line); FIXME("\n"); }

1 0

Henri Verbeet : wined3d: Completely initialize "correction_params" in shader_glsl_load_constants() (Valgrind).
by Alexandre Julliard 21 Apr '15

21 Apr '15

Module: wine Branch: master Commit: de1450788b99f8976b1c49b74d352f6a24bb2cde URL: http://source.winehq.org/git/wine.git/?a=commit;h=de1450788b99f8976b1c49b74… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 12:25:52 2015 +0200 wined3d: Completely initialize "correction_params" in shader_glsl_load_constants() (Valgrind). Leaving the last two elements uninitialized is mostly harmless since the shader doesn't actually use them, but the driver might try to do some kind of analysis on them. --- dlls/wined3d/glsl_shader.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b1a0f85..84fc1a2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -944,17 +944,15 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context if (update_mask & WINED3D_SHADER_CONST_PS_Y_CORR) { - float correction_params[4]; - - if (context->render_offscreen) + float correction_params[] = { - correction_params[0] = 0.0f; - correction_params[1] = 1.0f; - } else { /* position is window relative, not viewport relative */ - correction_params[0] = (float) context->current_rt->resource.height; - correction_params[1] = -1.0f; - } + context->render_offscreen ? 0.0f : (float)context->current_rt->resource.height, + context->render_offscreen ? 1.0f : -1.0f, + 0.0f, + 0.0f, + }; + GL_EXTCALL(glUniform4fv(prog->ps.ycorrection_location, 1, correction_params)); }

1 0

Henri Verbeet : wined3d: Introduce a function to compile ARB vertex/ fragment programs.
by Alexandre Julliard 21 Apr '15

21 Apr '15

Module: wine Branch: master Commit: c7780791ea8bfb8355e703563a0573ed87d15f30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7780791ea8bfb8355e703563… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 12:25:51 2015 +0200 wined3d: Introduce a function to compile ARB vertex/fragment programs. --- dlls/wined3d/arb_program_shader.c | 188 +++++++++----------------------------- 1 file changed, 41 insertions(+), 147 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c7780791ea8bfb8355e70…

1 0

Henri Verbeet : wined3d: Initialize "type.padding" in arbfp_blit_set() ( Valgrind).
by Alexandre Julliard 21 Apr '15

21 Apr '15

Module: wine Branch: master Commit: 8063d4cfcc31bc72ae13e43abd0121a031e61fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=8063d4cfcc31bc72ae13e43ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 12:25:50 2015 +0200 wined3d: Initialize "type.padding" in arbfp_blit_set() (Valgrind). --- dlls/wined3d/arb_program_shader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 797c204..1507182 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7715,6 +7715,7 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, } type.fixup = fixup; type.use_color_key = !!color_key; + type.padding = 0; entry = wine_rb_get(&priv->shaders, &type); if (entry)

1 0

Henri Verbeet : d3d9/tests: Release "d3d9ex" after we' re done with it in test_wndproc() (Valgrind).
by Alexandre Julliard 21 Apr '15

21 Apr '15

Module: wine Branch: master Commit: ca00d72da3d959df1e6a6d619ee19da3f0a7be7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca00d72da3d959df1e6a6d619… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 12:25:49 2015 +0200 d3d9/tests: Release "d3d9ex" after we're done with it in test_wndproc() (Valgrind). --- dlls/d3d9/tests/d3d9ex.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 0a7fe90..8048bdc 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2160,10 +2160,11 @@ static void test_wndproc(void) } } + IDirect3D9Ex_Release(d3d9ex); + if (!d3d_width) { skip("Could not find adequate modes, skipping mode tests.\n"); - IDirect3D9Ex_Release(d3d9ex); return; }

1 0

Hans Leidekker : winhttp: Fix a memory leak (valgrind).
by Alexandre Julliard 21 Apr '15

21 Apr '15

Module: wine Branch: master Commit: 1c5e704af607511191b35bb45214a24f400c870f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c5e704af607511191b35bb45… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 21 11:21:45 2015 +0200 winhttp: Fix a memory leak (valgrind). --- dlls/winhttp/session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 0eca509..9becdfe 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -566,6 +566,7 @@ static void request_destroy( object_header_t *hdr ) CloseHandle( request->task_thread ); CloseHandle( request->task_cancel ); CloseHandle( request->task_wait ); + request->task_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &request->task_cs ); } release_object( &request->connect->hdr );

1 0

Hans Leidekker : winhttp: Initialize some variables (valgrind).
by Alexandre Julliard 21 Apr '15

21 Apr '15

Module: wine Branch: master Commit: d36f8d52cfb861f07b9d6f09f86b5391f56c2343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d36f8d52cfb861f07b9d6f09f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 21 11:21:06 2015 +0200 winhttp: Initialize some variables (valgrind). --- dlls/winhttp/tests/winhttp.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index ac944f2..705d654 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -889,6 +889,7 @@ static void test_secure_connection(void) ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError()); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed unexpectedly %u\n", GetLastError()); @@ -943,6 +944,7 @@ static void test_request_parameter_defaults(void) ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError()); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed unexpectedly %u\n", GetLastError()); @@ -977,6 +979,7 @@ static void test_request_parameter_defaults(void) ok(lstrlenW(version) == size / sizeof(WCHAR), "unexpected size %u\n", size); HeapFree(GetProcessHeap(), 0, version); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed unexpectedly %u\n", GetLastError()); @@ -1952,6 +1955,7 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError()); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed to query status code %u\n", GetLastError()); @@ -2052,6 +2056,7 @@ static void test_basic_authentication(int port) ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError()); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed to query status code %u\n", GetLastError()); @@ -2106,6 +2111,7 @@ static void test_basic_authentication(int port) ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError()); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed to query status code %u\n", GetLastError()); @@ -2186,6 +2192,7 @@ static void test_no_content(int port) ret = WinHttpReceiveResponse(req, NULL); ok(ret, "expected success\n"); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); @@ -2320,6 +2327,7 @@ static void test_not_modified(int port) ret = WinHttpReceiveResponse(request, NULL); ok(ret, "WinHttpReceiveResponse failed: %u\n", GetLastError()); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL);

1 0

Hans Leidekker : msi: Initialize a variable (valgrind).
by Alexandre Julliard 21 Apr '15

21 Apr '15

Module: wine Branch: master Commit: 4710e973f8df0c3ef3b4b9b357d66f7794b47787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4710e973f8df0c3ef3b4b9b35… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 21 11:20:42 2015 +0200 msi: Initialize a variable (valgrind). --- dlls/msi/automation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 228d887..01765cb 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1366,7 +1366,7 @@ static HRESULT session_invoke( { SessionObject *session = (SessionObject*)This; WCHAR *szString; - DWORD dwLen; + DWORD dwLen = 0; MSIHANDLE msiHandle; LANGID langId; UINT ret;

1 0

Hans Leidekker : msi: Fix an invalid memory access (valgrind).
by Alexandre Julliard 21 Apr '15

21 Apr '15

Module: wine Branch: master Commit: e6ce4de3930018b95bddbe8d259cbbaa1309d1f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6ce4de3930018b95bddbe8d2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 21 11:20:24 2015 +0200 msi: Fix an invalid memory access (valgrind). --- dlls/msi/table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 256034b..700a61a 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -899,7 +899,7 @@ static UINT save_table( MSIDATABASE *db, const MSITABLE *t, UINT bytes_per_strre } rawsize = 0; - for (i = 0; i < t->row_count; i++) + for (i = 0; i < row_count; i++) { UINT ofs = 0, ofs_mem = 0;

1 0

Hans Leidekker : msi: Initialize a variable (valgrind).
by Alexandre Julliard 21 Apr '15

21 Apr '15

Module: wine Branch: master Commit: 55b678e18686862e25d1dc310d27a6f2c751dadf URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b678e18686862e25d1dc310… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 21 11:20:04 2015 +0200 msi: Initialize a variable (valgrind). --- dlls/msi/msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 2c476fa..2b531da 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -4201,7 +4201,7 @@ UINT WINAPI MsiProvideComponentA( LPCSTR product, LPCSTR feature, LPCSTR compone { WCHAR *productW = NULL, *componentW = NULL, *featureW = NULL, *bufW = NULL; UINT r = ERROR_OUTOFMEMORY; - DWORD lenW; + DWORD lenW = 0; int len; TRACE("%s, %s, %s, %x, %p, %p\n", debugstr_a(product), debugstr_a(component), debugstr_a(feature), mode, buf, buflen);

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2015