April 2015 - Wine-Commits - list.winehq.org

Hans Leidekker : winhttp: Fix a memory leak (valgrind).
by Alexandre Julliard April 21, 2015

April 21, 2015

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 April 21, 2015

April 21, 2015

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: Fix a trace.
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: 6ef2d26a534b98f67485b7e59c84d46b7800567b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ef2d26a534b98f67485b7e59… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 21 11:19:45 2015 +0200 msi: Fix a trace. Reported by Marcus Meissner. --- dlls/msi/files.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 8977a9c..9b46762 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -137,18 +137,14 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil { if (msi_compare_font_versions( font_version, file->Version ) < 0) { - TRACE("overwriting %s (new version %s old version %u.%u.%u.%u)\n", - debugstr_w(file->File), debugstr_w(file->Version), - HIWORD(file_version->dwFileVersionMS), LOWORD(file_version->dwFileVersionMS), - HIWORD(file_version->dwFileVersionLS), LOWORD(file_version->dwFileVersionLS)); + TRACE("overwriting %s (new version %s old version %s)\n", + debugstr_w(file->File), debugstr_w(file->Version), debugstr_w(font_version)); state = msifs_overwrite; } else { - TRACE("keeping %s (new version %s old version %u.%u.%u.%u)\n", - debugstr_w(file->File), debugstr_w(file->Version), - HIWORD(file_version->dwFileVersionMS), LOWORD(file_version->dwFileVersionMS), - HIWORD(file_version->dwFileVersionLS), LOWORD(file_version->dwFileVersionLS)); + TRACE("keeping %s (new version %s old version %s)\n", + debugstr_w(file->File), debugstr_w(file->Version), debugstr_w(font_version)); state = msifs_present; } msi_free( font_version );

1 0

Qian Hong : ntdll: Correctly document the offset of ntdll_thread_data.
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: 604c4dba80ecf52671d7da9ba40e2d886a9b2c05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=604c4dba80ecf52671d7da9ba… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Apr 21 03:11:04 2015 +0800 ntdll: Correctly document the offset of ntdll_thread_data. This is a follow up of 16ddc624050a9780c16abb0421e093925bc351cf. --- dlls/ntdll/ntdll_misc.h | 2 +- tools/winebuild/relay.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 674fcbc..cbd19db 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -214,7 +214,7 @@ struct debug_info char output[1024]; /* current output line */ }; -/* thread private data, stored in NtCurrentTeb()->SystemReserved2 */ +/* thread private data, stored in NtCurrentTeb()->SpareBytes1 */ struct ntdll_thread_data { #ifdef __i386__ diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index cb4b0ca..e9228a0 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -34,7 +34,7 @@ #define STACKOFFSET 0xc0 /* FIELD_OFFSET(TEB,WOW32Reserved) */ /* fix this if the ntdll_thread_regs structure is changed */ -#define GS_OFFSET 0x1d8 /* FIELD_OFFSET(TEB,SystemReserved2) + FIELD_OFFSET(ntdll_thread_data,gs) */ +#define GS_OFFSET 0x1d8 /* FIELD_OFFSET(TEB,SpareBytes1) + FIELD_OFFSET(ntdll_thread_data,gs) */ #define DPMI_VIF_OFFSET (0x1fc + 0) /* FIELD_OFFSET(TEB,GdiTebBatch) + FIELD_OFFSET(WINE_VM86_TEB_INFO,dpmi_vif) */ #define VM86_PENDING_OFFSET (0x1fc + 4) /* FIELD_OFFSET(TEB,GdiTebBatch) + FIELD_OFFSET(WINE_VM86_TEB_INFO,vm86_pending) */

1 0

Nikolay Sivov : dwrite: Fix script position reported with SetScriptAnalysis().
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: 0c27e5cd66baa735421d3d34e70310715626f009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c27e5cd66baa735421d3d34e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 21 13:38:09 2015 +0300 dwrite: Fix script position reported with SetScriptAnalysis(). --- dlls/dwrite/analyzer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 02d90db..85681b2 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -204,7 +204,7 @@ static inline UINT16 get_char_script(WCHAR c) return script; } -static HRESULT analyze_script(const WCHAR *text, UINT32 len, IDWriteTextAnalysisSink *sink) +static HRESULT analyze_script(const WCHAR *text, UINT32 position, UINT32 len, IDWriteTextAnalysisSink *sink) { DWRITE_SCRIPT_ANALYSIS sa; UINT32 pos, i, length; @@ -213,7 +213,7 @@ static HRESULT analyze_script(const WCHAR *text, UINT32 len, IDWriteTextAnalysis sa.script = get_char_script(*text); - pos = 0; + pos = position; length = 1; for (i = 1; i < len; i++) @@ -233,7 +233,7 @@ static HRESULT analyze_script(const WCHAR *text, UINT32 len, IDWriteTextAnalysis sa.shapes = sa.script != Script_Common ? DWRITE_SCRIPT_SHAPES_DEFAULT : DWRITE_SCRIPT_SHAPES_NO_VISUAL; hr = IDWriteTextAnalysisSink_SetScriptAnalysis(sink, pos, length, &sa); if (FAILED(hr)) return hr; - pos = i; + pos = position + i; length = 1; sa.script = script; } @@ -732,7 +732,7 @@ static HRESULT WINAPI dwritetextanalyzer_AnalyzeScript(IDWriteTextAnalyzer2 *ifa if (FAILED(hr)) return hr; - hr = analyze_script(text, length, sink); + hr = analyze_script(text, position, length, sink); heap_free(buff); return hr;

1 0

Henri Verbeet : wined3d: Introduce a function to compile ARB vertex/ fragment programs.
by Alexandre Julliard April 21, 2015

April 21, 2015

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 April 21, 2015

April 21, 2015

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 April 21, 2015

April 21, 2015

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 : msi: Initialize a variable (valgrind).
by Alexandre Julliard April 21, 2015

April 21, 2015

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 April 21, 2015

April 21, 2015

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