October 2007 - Wine-Commits

Rob Shearman : server: Pass the security descriptor into create_file, if one is specified, and set the initial mode for the file appropriately.
by Alexandre Julliard Oct. 30, 2007

Oct. 30, 2007

Module: wine Branch: master Commit: 5f5df83281a48df7746ff263b5047cffe4c3c1fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f5df83281a48df7746ff263b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Oct 26 17:02:16 2007 +0100 server: Pass the security descriptor into create_file, if one is specified, and set the initial mode for the file appropriately. --- dlls/ntdll/file.c | 19 ++++++ server/file.c | 164 ++++++++++++++++++++++++++++++++------------------ server/protocol.def | 1 + 3 files changed, 125 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f5df83281a48df7746ff…

1 0

Hans Leidekker : wininet: Don't release the parent object in FTP_Connect, the caller will do that.
by Alexandre Julliard Oct. 30, 2007

Oct. 30, 2007

Module: wine Branch: master Commit: 1a8327468cc5e9c276711ef9e067582b50e05a43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a8327468cc5e9c276711ef9e… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Oct 30 14:30:47 2007 +0200 wininet: Don't release the parent object in FTP_Connect, the caller will do that. --- dlls/wininet/ftp.c | 1 - dlls/wininet/tests/ftp.c | 16 +++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 88d97ff..d763043 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2062,7 +2062,6 @@ lerror: if (!bSuccess && handle) { - WININET_Release( &hIC->hdr ); WININET_FreeHandle( handle ); handle = NULL; } diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index d5fe35c..7bbaf02 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -668,19 +668,21 @@ START_TEST(ftp) hInternet = InternetOpen("winetest", 0, NULL, NULL, 0); ok(hInternet != NULL, "InternetOpen failed: %u\n", GetLastError()); - SetLastError(0xdeadbeef); hFtp = InternetConnect(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", NULL, INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); - ok(hFtp != NULL, "InternetOpen failed: %u\n", GetLastError()); - - SetLastError(0xdeadbeef); - hHttp = InternetConnect(hInternet, "www.winehq.org", INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); - ok(hFtp != NULL, "InternetOpen failed: %u\n", GetLastError()); - if (!hFtp) { + InternetCloseHandle(hInternet); skip("No ftp connection could be made to ftp.winehq.org\n"); return; } + hHttp = InternetConnect(hInternet, "www.winehq.org", INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + if (!hHttp) + { + InternetCloseHandle(hFtp); + InternetCloseHandle(hInternet); + skip("No http connection could be made to www.winehq.org\n"); + return; + } /* The first call should always be a proper InternetOpen, if not * several calls will return ERROR_INTERNET_NOT_INITIALIZED when

1 0

Rob Shearman : server: Add the name length to the object_attributes structure so that other variable length data can be present after object_attributes .
by Alexandre Julliard Oct. 30, 2007

Oct. 30, 2007

Module: wine Branch: master Commit: f98556c119d3f55ba26f4e737db8766b8dfd13c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f98556c119d3f55ba26f4e737… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Oct 26 17:01:33 2007 +0100 server: Add the name length to the object_attributes structure so that other variable length data can be present after object_attributes. --- dlls/ntdll/sync.c | 3 +++ dlls/ntdll/virtual.c | 1 + server/event.c | 5 +---- server/mapping.c | 5 +---- server/mutex.c | 5 +---- server/protocol.def | 1 + server/security.h | 5 +++++ server/semaphore.c | 4 +--- server/token.c | 3 ++- server/trace.c | 12 +++++++----- 10 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 191cd07..47c8461 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -154,6 +154,7 @@ NTSTATUS WINAPI NtCreateSemaphore( OUT PHANDLE SemaphoreHandle, objattr.rootdir = attr ? attr->RootDirectory : 0; objattr.sd_len = 0; + objattr.name_len = len; if (attr) { ret = NTDLL_create_struct_sd( attr->SecurityDescriptor, &sd, &objattr.sd_len ); @@ -262,6 +263,7 @@ NTSTATUS WINAPI NtCreateEvent( objattr.rootdir = attr ? attr->RootDirectory : 0; objattr.sd_len = 0; + objattr.name_len = len; if (attr) { ret = NTDLL_create_struct_sd( attr->SecurityDescriptor, &sd, &objattr.sd_len ); @@ -425,6 +427,7 @@ NTSTATUS WINAPI NtCreateMutant(OUT HANDLE* MutantHandle, objattr.rootdir = attr ? attr->RootDirectory : 0; objattr.sd_len = 0; + objattr.name_len = len; if (attr) { status = NTDLL_create_struct_sd( attr->SecurityDescriptor, &sd, &objattr.sd_len ); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 2c08a16..684fa5d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1864,6 +1864,7 @@ NTSTATUS WINAPI NtCreateSection( HANDLE *handle, ACCESS_MASK access, const OBJEC objattr.rootdir = attr ? attr->RootDirectory : 0; objattr.sd_len = 0; + objattr.name_len = len; if (attr) { ret = NTDLL_create_struct_sd( attr->SecurityDescriptor, &sd, &objattr.sd_len ); diff --git a/server/event.c b/server/event.c index f866211..99d0f4b 100644 --- a/server/event.c +++ b/server/event.c @@ -180,10 +180,7 @@ DECL_HANDLER(create_event) return; sd = objattr->sd_len ? (const struct security_descriptor *)(objattr + 1) : NULL; - - /* get unicode string */ - name.len = ((get_req_data_size() - sizeof(*objattr) - objattr->sd_len) / sizeof(WCHAR)) * sizeof(WCHAR); - name.str = (const WCHAR *)get_req_data() + (sizeof(*objattr) + objattr->sd_len) / sizeof(WCHAR); + objattr_get_name( objattr, &name ); if (objattr->rootdir && !(root = get_directory_obj( current->process, objattr->rootdir, 0 ))) return; diff --git a/server/mapping.c b/server/mapping.c index 8f1bf5c..bd21a50 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -408,10 +408,7 @@ DECL_HANDLER(create_mapping) return; sd = objattr->sd_len ? (const struct security_descriptor *)(objattr + 1) : NULL; - - /* get unicode string */ - name.len = ((get_req_data_size() - sizeof(*objattr) - objattr->sd_len) / sizeof(WCHAR)) * sizeof(WCHAR); - name.str = (const WCHAR *)get_req_data() + (sizeof(*objattr) + objattr->sd_len) / sizeof(WCHAR); + objattr_get_name( objattr, &name ); if (objattr->rootdir && !(root = get_directory_obj( current->process, objattr->rootdir, 0 ))) return; diff --git a/server/mutex.c b/server/mutex.c index 7064c6f..979f21f 100644 --- a/server/mutex.c +++ b/server/mutex.c @@ -205,10 +205,7 @@ DECL_HANDLER(create_mutex) return; sd = objattr->sd_len ? (const struct security_descriptor *)(objattr + 1) : NULL; - - /* get unicode string */ - name.len = ((get_req_data_size() - sizeof(*objattr) - objattr->sd_len) / sizeof(WCHAR)) * sizeof(WCHAR); - name.str = (const WCHAR *)get_req_data() + (sizeof(*objattr) + objattr->sd_len) / sizeof(WCHAR); + objattr_get_name( objattr, &name ); if (objattr->rootdir && !(root = get_directory_obj( current->process, objattr->rootdir, 0 ))) return; diff --git a/server/protocol.def b/server/protocol.def index d336af6..1ecc886 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -237,6 +237,7 @@ struct object_attributes { obj_handle_t rootdir; /* root directory */ data_size_t sd_len; /* length of security_descriptor data. may be 0 */ + data_size_t name_len; /* length of the name string. may be 0 */ /* VARARG(sd,security_descriptor); */ /* VARARG(name,unicode_str); */ }; diff --git a/server/security.h b/server/security.h index 50fba52..ebdf95f 100644 --- a/server/security.h +++ b/server/security.h @@ -131,3 +131,8 @@ static inline const SID *sd_get_group( const struct security_descriptor *sd ) /* determines whether an object_attributes struct is valid in a buffer * and calls set_error appropriately */ extern int objattr_is_valid( const struct object_attributes *objattr, data_size_t size ); +static inline void objattr_get_name( const struct object_attributes *objattr, struct unicode_str *name ) +{ + name->len = ((objattr->name_len) / sizeof(WCHAR)) * sizeof(WCHAR); + name->str = (const WCHAR *)objattr + (sizeof(*objattr) + objattr->sd_len) / sizeof(WCHAR); +} diff --git a/server/semaphore.c b/server/semaphore.c index a8318cd..09445e1 100644 --- a/server/semaphore.c +++ b/server/semaphore.c @@ -180,10 +180,8 @@ DECL_HANDLER(create_semaphore) return; sd = objattr->sd_len ? (const struct security_descriptor *)(objattr + 1) : NULL; + objattr_get_name( objattr, &name ); - /* get unicode string */ - name.len = ((get_req_data_size() - sizeof(*objattr) - objattr->sd_len) / sizeof(WCHAR)) * sizeof(WCHAR); - name.str = (const WCHAR *)get_req_data() + (sizeof(*objattr) + objattr->sd_len) / sizeof(WCHAR); if (objattr->rootdir && !(root = get_directory_obj( current->process, objattr->rootdir, 0 ))) return; diff --git a/server/token.c b/server/token.c index 665ed48..93696d9 100644 --- a/server/token.c +++ b/server/token.c @@ -309,7 +309,8 @@ int sd_is_valid( const struct security_descriptor *sd, data_size_t size ) * and calls set_error appropriately */ int objattr_is_valid( const struct object_attributes *objattr, data_size_t size ) { - if ((size < sizeof(*objattr)) || (size - sizeof(*objattr) < objattr->sd_len)) + if ((size < sizeof(*objattr)) || (size - sizeof(*objattr) < objattr->sd_len) || + (size - sizeof(*objattr) - objattr->sd_len < objattr->name_len)) { set_error( STATUS_ACCESS_VIOLATION ); return FALSE; diff --git a/server/trace.c b/server/trace.c index 30d6efd..0f0e17d 100644 --- a/server/trace.c +++ b/server/trace.c @@ -790,14 +790,16 @@ static void dump_varargs_object_attributes( data_size_t size ) { const WCHAR *str; fprintf( stderr, "rootdir=%p,sd=", objattr->rootdir ); - if (objattr->sd_len > size - sizeof(*objattr)) return; + if (objattr->sd_len > size - sizeof(*objattr) || + objattr->name_len > size - sizeof(*objattr) - objattr->sd_len) + return; dump_inline_security_descriptor( (const struct security_descriptor *)(objattr + 1), objattr->sd_len ); - str = (const WCHAR *)cur_data + (sizeof(*objattr) + objattr->sd_len) / sizeof(WCHAR); + str = (const WCHAR *)objattr + (sizeof(*objattr) + objattr->sd_len) / sizeof(WCHAR); fprintf( stderr, ",name=L\"" ); - dump_strW( str, (size - sizeof(*objattr) - objattr->sd_len) / sizeof(WCHAR), - stderr, "\"\"" ); + dump_strW( str, objattr->name_len / sizeof(WCHAR), stderr, "\"\"" ); fputc( '\"', stderr ); - remove_data( size ); + remove_data( ((sizeof(*objattr) + objattr->sd_len) / sizeof(WCHAR)) * sizeof(WCHAR) + + objattr->name_len ); } fputc( '}', stderr ); }

1 0

Mikolaj Zalewski : user32: Better fix how to handle GetWindowLongPtr[AW](.. ., GWLP_WNDPROC) for builtin winprocs.
by Alexandre Julliard Oct. 30, 2007

Oct. 30, 2007

Module: wine Branch: master Commit: 585329ed139a5eb6f1d1a17eeeea397ebc379f99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=585329ed139a5eb6f1d1a17ee… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Wed Oct 17 18:55:55 2007 -0700 user32: Better fix how to handle GetWindowLongPtr[AW](..., GWLP_WNDPROC) for builtin winprocs. --- dlls/user32/class.c | 6 ++-- dlls/user32/controls.h | 2 + dlls/user32/tests/class.c | 66 +++++++++++++++++++++++++++++++++++++++++--- dlls/user32/win.c | 13 +++++++- dlls/user32/winproc.c | 43 ++++------------------------- 5 files changed, 83 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=585329ed139a5eb6f1d1a…

1 0

Alexandre Julliard : pdh: Fix a couple of race conditions in the thread handling.
by Alexandre Julliard Oct. 30, 2007

Oct. 30, 2007

Module: wine Branch: master Commit: 55d274d1d23ea6ea2aa1eab828917ddb5d57e34e URL: http://source.winehq.org/git/wine.git/?a=commit;h=55d274d1d23ea6ea2aa1eab82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 30 13:04:23 2007 +0100 pdh: Fix a couple of race conditions in the thread handling. --- dlls/pdh/pdh_main.c | 44 ++++++++++++++++++++++++++++---------------- 1 files changed, 28 insertions(+), 16 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 49d0a33..37613ed 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -380,17 +380,6 @@ PDH_STATUS WINAPI PdhCalculateCounterFromRawValue( PDH_HCOUNTER handle, DWORD fo return ret; } -/* caller must hold query lock */ -static void shutdown_query_thread( struct query *query ) -{ - SetEvent( query->stop ); - WaitForSingleObject( query->thread, INFINITE ); - - CloseHandle( query->stop ); - CloseHandle( query->thread ); - - query->thread = NULL; -} /*********************************************************************** * PdhCloseQuery (PDH.@) @@ -409,7 +398,20 @@ PDH_STATUS WINAPI PdhCloseQuery( PDH_HQUERY handle ) return PDH_INVALID_HANDLE; } - if (query->thread) shutdown_query_thread( query ); + if (query->thread) + { + HANDLE thread = query->thread; + SetEvent( query->stop ); + LeaveCriticalSection( &pdh_handle_cs ); + + WaitForSingleObject( thread, INFINITE ); + + EnterCriticalSection( &pdh_handle_cs ); + if (query->magic != PDH_MAGIC_QUERY) return ERROR_SUCCESS; + CloseHandle( query->stop ); + CloseHandle( query->thread ); + query->thread = NULL; + } LIST_FOR_EACH_SAFE( item, next, &query->counters ) { @@ -476,7 +478,6 @@ static DWORD CALLBACK collect_query_thread( void *arg ) DWORD interval = query->interval; HANDLE stop = query->stop; - SetEvent( stop ); for (;;) { if (WaitForSingleObject( stop, interval ) != WAIT_TIMEOUT) ExitThread( 0 ); @@ -520,8 +521,20 @@ PDH_STATUS WINAPI PdhCollectQueryDataEx( PDH_HQUERY handle, DWORD interval, HAND LeaveCriticalSection( &pdh_handle_cs ); return PDH_NO_DATA; } - if (query->thread) shutdown_query_thread( query ); - if (!(query->stop = CreateEventW( NULL, FALSE, FALSE, NULL ))) + if (query->thread) + { + HANDLE thread = query->thread; + SetEvent( query->stop ); + LeaveCriticalSection( &pdh_handle_cs ); + + WaitForSingleObject( thread, INFINITE ); + + EnterCriticalSection( &pdh_handle_cs ); + if (query->magic != PDH_MAGIC_QUERY) return PDH_INVALID_HANDLE; + CloseHandle( query->thread ); + query->thread = NULL; + } + else if (!(query->stop = CreateEventW( NULL, FALSE, FALSE, NULL ))) { ret = GetLastError(); LeaveCriticalSection( &pdh_handle_cs ); @@ -537,7 +550,6 @@ PDH_STATUS WINAPI PdhCollectQueryDataEx( PDH_HQUERY handle, DWORD interval, HAND LeaveCriticalSection( &pdh_handle_cs ); return ret; } - WaitForSingleObject( query->stop, INFINITE ); LeaveCriticalSection( &pdh_handle_cs ); return ERROR_SUCCESS;

1 0

Alexandre Julliard : user32: Fix a slightly incorrect assert.
by Alexandre Julliard Oct. 30, 2007

Oct. 30, 2007

Module: wine Branch: master Commit: e2b5227b65e4e0c9fec9266ec852fc1b5bdf30d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2b5227b65e4e0c9fec9266ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 30 14:11:44 2007 +0100 user32: Fix a slightly incorrect assert. --- dlls/user32/win.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 6aea6c9..3c077c9 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -148,8 +148,8 @@ static WND *create_window_handle( HWND parent, HWND owner, ATOM atom, { struct user_thread_info *thread_info = get_user_thread_info(); - assert( !thread_info->desktop ); - thread_info->desktop = full_parent ? full_parent : handle; + if (!thread_info->desktop) thread_info->desktop = full_parent ? full_parent : handle; + else assert( full_parent == thread_info->desktop ); if (full_parent && !USER_Driver->pCreateDesktopWindow( thread_info->desktop )) ERR( "failed to create desktop window\n" ); }

1 0

Dan Kegel : advapi32/tests: Fix undefined memory references in registry.c.
by Alexandre Julliard Oct. 30, 2007

Oct. 30, 2007

Module: wine Branch: master Commit: dc072e209d3016ed87adcf7f81adca17a706b56a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc072e209d3016ed87adcf7f8… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Oct 29 10:47:41 2007 -0700 advapi32/tests: Fix undefined memory references in registry.c. --- dlls/advapi32/tests/registry.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index cdd4835..017dab3 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -282,8 +282,8 @@ static void test_hkey_main_Value_W(LPCWSTR name, LPCWSTR string, string=nW; } ok(memcmp(value, string, cbData) == 0, "RegQueryValueExW failed: %s/%d != %s/%d\n", - wine_debugstr_wn(value, cbData), cbData, - wine_debugstr_wn(string, full_byte_len), full_byte_len); + wine_debugstr_wn(value, cbData / sizeof(WCHAR)), cbData, + wine_debugstr_wn(string, full_byte_len / sizeof(WCHAR)), full_byte_len / sizeof(WCHAR)); HeapFree(GetProcessHeap(), 0, value); }

1 0

Jacek Caban : itss: Fixed tests on old IE.
by Alexandre Julliard Oct. 30, 2007

Oct. 30, 2007

Module: wine Branch: master Commit: 0f16c1496f616ed5c4c89dc852e4abb9dc52ffad URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f16c1496f616ed5c4c89dc85… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 30 11:44:12 2007 +0100 itss: Fixed tests on old IE. --- dlls/itss/tests/protocol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index 05825be..c2fcf95 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -319,7 +319,7 @@ static HRESULT _protocol_start(unsigned line, IInternetProtocol *protocol, LPCWS }else { CHECK_CALLED(GetBindInfo); if(test_protocol == MK_PROTOCOL) - CHECK_CALLED(ReportProgress_DIRECTBIND); + SET_CALLED(ReportProgress_DIRECTBIND); CHECK_CALLED(ReportProgress_SENDINGREQUEST); if(expect_mime) CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE);

1 0

Lei Zhang : comctl32: Set tab focus correctly.
by Alexandre Julliard Oct. 30, 2007

Oct. 30, 2007

Module: wine Branch: master Commit: f2519fdcda334167b44899e188f3d9400a83ea13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2519fdcda334167b44899e18… Author: Lei Zhang <thestig(a)google.com> Date: Mon Oct 29 18:47:09 2007 -0700 comctl32: Set tab focus correctly. --- dlls/comctl32/tab.c | 9 ++++----- dlls/comctl32/tests/tab.c | 20 +++++--------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 2db8cfe..5f9e295 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -2325,11 +2325,6 @@ static void TAB_Refresh (TAB_INFO *infoPtr, HDC hdc) /* Then, draw the selected item */ TAB_DrawItem (infoPtr, hdc, infoPtr->iSelected); - - /* If we haven't set the current focus yet, set it now. - * Only happens when we first paint the tab controls */ - if (infoPtr->uFocus == -1) - TAB_SetCurFocus(infoPtr, infoPtr->iSelected); } SelectObject (hdc, hOldFont); @@ -2637,6 +2632,10 @@ TAB_InsertItemT (TAB_INFO *infoPtr, WPARAM wParam, LPARAM lParam, BOOL bUnicode) TRACE("[%p]: added item %d %s\n", infoPtr->hwnd, iItem, debugstr_w(item->pszText)); + /* If we haven't set the current focus yet, set it now. */ + if (infoPtr->uFocus == -1) + TAB_SetCurFocus(infoPtr, iItem); + return iItem; } diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 32de6bc..9489376 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -876,9 +876,7 @@ static void test_insert_focus(HWND parent_wnd) expect(1, nTabsRetrieved); r = SendMessage(hTab, TCM_GETCURFOCUS, 0, 0); - todo_wine { - expect(0, r); - } + expect(0, r); tcNewTab.iImage = 2; r = SendMessage(hTab, TCM_INSERTITEM, 2, (LPARAM) &tcNewTab); @@ -888,9 +886,7 @@ static void test_insert_focus(HWND parent_wnd) expect(2, nTabsRetrieved); r = SendMessage(hTab, TCM_GETCURFOCUS, 0, 0); - todo_wine { - expect(0, r); - } + expect(0, r); r = SendMessage(hTab, TCM_SETCURFOCUS, -1, 0); expect(0, r); @@ -903,9 +899,7 @@ static void test_insert_focus(HWND parent_wnd) expect(2, r); r = SendMessage(hTab, TCM_GETCURFOCUS, 0, 0); - todo_wine { - expect(2, r); - } + expect(2, r); ok_sequence(sequences, TAB_SEQ_INDEX, insert_focus_seq, "insert_focus test sequence", TRUE); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_sequence, "insert_focus parent test sequence", FALSE); @@ -930,9 +924,7 @@ static void test_delete_focus(HWND parent_wnd) expect(2, nTabsRetrieved); r = SendMessage(hTab, TCM_GETCURFOCUS, 0, 0); - todo_wine { - expect(0, r); - } + expect(0, r); r = SendMessage(hTab, TCM_DELETEITEM, 1, 0); expect(1, r); @@ -941,9 +933,7 @@ static void test_delete_focus(HWND parent_wnd) expect(1, nTabsRetrieved); r = SendMessage(hTab, TCM_GETCURFOCUS, 0, 0); - todo_wine { - expect(0, r); - } + expect(0, r); r = SendMessage(hTab, TCM_SETCURFOCUS, -1, 0); expect(0, r);

1 0

Alexandre Julliard : server: Remove failed ioctls from the queue as soon as the result is set.
by Alexandre Julliard Oct. 30, 2007

Oct. 30, 2007

Module: wine Branch: master Commit: 8268ad551a258de88f4e0338a19e4866fc0deea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8268ad551a258de88f4e0338a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 30 11:30:58 2007 +0100 server: Remove failed ioctls from the queue as soon as the result is set. --- server/device.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/server/device.c b/server/device.c index 46b2796..d5e5e44 100644 --- a/server/device.c +++ b/server/device.c @@ -226,11 +226,20 @@ static void set_ioctl_result( struct ioctl_call *ioctl, unsigned int status, ioctl->device = NULL; if (ioctl->async) { - async_terminate( ioctl->async, ioctl->out_size ? STATUS_ALERTED : status ); + if (ioctl->out_size) status = STATUS_ALERTED; + async_terminate( ioctl->async, status ); release_object( ioctl->async ); ioctl->async = NULL; } wake_up( &ioctl->obj, 0 ); + + if (status != STATUS_ALERTED) + { + /* remove it from the device queue */ + /* (for STATUS_ALERTED this will be done in get_ioctl_result) */ + list_remove( &ioctl->dev_entry ); + release_object( ioctl ); /* no longer on the device queue */ + } } @@ -352,12 +361,12 @@ static struct device *create_device( struct directory *root, const struct unicod static void delete_device( struct device *device ) { - struct ioctl_call *ioctl; + struct ioctl_call *ioctl, *next; if (!device->manager) return; /* already deleted */ /* terminate all pending requests */ - LIST_FOR_EACH_ENTRY( ioctl, &device->requests, struct ioctl_call, dev_entry ) + LIST_FOR_EACH_ENTRY_SAFE( ioctl, next, &device->requests, struct ioctl_call, dev_entry ) { list_remove( &ioctl->mgr_entry ); set_ioctl_result( ioctl, STATUS_FILE_DELETED, NULL, 0 );

1 0