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

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

Hans Leidekker : msi: Initialize a variable (valgrind).
by Alexandre Julliard April 21, 2015

April 21, 2015

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

Dmitry Timoshkov : server: GetQueueStatus should clear only checked queue changed bits.
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: c0e876cb9e0f0d5663eddeda0fdbf7d2b491f9a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e876cb9e0f0d5663eddeda0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 21 16:01:37 2015 +0800 server: GetQueueStatus should clear only checked queue changed bits. --- dlls/user32/input.c | 4 ++-- dlls/user32/tests/msg.c | 1 - include/wine/server_protocol.h | 4 ++-- server/protocol.def | 2 +- server/queue.c | 2 +- server/request.h | 2 +- server/trace.c | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 57594a7..4fcc531 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -434,7 +434,7 @@ DWORD WINAPI GetQueueStatus( UINT flags ) SERVER_START_REQ( get_queue_status ) { - req->clear = 1; + req->clear_bits = flags; wine_server_call( req ); ret = MAKELONG( reply->changed_bits & flags, reply->wake_bits & flags ); } @@ -454,7 +454,7 @@ BOOL WINAPI GetInputState(void) SERVER_START_REQ( get_queue_status ) { - req->clear = 0; + req->clear_bits = 0; wine_server_call( req ); ret = reply->wake_bits & (QS_KEY | QS_MOUSEBUTTON); } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 4794b12..50e1e2b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14699,7 +14699,6 @@ static void test_SendMessage_other_thread(int thread_n) } ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); -todo_wine ok(ret == MAKELONG(QS_POSTMESSAGE, QS_SENDMESSAGE|QS_POSTMESSAGE), "wrong status %08x\n", ret); trace("main: call GetMessage\n"); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d27914a..37dad95 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2822,7 +2822,7 @@ struct set_queue_mask_reply struct get_queue_status_request { struct request_header __header; - int clear; + unsigned int clear_bits; }; struct get_queue_status_reply { @@ -5972,6 +5972,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 467 +#define SERVER_PROTOCOL_VERSION 468 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 54501e8..5d57f96 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2059,7 +2059,7 @@ enum char_info_mode /* Get the current message queue status */ @REQ(get_queue_status) - int clear; /* should we clear the change bits? */ + unsigned int clear_bits; /* should we clear the change bits? */ @REPLY unsigned int wake_bits; /* wake bits */ unsigned int changed_bits; /* changed bits since last time */ diff --git a/server/queue.c b/server/queue.c index 3a321cd..912df3a 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2198,7 +2198,7 @@ DECL_HANDLER(get_queue_status) { reply->wake_bits = queue->wake_bits; reply->changed_bits = queue->changed_bits; - if (req->clear) queue->changed_bits = 0; + queue->changed_bits &= ~req->clear_bits; } else reply->wake_bits = reply->changed_bits = 0; } diff --git a/server/request.h b/server/request.h index f94235f..daa5301 100644 --- a/server/request.h +++ b/server/request.h @@ -1416,7 +1416,7 @@ C_ASSERT( sizeof(struct set_queue_mask_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_queue_mask_reply, wake_bits) == 8 ); C_ASSERT( FIELD_OFFSET(struct set_queue_mask_reply, changed_bits) == 12 ); C_ASSERT( sizeof(struct set_queue_mask_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_queue_status_request, clear) == 12 ); +C_ASSERT( FIELD_OFFSET(struct get_queue_status_request, clear_bits) == 12 ); C_ASSERT( sizeof(struct get_queue_status_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_queue_status_reply, wake_bits) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_queue_status_reply, changed_bits) == 12 ); diff --git a/server/trace.c b/server/trace.c index 20895b1..6ac0549 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2546,7 +2546,7 @@ static void dump_set_queue_mask_reply( const struct set_queue_mask_reply *req ) static void dump_get_queue_status_request( const struct get_queue_status_request *req ) { - fprintf( stderr, " clear=%d", req->clear ); + fprintf( stderr, " clear_bits=%08x", req->clear_bits ); } static void dump_get_queue_status_reply( const struct get_queue_status_reply *req )

1 0

Nikolay Sivov : wshom.ocx: Fix BSTR allocation for string registry values (Valgrind).
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: a8150b53b67b30cf87c4c401c66aade9af751ddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8150b53b67b30cf87c4c401c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 20 15:53:32 2015 +0300 wshom.ocx: Fix BSTR allocation for string registry values (Valgrind). --- dlls/wshom.ocx/shell.c | 2 +- dlls/wshom.ocx/tests/wshom.c | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 826e290..f9ec9dc 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -1376,7 +1376,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v case REG_SZ: case REG_EXPAND_SZ: V_VT(value) = VT_BSTR; - V_BSTR(value) = SysAllocStringLen((WCHAR*)data, datalen - sizeof(WCHAR)); + V_BSTR(value) = SysAllocString((WCHAR*)data); if (!V_BSTR(value)) hr = E_OUTOFMEMORY; break; diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 9591c5c..46ffc58 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -276,7 +276,7 @@ static void test_registry(void) { static const WCHAR keypathW[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R','\\', 'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','T','e','s','t','\\',0}; - + static const WCHAR regsz2W[] = {'r','e','g','s','z','2',0}; static const WCHAR regszW[] = {'r','e','g','s','z',0}; static const WCHAR regdwordW[] = {'r','e','g','d','w','o','r','d',0}; static const WCHAR regbinaryW[] = {'r','e','g','b','i','n','a','r','y',0}; @@ -332,6 +332,9 @@ static void test_registry(void) ret = RegSetValueExA(root, "regsz", 0, REG_SZ, (const BYTE*)"foobar", 7); ok(ret == 0, "got %d\n", ret); + ret = RegSetValueExA(root, "regsz2", 0, REG_SZ, (const BYTE*)"foobar\0f", 9); + ok(ret == 0, "got %d\n", ret); + ret = RegSetValueExA(root, "regmultisz", 0, REG_MULTI_SZ, (const BYTE*)"foo\0bar\0", 9); ok(ret == 0, "got %d\n", ret); @@ -355,6 +358,18 @@ static void test_registry(void) VariantClear(&value); SysFreeString(name); + /* REG_SZ with embedded NULL */ + lstrcpyW(pathW, keypathW); + lstrcatW(pathW, regsz2W); + name = SysAllocString(pathW); + VariantInit(&value); + hr = IWshShell3_RegRead(sh3, name, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); + ok(SysStringLen(V_BSTR(&value)) == 6, "len %d\n", SysStringLen(V_BSTR(&value))); + VariantClear(&value); + SysFreeString(name); + /* REG_DWORD */ lstrcpyW(pathW, keypathW); lstrcatW(pathW, regdwordW);

1 0

Henri Verbeet : wined3d: Slightly simplify get_info_log_line().
by Alexandre Julliard April 21, 2015

April 21, 2015

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

Hans Leidekker : iexplore: Update version to 9.0.8112.16421.
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: ae84730e3429fc156f6729444e4b3fef22cd6a11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae84730e3429fc156f6729444… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 21 11:19:20 2015 +0200 iexplore: Update version to 9.0.8112.16421. --- programs/iexplore/iexplore.inf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/iexplore/iexplore.inf b/programs/iexplore/iexplore.inf index a45df9f..41622b1 100644 --- a/programs/iexplore/iexplore.inf +++ b/programs/iexplore/iexplore.inf @@ -33,9 +33,9 @@ HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe","Path",, [IE.Reg] -HKLM,"Software\Microsoft\Internet Explorer","Build",,"86001" -HKLM,"Software\Microsoft\Internet Explorer","Version",,"8.0.6001.18702" -HKLM,"Software\Microsoft\Internet Explorer","W2kVersion",,"8.0.6001.18702" +HKLM,"Software\Microsoft\Internet Explorer","Build",,"98112" +HKLM,"Software\Microsoft\Internet Explorer","Version",,"9.0.8112.16421" +HKLM,"Software\Microsoft\Internet Explorer","W2kVersion",,"9.0.8112.16421" [Strings]

1 0

Michael Stefaniuc : rpcrt4: Don't open code CONTAINING_RECORD().
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: 0a8427dc156a6e97f83886e108f48993e8df33cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a8427dc156a6e97f83886e10… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 21 10:22:04 2015 +0200 rpcrt4: Don't open code CONTAINING_RECORD(). --- dlls/rpcrt4/cstub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 0ddb1aa..838ed03 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -59,7 +59,7 @@ typedef struct static inline cstdstubbuffer_delegating_t *impl_from_delegating( IRpcStubBuffer *iface ) { - return (cstdstubbuffer_delegating_t*)((char *)iface - FIELD_OFFSET(cstdstubbuffer_delegating_t, stub_buffer)); + return CONTAINING_RECORD(iface, cstdstubbuffer_delegating_t, stub_buffer); } HRESULT CStdStubBuffer_Construct(REFIID riid,

1 0

Dmitry Timoshkov : user32/tests: Add PeekMessage(PM_NOREMOVE) call to inter-thread messages test.
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: d31e8a311871ba98f22b2a33b2fb7bdbba9cc2eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d31e8a311871ba98f22b2a33b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 21 16:01:30 2015 +0800 user32/tests: Add PeekMessage(PM_NOREMOVE) call to inter-thread messages test. --- dlls/user32/tests/msg.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b014dd9..4794b12 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14609,6 +14609,9 @@ static const struct message send_message_2[] = { }; static const struct message send_message_3[] = { { WM_USER+3, sent|wparam|lparam, 0, 0 }, + { 0 } +}; +static const struct message send_message_4[] = { { WM_USER+1, sent|wparam|lparam, 0, 0 }, { 0 } }; @@ -14716,10 +14719,15 @@ todo_wine ok(ret == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE|QS_POSTMESSAGE), "wrong status %08x\n", ret); trace("main: call PeekMessage\n"); + ok(PeekMessageA(&msg, 0, 0, 0, PM_NOREMOVE), "PeekMessage should not fail\n"); + ok(msg.message == WM_USER+1, "expected WM_USER+1, got %04x\n", msg.message); + ok_sequence(send_message_3, "SendMessage from other thread 3", thread_n == 2); + + trace("main: call PeekMessage\n"); ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should not fail\n"); ok(msg.message == WM_USER+1, "expected WM_USER+1, got %04x\n", msg.message); DispatchMessageA(&msg); - ok_sequence(send_message_3, "SendMessage from other thread 3", thread_n == 2); + ok_sequence(send_message_4, "SendMessage from other thread 4", FALSE); /* intentionally yield */ MsgWaitForMultipleObjects(0, NULL, FALSE, 100, qs_all_input); @@ -14733,7 +14741,7 @@ else trace("main: call PeekMessage\n"); ok(!PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should fail\n"); - ok_sequence(WmEmptySeq, "SendMessage from other thread 4", thread_n == 2); + ok_sequence(WmEmptySeq, "SendMessage from other thread 5", thread_n == 2); ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); ok(ret == 0, "wrong status %08x\n", ret);

1 0

Andrey Gusev : Ukrainian translation for release 1.7.41
by Jeremy Newman April 20, 2015

April 20, 2015

Module: website Branch: master Commit: fa15d9870746621e9a3ee3bff46a07f34f39c77e URL: http://source.winehq.org/git/website.git/?a=commit;h=fa15d9870746621e9a3ee3… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Apr 17 18:11:21 2015 +0300 Ukrainian translation for release 1.7.41 --- news/uk/2015041701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/uk/2015041701.xml b/news/uk/2015041701.xml new file mode 100644 index 0000000..924f375 --- /dev/null +++ b/news/uk/2015041701.xml @@ -0,0 +1,16 @@ +<news> +<date>17 квітня 2015</date> +<title>Випущено Wine 1.7.41</title> +<body> + Розробницький реліз Wine 1.7.41 наразі доступний. + <a href="{$root}/announce/1.7.41">Що нового</a> в цьому релізі: +<ul> + <li>Більша підтримка Known Folders у Shell.</li> + <li>Більша підтримка для Kernel Job Objects.</li> + <li>Більше вдосконалень для підтримки патчів для MSI.</li> + <li>Деякі виправлення оформлення.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.41.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Huw Davies : rpcrt4/tests: Avoid a double-free.
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: b24ce98af36431d1b7715db4090d903b82d095c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b24ce98af36431d1b7715db40… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 20 09:57:29 2015 +0100 rpcrt4/tests: Avoid a double-free. Commit 4cf70b1418260fda95d69bcb50374a64f1ce895b was causing the tests to crash. The reason is due to a Wine bug in NdrPointerUnmarshall(). Windows returns the same pointer (which is later released in a call to NdrPointerFree()), while Wine makes a copy which Valgrind correctly spots is leaked. --- dlls/rpcrt4/tests/ndr_marshall.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 917c9e5..411ba8b 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1560,6 +1560,11 @@ todo_wine { ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); } + /* Prevent a memory leak when running with Wine. + Remove once the todo_wine block above is fixed. */ + if (mem != mem_orig) + HeapFree(GetProcessHeap(), 0, mem_orig); + my_free_called = 0; StubMsg.Buffer = StubMsg.BufferStart; NdrPointerFree( &StubMsg, mem, fmtstr_conf_str ); @@ -1590,7 +1595,6 @@ todo_wine { "mem not pointing at buffer %p/%p\n", mem, StubMsg.BufferStart + 12 ); ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); } - HeapFree(GetProcessHeap(), 0, mem_orig); my_alloc_called = 0; mem = mem_orig = HeapAlloc(GetProcessHeap(), 0, sizeof(memsrc));

1 0

Huw Davies : dssenh/tests: Fix some tests on Win 8.
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: ad9910bdfbb2294dccf89520647ce1407e698750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad9910bdfbb2294dccf895206… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 20 08:56:39 2015 +0100 dssenh/tests: Fix some tests on Win 8. --- dlls/dssenh/tests/dssenh.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 8b83586..feb9a30 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -20,6 +20,8 @@ #include <string.h> #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "wine/test.h" #include "windef.h" #include "winbase.h" @@ -186,6 +188,7 @@ struct keylength_test { DWORD expectedError; BOOL brokenResult; DWORD brokenError; + DWORD altError; }; static const struct keylength_test baseDSS_keylength[] = { @@ -197,7 +200,7 @@ static const struct keylength_test baseDSS_keylength[] = { /* min 512 max 1024 increment by 64 */ {AT_SIGNATURE, 448 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 512 << 16, TRUE}, - {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ {AT_SIGNATURE, 768 << 16, TRUE}, {AT_SIGNATURE, 1024 << 16, TRUE}, {AT_SIGNATURE, 1088 << 16, FALSE, NTE_BAD_FLAGS}, @@ -214,7 +217,7 @@ static const struct keylength_test baseDSS_keylength[] = { /* min 512 max 1024, increment by 64 */ {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 512 << 16, TRUE}, - {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ {CALG_DSS_SIGN, 768 << 16, TRUE}, {CALG_DSS_SIGN, 1024 << 16, TRUE}, {CALG_DSS_SIGN, 1088 << 16, FALSE, NTE_BAD_FLAGS} @@ -230,7 +233,7 @@ static const struct keylength_test dssDH_keylength[] = { {AT_KEYEXCHANGE, 1088 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 448 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 512 << 16, TRUE}, - {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ {AT_SIGNATURE, 768 << 16, TRUE}, {AT_SIGNATURE, 1024 << 16, TRUE}, {AT_SIGNATURE, 1088 << 16, FALSE, NTE_BAD_FLAGS}, @@ -248,7 +251,7 @@ static const struct keylength_test dssDH_keylength[] = { {CALG_DH_SF, 1088 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 512 << 16, TRUE}, - {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ {CALG_DSS_SIGN, 768 << 16, TRUE}, {CALG_DSS_SIGN, 1024 << 16, TRUE}, {CALG_DSS_SIGN, 1088 << 16, FALSE, NTE_BAD_FLAGS} @@ -269,7 +272,7 @@ static const struct keylength_test dssENH_keylength[] = { {AT_KEYEXCHANGE, 4160 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 448 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 512 << 16, TRUE}, - {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ {AT_SIGNATURE, 768 << 16, TRUE}, {AT_SIGNATURE, 1024 << 16, TRUE}, {AT_SIGNATURE, 1032 << 16, FALSE, NTE_BAD_FLAGS}, @@ -287,7 +290,7 @@ static const struct keylength_test dssENH_keylength[] = { {CALG_DH_SF, 1032 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 512 << 16, TRUE}, - {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ {CALG_DSS_SIGN, 768 << 16, TRUE}, {CALG_DSS_SIGN, 1024 << 16, TRUE}, {CALG_DSS_SIGN, 1088 << 16, FALSE, NTE_BAD_FLAGS} @@ -307,7 +310,7 @@ static void test_keylength_array(HCRYPTPROV hProv,const struct keylength_test *t /* success */ if(tests[i].expectedResult) { - ok(result, "Expected a key, got %08x\n", GetLastError()); + ok(result, "%d: Expected a key, got %08x\n", i, GetLastError()); result = CryptDestroyKey(key); ok(result, "Expected no errors.\n"); } @@ -315,19 +318,21 @@ static void test_keylength_array(HCRYPTPROV hProv,const struct keylength_test *t { /* error but success on older system */ if(tests[i].brokenResult) ok((!result && GetLastError() == tests[i].expectedError) || - broken(result), "Expected a key, got %x.\n", GetLastError()); + broken(result), "%d: Didn't really expect a key, got %x, %d\n", + i, GetLastError(), result); else { /* error */ if(!tests[i].brokenError) ok(!result && GetLastError() == tests[i].expectedError, - "Expected a key, got %x.\n", GetLastError()); + "%d: Expected an error, got %x, %d.\n", i, GetLastError(), result); /* error but different error on older system */ else ok(!result && (GetLastError() == tests[i].expectedError || - broken(GetLastError() == tests[i].brokenError)), - "Expected a key, got %x.\n", GetLastError()); + GetLastError() == tests[i].altError || + broken(GetLastError() == tests[i].brokenError) ), + "%d: Expected an error, got %x, %d.\n", i, GetLastError(), result); } } }

1 0

Marcus Meissner : ntdll: Potential buffer overwrite (Coverity).
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: 33d4125a8f471ab52455051479609cbb6da9ca0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d4125a8f471ab5245505147… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Apr 19 11:59:22 2015 +0200 ntdll: Potential buffer overwrite (Coverity). --- dlls/ntdll/cdrom.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 34910e7..25a3fde 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -3090,8 +3090,11 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hDevice, sz = sizeof(DVD_REGION); if (lpInBuffer != NULL || nInBufferSize != 0) status = STATUS_INVALID_PARAMETER; else if (nOutBufferSize < sz) status = STATUS_BUFFER_TOO_SMALL; - TRACE("doing DVD_Get_REGION\n"); - status = DVD_GetRegion(fd, lpOutBuffer); + else + { + TRACE("doing DVD_Get_REGION\n"); + status = DVD_GetRegion(fd, lpOutBuffer); + } break; case IOCTL_DVD_READ_STRUCTURE: sz = sizeof(DVD_LAYER_DESCRIPTOR);

1 0

Huw Davies : comctl32: Invalidate the toolbar if the button size is changed.
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: 60e305d983be66f923ffd793e7635d460e5d87fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=60e305d983be66f923ffd793e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 17 13:24:18 2015 +0100 comctl32: Invalidate the toolbar if the button size is changed. --- dlls/comctl32/toolbar.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 7727ee2..83cb674 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4364,6 +4364,7 @@ static LRESULT TOOLBAR_SetButtonSize (TOOLBAR_INFO *infoPtr, LPARAM lParam) { INT cx = (short)LOWORD(lParam), cy = (short)HIWORD(lParam); + int top = default_top_margin(infoPtr); if ((cx < 0) || (cy < 0)) { @@ -4386,15 +4387,20 @@ TOOLBAR_SetButtonSize (TOOLBAR_INFO *infoPtr, LPARAM lParam) */ if (cx == 0) cx = 24; if (cy == 0) cy = 22; - + cx = max(cx, infoPtr->szPadding.cx + infoPtr->nBitmapWidth); cy = max(cy, infoPtr->szPadding.cy + infoPtr->nBitmapHeight); - infoPtr->nButtonWidth = cx; - infoPtr->nButtonHeight = cy; - - infoPtr->iTopMargin = default_top_margin(infoPtr); - TOOLBAR_LayoutToolbar(infoPtr); + if (cx != infoPtr->nButtonWidth || cy != infoPtr->nButtonHeight || + top != infoPtr->iTopMargin) + { + infoPtr->nButtonWidth = cx; + infoPtr->nButtonHeight = cy; + infoPtr->iTopMargin = top; + + TOOLBAR_LayoutToolbar( infoPtr ); + InvalidateRect( infoPtr->hwndSelf, NULL, TRUE ); + } return TRUE; }

1 0

Huw Davies : comctl32: TBSTYLE_EX_MIXEDBUTTONS doesn' t mean buttons should be auto-sized.
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: 5b7b911f0691a866e8639e54a3646b826d9197bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b7b911f0691a866e8639e54a… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 17 13:24:17 2015 +0100 comctl32: TBSTYLE_EX_MIXEDBUTTONS doesn't mean buttons should be auto-sized. --- dlls/comctl32/tests/toolbar.c | 52 ++++++++++++++++++++++++++++++++++++++++++- dlls/comctl32/toolbar.c | 3 +-- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index cdfe7dd..d3088f9 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -748,7 +748,7 @@ static void tbsize_addbutton(tbsize_result_t *tbsr, int left, int top, int right static tbsize_result_t *tbsize_results; -#define tbsize_results_num 24 +#define tbsize_results_num 28 static void init_tbsize_results(void) { int fontheight = system_font_height(); @@ -991,6 +991,18 @@ static void init_tbsize_results(void) { tbsize_results[23] = init_tbsize_result(2, 0, 0, 672, 42, 67, 41); tbsize_addbutton(&tbsize_results[23], 0, 2, 672, 25 + fontheight); tbsize_addbutton(&tbsize_results[23], 0, 25 + fontheight, 672, 48 + 2*fontheight); + + tbsize_results[24] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); + tbsize_addbutton(&tbsize_results[24], 0, 2, 11 + string_width(STRING2), 24); + + tbsize_results[25] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); + tbsize_addbutton(&tbsize_results[25], 0, 2, 40, 24); + + tbsize_results[26] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); + tbsize_addbutton(&tbsize_results[26], 0, 2, 40, 24); + + tbsize_results[27] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); + tbsize_addbutton(&tbsize_results[27], 0, 2, 40, 24); } static void free_tbsize_results(void) { @@ -1062,6 +1074,11 @@ static TBBUTTON buttons3[] = { {0, 32, TBSTATE_ENABLED, BTNS_AUTOSIZE, {0, }, 0, 1}, {0, 33, TBSTATE_ENABLED, BTNS_AUTOSIZE, {0, }, 0, (UINT_PTR)STRING2} }; +static TBBUTTON buttons4[] = { + {0, 40, TBSTATE_ENABLED, BTNS_AUTOSIZE, {0, }, 0, (UINT_PTR)STRING2}, + {0, 41, TBSTATE_ENABLED, 0, {0, }, 0, (UINT_PTR)STRING2}, + {0, 41, TBSTATE_ENABLED, BTNS_SHOWTEXT, {0, }, 0, (UINT_PTR)STRING2} +}; static void test_sizes(void) { @@ -1300,8 +1317,41 @@ static void test_sizes(void) { tbinfo.dwMask = TBIF_SIZE; ok(SendMessageA(hToolbar, TB_SETBUTTONINFOA, 33, (LPARAM)&tbinfo) != 0, "TB_SETBUTTONINFOA failed\n"); + tbsize_numtests++; } + /* Single BTNS_AUTOSIZE button with string. */ + rebuild_toolbar(&hToolbar); + ok(SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons4[0]) == 1, "TB_ADDBUTTONSA failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(40, 20)) == 1, "TB_SETBUTTONSIZE failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); + check_sizes(); + + /* Single non-BTNS_AUTOSIZE button with string. */ + rebuild_toolbar(&hToolbar); + ok(SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons4[1]) == 1, "TB_ADDBUTTONSA failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(40, 20)) == 1, "TB_SETBUTTONSIZE failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); + check_sizes(); + + /* Single non-BTNS_AUTOSIZE button with string with TBSTYLE_EX_MIXEDBUTTONS set. */ + rebuild_toolbar(&hToolbar); + SendMessageA(hToolbar, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_MIXEDBUTTONS); + style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0); + ok(SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons4[1]) == 1, "TB_ADDBUTTONSA failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(40, 20)) == 1, "TB_SETBUTTONSIZE failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); + check_sizes(); + + /* Single non-BTNS_AUTOSIZE, BTNS_SHOWTEXT button with string with TBSTYLE_EX_MIXEDBUTTONS set. */ + rebuild_toolbar(&hToolbar); + SendMessageA(hToolbar, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_MIXEDBUTTONS); + style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0); + ok(SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons4[2]) == 1, "TB_ADDBUTTONSA failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(40, 20)) == 1, "TB_SETBUTTONSIZE failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); + check_sizes(); + free_tbsize_results(); DestroyWindow(hToolbar); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index a329c26..7727ee2 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1689,8 +1689,7 @@ TOOLBAR_LayoutToolbar(TOOLBAR_INFO *infoPtr) { if (btnPtr->cx) cx = btnPtr->cx; - else if ((infoPtr->dwExStyle & TBSTYLE_EX_MIXEDBUTTONS) || - (btnPtr->fsStyle & BTNS_AUTOSIZE)) + else if (btnPtr->fsStyle & BTNS_AUTOSIZE) { SIZE sz; HDC hdc;

1 0

Nikolay Sivov : dxdiagn/tests: Fix a couple of leaks (Valgrind).
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: 2c59f6fe464f416b617d8b6c48f03285e9b45740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c59f6fe464f416b617d8b6c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 20 14:58:07 2015 +0300 dxdiagn/tests: Fix a couple of leaks (Valgrind). --- dlls/dxdiagn/tests/container.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index ce0fb77..5bc5161 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -701,6 +701,7 @@ static void test_GetProp(void) IDxDiagContainer_AddRef(child); ref = IDxDiagContainer_Release(child); ok(ref == 2, "Expected reference count to be 2, got %u\n", ref); + IDxDiagContainer_Release(child); IDxDiagContainer_Release(child); cleanup: @@ -1010,6 +1011,7 @@ static void test_DxDiag_DisplayDevices(void) trace("Testing container %s\n", wine_dbgstr_w(child_container)); test_container_properties(child, property_tests, sizeof(property_tests)/sizeof(property_tests[0])); } + IDxDiagContainer_Release(child); } cleanup:

1 0

Dmitry Timoshkov : user32/tests: Add a test for sending inter-thread messages.
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: 4ae80d15d957d627529a912e9cd9b7dd1ea1daea URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae80d15d957d627529a912e9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 20 18:54:06 2015 +0800 user32/tests: Add a test for sending inter-thread messages. --- dlls/user32/tests/msg.c | 150 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 150 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 5f10a89..b014dd9 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14598,6 +14598,153 @@ static void test_TrackPopupMenuEmpty(void) DestroyWindow(hwnd); } +static const struct message send_message_1[] = { + { WM_USER+2, sent|wparam|lparam, 0, 0 }, + { WM_USER, sent|wparam|lparam, 0, 0 }, + { 0 } +}; +static const struct message send_message_2[] = { + { WM_USER+4, sent|wparam|lparam, 0, 0 }, + { 0 } +}; +static const struct message send_message_3[] = { + { WM_USER+3, sent|wparam|lparam, 0, 0 }, + { WM_USER+1, sent|wparam|lparam, 0, 0 }, + { 0 } +}; + +static DWORD WINAPI SendMessage_thread_1(void *param) +{ + struct wnd_event *wnd_event = param; + + trace("thread: starting\n"); + WaitForSingleObject(wnd_event->start_event, INFINITE); + + trace("thread: call PostMessage\n"); + PostMessageA(wnd_event->hwnd, WM_USER, 0, 0); + + trace("thread: call PostMessage\n"); + PostMessageA(wnd_event->hwnd, WM_USER+1, 0, 0); + + trace("thread: call SendMessage\n"); + SendMessageA(wnd_event->hwnd, WM_USER+2, 0, 0); + + trace("thread: call SendMessage\n"); + SendMessageA(wnd_event->hwnd, WM_USER+3, 0, 0); + + return 0; +} + +static DWORD WINAPI SendMessage_thread_2(void *param) +{ + struct wnd_event *wnd_event = param; + + trace("thread: starting\n"); + WaitForSingleObject(wnd_event->start_event, INFINITE); + + trace("thread: call PostMessage\n"); + PostMessageA(wnd_event->hwnd, WM_USER, 0, 0); + + trace("thread: call PostMessage\n"); + PostMessageA(wnd_event->hwnd, WM_USER+1, 0, 0); + + /* this leads to sending an internal message under Wine */ + trace("thread: call EnableWindow\n"); + EnableWindow(wnd_event->hwnd, TRUE); + + trace("thread: call SendMessage\n"); + SendMessageA(wnd_event->hwnd, WM_USER+2, 0, 0); + + trace("thread: call SendMessage\n"); + SendMessageA(wnd_event->hwnd, WM_USER+3, 0, 0); + + return 0; +} + +static void test_SendMessage_other_thread(int thread_n) +{ + DWORD qs_all_input = QS_ALLINPUT & ~QS_RAWINPUT; + HANDLE hthread; + struct wnd_event wnd_event; + DWORD tid, ret; + MSG msg; + + wnd_event.start_event = CreateEventA(NULL, 0, 0, NULL); + + wnd_event.hwnd = CreateWindowExA(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(wnd_event.hwnd != 0, "CreateWindowEx failed\n"); + + hthread = CreateThread(NULL, 0, thread_n == 1 ? SendMessage_thread_1 : SendMessage_thread_2, &wnd_event, 0, &tid); + ok(hthread != NULL, "CreateThread failed, error %d\n", GetLastError()); + CloseHandle(hthread); + + flush_events(); + flush_sequence(); + + ret = GetQueueStatus(QS_SENDMESSAGE); + ok(ret == 0, "wrong status %08x\n", ret); + + SetEvent(wnd_event.start_event); + + /* wait for other thread's SendMessage */ + for (;;) + { + ret = GetQueueStatus(QS_SENDMESSAGE); + if (ret == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE)) break; + Sleep(50); + } + + ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); +todo_wine + ok(ret == MAKELONG(QS_POSTMESSAGE, QS_SENDMESSAGE|QS_POSTMESSAGE), "wrong status %08x\n", ret); + + trace("main: call GetMessage\n"); + GetMessageA(&msg, 0, 0, 0); + ok(msg.message == WM_USER, "expected WM_USER, got %04x\n", msg.message); + DispatchMessageA(&msg); + ok_sequence(send_message_1, "SendMessage from other thread 1", thread_n == 2); + + /* intentionally yield */ + MsgWaitForMultipleObjects(0, NULL, FALSE, 100, qs_all_input); + + trace("main: call SendMessage\n"); + SendMessageA(wnd_event.hwnd, WM_USER+4, 0, 0); + ok_sequence(send_message_2, "SendMessage from other thread 2", FALSE); + + ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); + ok(ret == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE|QS_POSTMESSAGE), "wrong status %08x\n", ret); + + trace("main: call PeekMessage\n"); + ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should not fail\n"); + ok(msg.message == WM_USER+1, "expected WM_USER+1, got %04x\n", msg.message); + DispatchMessageA(&msg); + ok_sequence(send_message_3, "SendMessage from other thread 3", thread_n == 2); + + /* intentionally yield */ + MsgWaitForMultipleObjects(0, NULL, FALSE, 100, qs_all_input); + + ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); + /* FIXME: remove once Wine is fixed */ +if (thread_n == 2) todo_wine + ok(ret == 0, "wrong status %08x\n", ret); +else + ok(ret == 0, "wrong status %08x\n", ret); + + trace("main: call PeekMessage\n"); + ok(!PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should fail\n"); + ok_sequence(WmEmptySeq, "SendMessage from other thread 4", thread_n == 2); + + ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); + ok(ret == 0, "wrong status %08x\n", ret); + + trace("main: call DestroyWindow\n"); + DestroyWindow(msg.hwnd); + + flush_events(); + flush_sequence(); +} + static void init_funcs(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); @@ -14675,6 +14822,9 @@ START_TEST(msg) pUnhookWinEvent = 0; } hEvent_hook = 0; + + test_SendMessage_other_thread(1); + test_SendMessage_other_thread(2); test_SetFocus(); test_SetParent(); test_PostMessage();

1 0

Marcus Meissner : inetcomm: Avoid overlapping memcpy (Coverity).
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: a57b06c5acac1bed5a4aa632ab939ca5a1cd028d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a57b06c5acac1bed5a4aa632a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Apr 19 11:50:42 2015 +0200 inetcomm: Avoid overlapping memcpy (Coverity). --- dlls/inetcomm/mimeole.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 6a6cbd8..94fb558 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1613,13 +1613,13 @@ static HRESULT create_body_offset_list(IStream *stm, const char *boundary, struc if(overlap == buf) /* 1st iteration */ { - memcpy(buf, buf + PARSER_BUF_SIZE - overlap_no, overlap_no); + memmove(buf, buf + PARSER_BUF_SIZE - overlap_no, overlap_no); overlap = buf + overlap_no; start += read - overlap_no; } else { - memcpy(buf, buf + PARSER_BUF_SIZE, overlap_no); + memmove(buf, buf + PARSER_BUF_SIZE, overlap_no); start += read; } } while(1);

1 0

Sebastian Lackner : msxml3: Add a missing break (Coverity).
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: 45e00e55161fb4bb33222592523878c399b833d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45e00e55161fb4bb332225925… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Apr 18 23:31:02 2015 +0200 msxml3: Add a missing break (Coverity). --- dlls/msxml3/node.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 7119a43..1ddc9bf 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -2055,6 +2055,7 @@ IXMLDOMNode *create_node( xmlNodePtr node ) new_node->ref = 1; init_xmlnode(&new_node->node, node, &new_node->IXMLDOMNode_iface, NULL); pUnk = (IUnknown*)&new_node->IXMLDOMNode_iface; + break; } default: ERR("Called for unsupported node type %d\n", node->type);

1 0

Thomas Faber : comctl32: Avoid use-after-free in DPA_Merge (DPH).
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: 13b65faf4e758439afc5139098b4231407c5bb0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=13b65faf4e758439afc513909… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Apr 18 12:08:29 2015 +0200 comctl32: Avoid use-after-free in DPA_Merge (DPH). --- dlls/comctl32/dpa.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index 148d3f1..b5b7ff8 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -303,16 +303,14 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, hdpa1->nItemCount, hdpa2->nItemCount); - /* working but untrusted implementation */ - - pWork1 = &(hdpa1->ptrs[hdpa1->nItemCount - 1]); - pWork2 = &(hdpa2->ptrs[hdpa2->nItemCount - 1]); - nIndex = hdpa1->nItemCount - 1; nCount = hdpa2->nItemCount - 1; do { + pWork1 = &hdpa1->ptrs[nIndex]; + pWork2 = &hdpa2->ptrs[nCount]; + if (nIndex < 0) { if ((nCount >= 0) && (dwFlags & DPAM_UNION)) { /* Now insert the remaining new items into DPA 1 */ @@ -343,10 +341,8 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, return FALSE; nCount--; - pWork2--; *pWork1 = ptr; nIndex--; - pWork1--; } else if (nResult > 0) { @@ -361,7 +357,6 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, (pfnMerge)(DPAMM_DELETE, ptr, NULL, lParam); } nIndex--; - pWork1--; } else { @@ -377,7 +372,6 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, DPA_InsertPtr (hdpa1, nIndex+1, ptr); } nCount--; - pWork2--; } }

1 0

Jacek Caban : mshtml: Fixed binding event scripts to window objects.
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: 7c85ed6aabf2ea5ca021d3cefce80541a12f2247 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c85ed6aabf2ea5ca021d3cef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 17 16:35:24 2015 +0200 mshtml: Fixed binding event scripts to window objects. --- dlls/mshtml/htmlevent.c | 7 ++++--- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/script.c | 32 ++++++++++++++++++-------------- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index a14ce72..30ce6b1 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1529,11 +1529,12 @@ HRESULT detach_event(event_target_t *event_target, HTMLDocument *doc, BSTR name, return S_OK; } -void bind_node_event(HTMLDocumentNode *doc, event_target_t **event_target, HTMLDOMNode *node, const WCHAR *event, IDispatch *disp) +void bind_target_event(HTMLDocumentNode *doc, event_target_t **event_target, DispatchEx *dispex, + const WCHAR *event, IDispatch *disp) { eventid_t eid; - TRACE("(%p %p %p %s %p)\n", doc, event_target, node, debugstr_w(event), disp); + TRACE("(%p %p %p %s %p)\n", doc, event_target, dispex, debugstr_w(event), disp); eid = attr_to_eid(event); if(eid == EVENTID_LAST) { @@ -1541,7 +1542,7 @@ void bind_node_event(HTMLDocumentNode *doc, event_target_t **event_target, HTMLD return; } - set_event_handler_disp(&node->dispex, event_target, doc, eid, disp); + set_event_handler_disp(dispex, event_target, doc, eid, disp); } void update_cp_events(HTMLInnerWindow *window, event_target_t **event_target_ptr, cp_static_data_t *cp) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 0517834..86d5816 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -64,7 +64,7 @@ void update_cp_events(HTMLInnerWindow*,event_target_t**,cp_static_data_t*) DECLS HRESULT doc_init_events(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_events(HTMLDocumentNode *doc) DECLSPEC_HIDDEN; HRESULT create_event_obj(IHTMLEventObj**) DECLSPEC_HIDDEN; -void bind_node_event(HTMLDocumentNode*,event_target_t**,HTMLDOMNode*,const WCHAR*,IDispatch*) DECLSPEC_HIDDEN; +void bind_target_event(HTMLDocumentNode*,event_target_t**,DispatchEx*,const WCHAR*,IDispatch*) DECLSPEC_HIDDEN; void init_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; void release_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 4590854..e3c9498 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1314,9 +1314,9 @@ IDispatch *get_script_disp(ScriptHost *script_host) return disp; } -static event_target_t **find_event_target(HTMLDocumentNode *doc, HTMLScriptElement *script_elem, HTMLDOMNode **ret_target_node) +static event_target_t **find_event_target(HTMLDocumentNode *doc, HTMLScriptElement *script_elem, DispatchEx **ret_target_dispex) { - HTMLDOMNode *target_node = NULL; + DispatchEx *target_dispex = NULL; event_target_t **target = NULL; const PRUnichar *target_id; nsAString target_id_str; @@ -1336,22 +1336,26 @@ static event_target_t **find_event_target(HTMLDocumentNode *doc, HTMLScriptEleme FIXME("Empty for attribute\n"); }else if(!strcmpW(target_id, documentW)) { target = &doc->node.event_target; - target_node = &doc->node; - IHTMLDOMNode_AddRef(&target_node->IHTMLDOMNode_iface); + target_dispex = &doc->node.dispex; + htmldoc_addref(&doc->basedoc); }else if(!strcmpW(target_id, windowW)) { - target = &doc->body_event_target; + if(doc->window) { + target_dispex = &doc->window->dispex; + IDispatchEx_AddRef(&target_dispex->IDispatchEx_iface); + target = &doc->body_event_target; + } }else { HTMLElement *target_elem; hres = get_doc_elem_by_id(doc, target_id, &target_elem); if(SUCCEEDED(hres) && target_elem) { - target_node = &target_elem->node; + target_dispex = &target_elem->node.dispex; target = &target_elem->node.event_target; } } nsAString_Finish(&target_id_str); - *ret_target_node = target_node; + *ret_target_dispex = target_dispex; return target; } @@ -1449,7 +1453,7 @@ void bind_event_scripts(HTMLDocumentNode *doc) HTMLScriptElement *script_elem; event_target_t **event_target; nsIDOMNodeList *node_list; - HTMLDOMNode *target_node; + DispatchEx *target_dispex; nsIDOMNode *script_node; nsAString selector_str; IDispatch *event_disp; @@ -1496,10 +1500,10 @@ void bind_event_scripts(HTMLDocumentNode *doc) event_disp = parse_event_elem(doc, script_elem, &event); if(event_disp) { - event_target = find_event_target(doc, script_elem, &target_node); + event_target = find_event_target(doc, script_elem, &target_dispex); if(event_target) { - if(target_node) - hres = IHTMLDOMNode_QueryInterface(&target_node->IHTMLDOMNode_iface, &IID_HTMLPluginContainer, + if(target_dispex) + hres = IDispatchEx_QueryInterface(&target_dispex->IDispatchEx_iface, &IID_HTMLPluginContainer, (void**)&plugin_container); else hres = E_NOINTERFACE; @@ -1507,10 +1511,10 @@ void bind_event_scripts(HTMLDocumentNode *doc) if(SUCCEEDED(hres)) bind_activex_event(doc, plugin_container, event, event_disp); else - bind_node_event(doc, event_target, target_node, event, event_disp); + bind_target_event(doc, event_target, target_dispex, event, event_disp); - if(target_node) { - IHTMLDOMNode_Release(&target_node->IHTMLDOMNode_iface); + if(target_dispex) { + IDispatchEx_Release(&target_dispex->IDispatchEx_iface); if(plugin_container) node_release(&plugin_container->element.node); }

1 0

Huw Davies : riched20/tests: Fix test on 64-bit win8.
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: ef072b1eb241238ea1be7fe850492ad60bf17ea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef072b1eb241238ea1be7fe85… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 17 14:18:36 2015 +0100 riched20/tests: Fix test on 64-bit win8. --- dlls/riched20/tests/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 65752af..09437ef 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3412,7 +3412,7 @@ static DWORD CALLBACK test_esCallback_written_1(DWORD_PTR dwCookie, LONG *pcb) { char** str = (char**)dwCookie; - ok(cb == *pcb, "cb %d, *pcb %d\n", cb, *pcb); + ok(*pcb == cb || *pcb == 0, "cb %d, *pcb %d\n", cb, *pcb); *pcb = 0; if (cb > 0) { memcpy(*str, pbBuff, cb);

1 0