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

Dmitry Timoshkov : user32/tests: Add PeekMessage(PM_NOREMOVE) call to inter-thread messages test.
by Alexandre Julliard 21 Apr '15

21 Apr '15

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

Dmitry Timoshkov : server: GetQueueStatus should clear only checked queue changed bits.
by Alexandre Julliard 21 Apr '15

21 Apr '15

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

Michael Stefaniuc : rpcrt4: Don't open code CONTAINING_RECORD().
by Alexandre Julliard 21 Apr '15

21 Apr '15

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

Hans Leidekker : iexplore: Update version to 9.0.8112.16421.
by Alexandre Julliard 21 Apr '15

21 Apr '15

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

Hans Leidekker : msi: Fix a trace.
by Alexandre Julliard 21 Apr '15

21 Apr '15

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

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

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: 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 : 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 : 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