December 2009 - Wine-Commits

Amine Khaldi : crypt32: Remove an unneeded assignment.
by Alexandre Julliard Dec. 17, 2009

Dec. 17, 2009

Module: wine Branch: master Commit: e402260db42e62a9e7408d954fe0f28aefe8008e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e402260db42e62a9e7408d954… Author: Amine Khaldi <amine48rz(a)gmail.com> Date: Wed Dec 16 18:19:15 2009 +0100 crypt32: Remove an unneeded assignment. --- dlls/crypt32/chain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index e5ad7dc..0d1a2f0 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -619,7 +619,7 @@ static BOOL rfc822_name_matches(LPCWSTR constraint, LPCWSTR name, *trustErrorStatus |= CERT_TRUST_INVALID_NAME_CONSTRAINTS; else if (!name) ; /* no match */ - else if ((at = strchrW(constraint, '@'))) + else if (strchrW(constraint, '@')) match = !lstrcmpiW(constraint, name); else {

1 0

Paul Vriens : ntdll/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard Dec. 17, 2009

Dec. 17, 2009

Module: wine Branch: master Commit: fa2ec0f06c32c134f3aa6cbe2260532c88eb4bd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa2ec0f06c32c134f3aa6cbe2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Dec 16 16:14:02 2009 +0100 ntdll/tests: Fix a memory leak (Valgrind). --- dlls/ntdll/tests/file.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 398f198..3672b51 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -229,6 +229,8 @@ static void create_file_test(void) FILE_OVERWRITE_IF, 0, NULL, 0 ); ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_ACCESS_DENIED, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + + pRtlFreeUnicodeString( &nameW ); } static void open_file_test(void)

1 0

Henri Verbeet : wined3d: Change an ERR to a TRACE in IWineD3DEventQueryImpl_GetData().
by Alexandre Julliard Dec. 17, 2009

Dec. 17, 2009

Module: wine Branch: master Commit: d5a8637ecce0d1e02f8d7a0294a5524861d70b7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5a8637ecce0d1e02f8d7a029… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 16 19:55:56 2009 +0100 wined3d: Change an ERR to a TRACE in IWineD3DEventQueryImpl_GetData(). This is allowed behaviour. --- dlls/wined3d/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index f3e51de..a8295cc 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -347,7 +347,7 @@ static HRESULT WINAPI IWineD3DEventQueryImpl_GetData(IWineD3DQuery* iface, void if (!query->context) { - ERR("Query not started, returning TRUE.\n"); + TRACE("Query not started, returning TRUE.\n"); *data = TRUE; return S_OK;

1 0

Piotr Caban : urlmon: Added tests for CoInternetGetSecurityUrl.
by Alexandre Julliard Dec. 17, 2009

Dec. 17, 2009

Module: wine Branch: master Commit: 5cc277c677275ebede22fa89ab0c2a02fd0ea92f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc277c677275ebede22fa89a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 16 16:35:03 2009 +0100 urlmon: Added tests for CoInternetGetSecurityUrl. --- dlls/urlmon/tests/sec_mgr.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 06df952..e441698 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -91,6 +91,15 @@ static struct secmgr_test { {url7, 3, S_OK, sizeof(secid7), secid7, S_OK} }; +static int strcmp_w(const WCHAR *str1, const WCHAR *str2) +{ + DWORD len1 = lstrlenW(str1); + DWORD len2 = lstrlenW(str2); + + if(len1!=len2) return 1; + return memcmp(str1, str2, len1*sizeof(WCHAR)); +} + static void test_SecurityManager(void) { int i; @@ -630,11 +639,44 @@ static void test_InternetSecurityMarshalling(void) IInternetSecurityManager_Release(secmgr); } +static void test_InternetGetSecurityUrl(void) +{ + const WCHAR url5_out[] = {'h','t','t','p',':','w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; + const WCHAR url7_out[] = {'f','t','p',':','w','i','n','e','h','q','.','o','r','g',0}; + + const WCHAR *in[] = {url2, url3, url4, url5, url7, url8, url9, url10}; + const WCHAR *out_default[] = {url2, url3, url4, url5_out, url7_out, url8, url5_out, url10}; + const WCHAR *out_securl[] = {url2, url3, url4, url5, url7, url8, url9, url10}; + + WCHAR *sec; + DWORD i; + HRESULT hres; + + for(i=0; i<sizeof(in)/sizeof(WCHAR*); i++) { + hres = CoInternetGetSecurityUrl(in[i], &sec, PSU_DEFAULT, 0); + ok(hres == S_OK, "(%d) CoInternetGetSecurityUrl returned: %08x\n", i, hres); + if(hres == S_OK) { + ok(!strcmp_w(sec, out_default[i]), "(%d) Got %s, expected %s\n", + i, wine_dbgstr_w(sec), wine_dbgstr_w(out_default[i])); + CoTaskMemFree(sec); + } + + hres = CoInternetGetSecurityUrl(in[i], &sec, PSU_SECURITY_URL_ONLY, 0); + ok(hres == S_OK, "(%d) CoInternetGetSecurityUrl returned: %08x\n", i, hres); + if(hres == S_OK) { + ok(!strcmp_w(sec, out_securl[i]), "(%d) Got %s, expected %s\n", + i, wine_dbgstr_w(sec), wine_dbgstr_w(out_securl[i])); + CoTaskMemFree(sec); + } + } +} + START_TEST(sec_mgr) { OleInitialize(NULL); + test_InternetGetSecurityUrl(); test_SecurityManager(); test_polices(); test_CoInternetCreateZoneManager();

1 0

Amine Khaldi : inetcomm: Remove an unneeded variable.
by Alexandre Julliard Dec. 17, 2009

Dec. 17, 2009

Module: wine Branch: master Commit: 978e22a85e3efc7913b0e6bcd372c30311d1c0bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=978e22a85e3efc7913b0e6bcd… Author: Amine Khaldi <amine48rz(a)gmail.com> Date: Wed Dec 16 18:57:38 2009 +0100 inetcomm: Remove an unneeded variable. --- dlls/inetcomm/internettransport.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/inetcomm/internettransport.c b/dlls/inetcomm/internettransport.c index af4772c..dcce0d9 100644 --- a/dlls/inetcomm/internettransport.c +++ b/dlls/inetcomm/internettransport.c @@ -167,14 +167,12 @@ HRESULT InternetTransport_HandsOffCallback(InternetTransport *This) HRESULT InternetTransport_DropConnection(InternetTransport *This) { - int ret; - if (This->Status == IXP_DISCONNECTED) return IXP_E_NOT_CONNECTED; - ret = shutdown(This->Socket, SD_BOTH); + shutdown(This->Socket, SD_BOTH); - ret = closesocket(This->Socket); + closesocket(This->Socket); DestroyWindow(This->hwnd); This->hwnd = NULL;

1 0

Alexandre Julliard : server: Any thread can set the idle event, don' t treat the first one differently.
by Alexandre Julliard Dec. 17, 2009

Dec. 17, 2009

Module: wine Branch: master Commit: 7d4e28480d0ce4bc3286bf59349084f106465d8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d4e28480d0ce4bc3286bf593… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 16 17:25:01 2009 +0100 server: Any thread can set the idle event, don't treat the first one differently. --- dlls/user32/tests/msg.c | 21 +++++++++++++++++++++ server/process.c | 2 -- server/process.h | 2 -- server/queue.c | 16 ++-------------- 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d721bda..2d5477c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12041,13 +12041,26 @@ static const struct /* 10 */ { 0, 0, TRUE }, { 0, 0, FALSE }, { 0, WAIT_TIMEOUT, FALSE }, + { 0, 0, FALSE }, }; +static DWORD CALLBACK do_wait_idle_child_thread( void *arg ) +{ + MSG msg; + + PeekMessage( &msg, 0, 0, 0, PM_NOREMOVE ); + Sleep( 200 ); + MsgWaitForMultipleObjects( 0, NULL, FALSE, 100, QS_ALLINPUT ); + return 0; +} + static void do_wait_idle_child( int arg ) { WNDCLASS cls; MSG msg; HWND hwnd = 0; + HANDLE thread; + DWORD id; HANDLE start_event = OpenEventA( EVENT_ALL_ACCESS, FALSE, "test_WaitForInputIdle_start" ); HANDLE end_event = OpenEventA( EVENT_ALL_ACCESS, FALSE, "test_WaitForInputIdle_end" ); @@ -12146,6 +12159,14 @@ static void do_wait_idle_child( int arg ) MsgWaitForMultipleObjects( 0, NULL, FALSE, 100, QS_ALLINPUT ); SetEvent( start_event ); break; + case 13: + SetEvent( start_event ); + PeekMessage( &msg, 0, 0, 0, PM_NOREMOVE ); + Sleep( 200 ); + thread = CreateThread( NULL, 0, do_wait_idle_child_thread, NULL, 0, &id ); + WaitForSingleObject( thread, 10000 ); + CloseHandle( thread ); + break; } WaitForSingleObject( end_event, 2000 ); CloseHandle( start_event ); diff --git a/server/process.c b/server/process.c index 8f47870..379bec6 100644 --- a/server/process.c +++ b/server/process.c @@ -328,7 +328,6 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit process->startup_state = STARTUP_IN_PROGRESS; process->startup_info = NULL; process->idle_event = NULL; - process->queue = NULL; process->peb = 0; process->ldt_copy = 0; process->winstation = 0; @@ -423,7 +422,6 @@ static void process_destroy( struct object *obj ) if (process->msg_fd) release_object( process->msg_fd ); list_remove( &process->entry ); if (process->idle_event) release_object( process->idle_event ); - if (process->queue) release_object( process->queue ); if (process->id) free_ptid( process->id ); if (process->token) release_object( process->token ); } diff --git a/server/process.h b/server/process.h index 250c5ce..87e12e0 100644 --- a/server/process.h +++ b/server/process.h @@ -23,7 +23,6 @@ #include "object.h" -struct msg_queue; struct atom_table; struct handle_table; struct startup_info; @@ -75,7 +74,6 @@ struct process enum startup_state startup_state; /* startup state */ struct startup_info *startup_info; /* startup info while init is in progress */ struct event *idle_event; /* event for input idle */ - struct msg_queue *queue; /* main message queue */ obj_handle_t winstation; /* main handle to process window station */ obj_handle_t desktop; /* handle to desktop to use for new threads */ struct token *token; /* security token associated with this process */ diff --git a/server/queue.c b/server/queue.c index 2c8140d..3b7b449 100644 --- a/server/queue.c +++ b/server/queue.c @@ -280,8 +280,6 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ for (i = 0; i < NB_MSG_KINDS; i++) list_init( &queue->msg_list[i] ); thread->queue = queue; - if (!thread->process->queue) - thread->process->queue = (struct msg_queue *)grab_object( queue ); } release_object( input ); return queue; @@ -290,15 +288,8 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ /* free the message queue of a thread at thread exit */ void free_msg_queue( struct thread *thread ) { - struct process *process = thread->process; - remove_thread_hooks( thread ); if (!thread->queue) return; - if (process->queue == thread->queue) /* is it the process main queue? */ - { - release_object( process->queue ); - process->queue = NULL; - } release_object( thread->queue ); thread->queue = NULL; } @@ -780,11 +771,8 @@ static int msg_queue_add_queue( struct object *obj, struct wait_queue_entry *ent set_error( STATUS_ACCESS_DENIED ); return 0; } - /* if waiting on the main process queue, set the idle event */ - if (process->queue == queue) - { - if (process->idle_event) set_event( process->idle_event ); - } + if (process->idle_event) set_event( process->idle_event ); + if (queue->fd && list_empty( &obj->wait_queue )) /* first on the queue */ set_fd_events( queue->fd, POLLIN ); add_queue( obj, entry );

1 0

Alexandre Julliard : user32/tests: Always reset events when starting a WaitForInputIdle test.
by Alexandre Julliard Dec. 17, 2009

Dec. 17, 2009

Module: wine Branch: master Commit: ea4babc5115d2790a49172ab3a1d2ec710243811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea4babc5115d2790a49172ab3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 16 17:50:24 2009 +0100 user32/tests: Always reset events when starting a WaitForInputIdle test. --- dlls/user32/tests/msg.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 90ec5a0..efa5b12 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12038,9 +12038,9 @@ static const struct { WAIT_TIMEOUT, WAIT_TIMEOUT, FALSE }, { 0, 0, FALSE }, { 0, 0, FALSE }, -/* 10 */ { 0, 0, FALSE }, +/* 10 */ { 0, 0, TRUE }, { 0, 0, FALSE }, - { 0, WAIT_FAILED, FALSE }, + { 0, WAIT_TIMEOUT, TRUE }, }; static void do_wait_idle_child( int arg ) @@ -12112,7 +12112,7 @@ static void do_wait_idle_child( int arg ) Sleep( 200 ); hwnd = CreateWindowExA(0, "TestClass", NULL, WS_POPUP|WS_VISIBLE, 0, 0, 10, 10, 0, 0, 0, NULL); SetTimer( hwnd, 3, 1, NULL ); - Sleep( 1000 ); + Sleep( 200 ); while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE|PM_NOYIELD )) DispatchMessage( &msg ); break; case 8: @@ -12207,6 +12207,8 @@ static void test_WaitForInputIdle( char *argv0 ) for (i = 0; i < sizeof(wait_idle_expect)/sizeof(wait_idle_expect[0]); i++) { + ResetEvent( start_event ); + ResetEvent( end_event ); sprintf( path, "%s msg %u", argv0, i ); ret = CreateProcessA( NULL, path, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &pi ); ok( ret, "CreateProcess '%s' failed err %u.\n", path, GetLastError() );

1 0

Alexandre Julliard : server: Don' t set the idle event when a queue is destroyed, instead return success in WaitForInputIdle on process exit.
by Alexandre Julliard Dec. 17, 2009

Dec. 17, 2009

Module: wine Branch: master Commit: d1dc48d8dc3b492935ca41f67593a59310abe919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1dc48d8dc3b492935ca41f67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 16 17:20:46 2009 +0100 server: Don't set the idle event when a queue is destroyed, instead return success in WaitForInputIdle on process exit. --- dlls/user32/message.c | 2 +- server/process.c | 5 +++++ server/queue.c | 6 ------ 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 8916cae..285a24c 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3338,7 +3338,7 @@ DWORD WINAPI WaitForInputIdle( HANDLE hProcess, DWORD dwTimeOut ) switch (ret) { case WAIT_OBJECT_0: - return WAIT_FAILED; + return 0; case WAIT_OBJECT_0+2: process_sent_messages(); break; diff --git a/server/process.c b/server/process.c index 51193b7..8f47870 100644 --- a/server/process.c +++ b/server/process.c @@ -634,6 +634,11 @@ static void process_killed( struct process *process ) if (handles) release_object( handles ); process->winstation = 0; process->desktop = 0; + if (process->idle_event) + { + release_object( process->idle_event ); + process->idle_event = NULL; + } /* close the console attached to this process, if any */ free_console( process ); diff --git a/server/queue.c b/server/queue.c index c5841c9..b7cbc64 100644 --- a/server/queue.c +++ b/server/queue.c @@ -298,12 +298,6 @@ void free_msg_queue( struct thread *thread ) { release_object( process->queue ); process->queue = NULL; - if (process->idle_event) - { - set_event( process->idle_event ); - release_object( process->idle_event ); - process->idle_event = NULL; - } } release_object( thread->queue ); thread->queue = NULL;

1 0

Alexandre Julliard : server: Set the idle event when retrieving a timer message.
by Alexandre Julliard Dec. 17, 2009

Dec. 17, 2009

Module: wine Branch: master Commit: 7265e89226993d28bbae6c4c6da22e3b8daf8562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7265e89226993d28bbae6c4c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 16 18:18:07 2009 +0100 server: Set the idle event when retrieving a timer message. --- dlls/user32/tests/msg.c | 2 +- server/queue.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 052bef2..d6d8b6a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12038,7 +12038,7 @@ static const struct { WAIT_TIMEOUT, WAIT_TIMEOUT, FALSE }, { 0, 0, FALSE }, { 0, 0, FALSE }, -/* 10 */ { 0, 0, TRUE }, +/* 10 */ { 0, 0, FALSE }, { 0, 0, FALSE }, { 0, WAIT_TIMEOUT, FALSE }, { 0, 0, FALSE }, diff --git a/server/queue.c b/server/queue.c index 3ab8d00..d880dff 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1814,6 +1814,8 @@ DECL_HANDLER(get_message) reply->wparam = timer->id; reply->lparam = timer->lparam; reply->time = get_tick_count(); + if (!(req->flags & PM_NOYIELD) && current->process->idle_event) + set_event( current->process->idle_event ); return; }

1 0

Alexandre Julliard : server: Don' t set the idle event when waiting for a message reply.
by Alexandre Julliard Dec. 17, 2009

Dec. 17, 2009

Module: wine Branch: master Commit: 92e704edc50828f710a6d859216113a28ebf6430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92e704edc50828f710a6d8592… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 16 17:32:15 2009 +0100 server: Don't set the idle event when waiting for a message reply. --- dlls/user32/tests/msg.c | 2 +- server/queue.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2d5477c..052bef2 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12031,7 +12031,7 @@ static const struct /* 0 */ { WAIT_TIMEOUT, WAIT_TIMEOUT, FALSE }, { WAIT_TIMEOUT, 0, FALSE }, { WAIT_TIMEOUT, 0, FALSE }, - { WAIT_TIMEOUT, WAIT_TIMEOUT, TRUE }, + { WAIT_TIMEOUT, WAIT_TIMEOUT, FALSE }, { WAIT_TIMEOUT, WAIT_TIMEOUT, FALSE }, /* 5 */ { WAIT_TIMEOUT, 0, FALSE }, { WAIT_TIMEOUT, 0, FALSE }, diff --git a/server/queue.c b/server/queue.c index 3b7b449..3ab8d00 100644 --- a/server/queue.c +++ b/server/queue.c @@ -771,7 +771,7 @@ static int msg_queue_add_queue( struct object *obj, struct wait_queue_entry *ent set_error( STATUS_ACCESS_DENIED ); return 0; } - if (process->idle_event) set_event( process->idle_event ); + if (process->idle_event && !(queue->wake_mask & QS_SMRESULT)) set_event( process->idle_event ); if (queue->fd && list_empty( &obj->wait_queue )) /* first on the queue */ set_fd_events( queue->fd, POLLIN );

1 0