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

Qian Hong : ntdll: Implemenent ObjectTypeInformation class support in NtQueryObject.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: 71080cc0818e8cc3e8be0c30bcc6602be7db12d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71080cc0818e8cc3e8be0c30b… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Jun 2 22:09:48 2015 +0800 ntdll: Implemenent ObjectTypeInformation class support in NtQueryObject. --- dlls/ntdll/om.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/ntdll/tests/om.c | 22 +++++++++++----------- include/wine/server_protocol.h | 20 +++++++++++++++++++- server/directory.c | 18 ++++++++++++++++++ server/protocol.def | 9 +++++++++ server/request.h | 6 ++++++ server/trace.c | 15 ++++++++++++++- 7 files changed, 113 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71080cc0818e8cc3e8be0…

1 0

Qian Hong : ntdll/tests: Add a few more ObjectTypeInformation tests.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: 7a7fc1e604238c08f7eb8ec380f15b1a9b1803a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a7fc1e604238c08f7eb8ec38… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Jun 2 22:10:06 2015 +0800 ntdll/tests: Add a few more ObjectTypeInformation tests. --- dlls/ntdll/tests/om.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 945effa..8470238 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -54,6 +54,7 @@ static NTSTATUS (WINAPI *pNtCreateKeyedEvent)( HANDLE *, ACCESS_MASK, const OBJE static NTSTATUS (WINAPI *pNtOpenKeyedEvent)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES * ); static NTSTATUS (WINAPI *pNtWaitForKeyedEvent)( HANDLE, const void *, BOOLEAN, const LARGE_INTEGER * ); static NTSTATUS (WINAPI *pNtReleaseKeyedEvent)( HANDLE, const void *, BOOLEAN, const LARGE_INTEGER * ); +static NTSTATUS (WINAPI *pNtCreateIoCompletion)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, ULONG); #define KEYEDEVENT_WAIT 0x0001 #define KEYEDEVENT_WAKE 0x0002 @@ -674,12 +675,16 @@ static void test_query_object(void) '\\','t','e','s','t','_','e','v','e','n','t'}; static const WCHAR type_event[] = {'E','v','e','n','t'}; static const WCHAR type_file[] = {'F','i','l','e'}; + static const WCHAR type_iocompletion[] = {'I','o','C','o','m','p','l','e','t','i','o','n'}; + static const WCHAR type_directory[] = {'D','i','r','e','c','t','o','r','y'}; + static const WCHAR type_section[] = {'S','e','c','t','i','o','n'}; HANDLE handle; char buffer[1024]; NTSTATUS status; ULONG len, expected_len; UNICODE_STRING *str; - char dir[MAX_PATH]; + char dir[MAX_PATH], tmp_path[MAX_PATH], file1[MAX_PATH + 16]; + LARGE_INTEGER size; handle = CreateEventA( NULL, FALSE, FALSE, "test_event" ); @@ -786,6 +791,66 @@ static void test_query_object(void) "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); pNtClose( handle ); + + GetTempPathA(MAX_PATH, tmp_path); + GetTempFileNameA(tmp_path, "foo", 0, file1); + handle = CreateFileA(file1, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0); + len = 0; + memset( buffer, 0, sizeof(buffer) ); + status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(buffer), &len ); + ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); + todo_wine ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); + str = (UNICODE_STRING *)buffer; + expected_len = sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR); + todo_wine ok( len >= expected_len, "unexpected len %u\n", len ); + todo_wine ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), + "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + DeleteFileA( file1 ); + pNtClose( handle ); + + status = pNtCreateIoCompletion( &handle, IO_COMPLETION_ALL_ACCESS, NULL, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateIoCompletion failed %x\n", status); + len = 0; + memset( buffer, 0, sizeof(buffer) ); + status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(buffer), &len ); + ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); + ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); + str = (UNICODE_STRING *)buffer; + expected_len = sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR); + ok( len >= expected_len, "unexpected len %u\n", len ); + todo_wine ok( str->Buffer && !memcmp( str->Buffer, type_iocompletion, sizeof(type_iocompletion) ), + "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + pNtClose( handle ); + + status = pNtCreateDirectoryObject( &handle, DIRECTORY_QUERY, NULL ); + ok(status == STATUS_SUCCESS, "Failed to create Directory %08x\n", status); + len = 0; + memset( buffer, 0, sizeof(buffer) ); + status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(buffer), &len ); + ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); + ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); + str = (UNICODE_STRING *)buffer; + expected_len = sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR); + ok( len >= expected_len, "unexpected len %u\n", len ); + ok( str->Buffer && !memcmp( str->Buffer, type_directory, sizeof(type_directory) ), + "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + pNtClose( handle ); + + size.u.LowPart = 256; + size.u.HighPart = 0; + status = pNtCreateSection( &handle, SECTION_MAP_WRITE, NULL, &size, PAGE_READWRITE, SEC_COMMIT, 0 ); + ok( status == STATUS_SUCCESS , "NtCreateSection returned %x\n", status ); + len = 0; + memset( buffer, 0, sizeof(buffer) ); + status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(buffer), &len ); + ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); + ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); + str = (UNICODE_STRING *)buffer; + expected_len = sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR); + ok( len >= expected_len, "unexpected len %u\n", len ); + ok( str->Buffer && !memcmp( str->Buffer, type_section, sizeof(type_section) ), + "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + pNtClose( handle ); } static void test_type_mismatch(void) @@ -1164,6 +1229,7 @@ START_TEST(om) pNtOpenKeyedEvent = (void *)GetProcAddress(hntdll, "NtOpenKeyedEvent"); pNtWaitForKeyedEvent = (void *)GetProcAddress(hntdll, "NtWaitForKeyedEvent"); pNtReleaseKeyedEvent = (void *)GetProcAddress(hntdll, "NtReleaseKeyedEvent"); + pNtCreateIoCompletion = (void *)GetProcAddress(hntdll, "NtCreateIoCompletion"); test_case_sensitive(); test_namespace_pipe();

1 0

Qian Hong : server: Fix type name of IoCompletion.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: bdc223ad39f30bffd622c4c1ef1862f1a9606535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc223ad39f30bffd622c4c1e… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Jun 2 22:10:14 2015 +0800 server: Fix type name of IoCompletion. --- dlls/ntdll/tests/om.c | 2 +- server/completion.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 8470238..b7ef99e 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -818,7 +818,7 @@ static void test_query_object(void) str = (UNICODE_STRING *)buffer; expected_len = sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR); ok( len >= expected_len, "unexpected len %u\n", len ); - todo_wine ok( str->Buffer && !memcmp( str->Buffer, type_iocompletion, sizeof(type_iocompletion) ), + ok( str->Buffer && !memcmp( str->Buffer, type_iocompletion, sizeof(type_iocompletion) ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); pNtClose( handle ); diff --git a/server/completion.c b/server/completion.c index 0c26c37..77c72cc 100644 --- a/server/completion.c +++ b/server/completion.c @@ -109,7 +109,7 @@ static void completion_dump( struct object *obj, int verbose ) static struct object_type *completion_get_type( struct object *obj ) { - static const WCHAR name[] = {'C','o','m','p','l','e','t','i','o','n'}; + static const WCHAR name[] = {'I','o','C','o','m','p','l','e','t','i','o','n'}; static const struct unicode_str str = { name, sizeof(name) }; return get_object_type( &str ); }

1 0

Qian Hong : server: Fix type name of File.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: f208c50cc024fe14d038c517f301196b5c344d12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f208c50cc024fe14d038c517f… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Jun 2 22:10:25 2015 +0800 server: Fix type name of File. --- dlls/ntdll/tests/om.c | 6 +++--- server/file.c | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index b7ef99e..1fa9c47 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -799,11 +799,11 @@ static void test_query_object(void) memset( buffer, 0, sizeof(buffer) ); status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(buffer), &len ); ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); - todo_wine ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); + ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); str = (UNICODE_STRING *)buffer; expected_len = sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR); - todo_wine ok( len >= expected_len, "unexpected len %u\n", len ); - todo_wine ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), + ok( len >= expected_len, "unexpected len %u\n", len ); + ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); DeleteFileA( file1 ); pNtClose( handle ); diff --git a/server/file.c b/server/file.c index 792bbe0..e70304f 100644 --- a/server/file.c +++ b/server/file.c @@ -64,6 +64,7 @@ struct file static unsigned int generic_file_map_access( unsigned int access ); static void file_dump( struct object *obj, int verbose ); +static struct object_type *file_get_type( struct object *obj ); static struct fd *file_get_fd( struct object *obj ); static struct security_descriptor *file_get_sd( struct object *obj ); static int file_set_sd( struct object *obj, const struct security_descriptor *sd, unsigned int set_info ); @@ -77,7 +78,7 @@ static const struct object_ops file_ops = { sizeof(struct file), /* size */ file_dump, /* dump */ - no_get_type, /* get_type */ + file_get_type, /* get_type */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ @@ -273,6 +274,13 @@ static void file_dump( struct object *obj, int verbose ) fprintf( stderr, "File fd=%p\n", file->fd ); } +static struct object_type *file_get_type( struct object *obj ) +{ + static const WCHAR name[] = {'F','i','l','e'}; + static const struct unicode_str str = { name, sizeof(name) }; + return get_object_type( &str ); +} + static int file_get_poll_events( struct fd *fd ) { struct file *file = get_fd_user( fd );

1 0

Qian Hong : server: Fix type name of directory file.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: ef3ed04cdc96c1a885f9796013b480fb7f5bc243 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef3ed04cdc96c1a885f979601… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Jun 2 22:10:37 2015 +0800 server: Fix type name of directory file. --- dlls/ntdll/tests/om.c | 6 +++--- server/change.c | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 1fa9c47..0f9008a 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -783,11 +783,11 @@ static void test_query_object(void) memset( buffer, 0, sizeof(buffer) ); status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(buffer), &len ); ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); - todo_wine ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); + ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); str = (UNICODE_STRING *)buffer; expected_len = sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR); - todo_wine ok( len >= expected_len, "unexpected len %u\n", len ); - todo_wine ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), + ok( len >= expected_len, "unexpected len %u\n", len ); + ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); pNtClose( handle ); diff --git a/server/change.c b/server/change.c index 11d9b93..59d1819 100644 --- a/server/change.c +++ b/server/change.c @@ -148,13 +148,14 @@ static struct security_descriptor *dir_get_sd( struct object *obj ); static int dir_set_sd( struct object *obj, const struct security_descriptor *sd, unsigned int set_info ); static void dir_dump( struct object *obj, int verbose ); +static struct object_type *dir_get_type( struct object *obj ); static void dir_destroy( struct object *obj ); static const struct object_ops dir_ops = { sizeof(struct dir), /* size */ dir_dump, /* dump */ - no_get_type, /* get_type */ + dir_get_type, /* get_type */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ @@ -250,6 +251,13 @@ static void dir_dump( struct object *obj, int verbose ) fprintf( stderr, "Dirfile fd=%p filter=%08x\n", dir->fd, dir->filter ); } +static struct object_type *dir_get_type( struct object *obj ) +{ + static const WCHAR name[] = {'F','i','l','e'}; + static const struct unicode_str str = { name, sizeof(name) }; + return get_object_type( &str ); +} + /* enter here directly from SIGIO signal handler */ void do_change_notify( int unix_fd ) {

1 0

Nikolay Sivov : oledb32: Handle CLSIDFromProgID() failure (Coverity).
by Alexandre Julliard 04 Jun '15

04 Jun '15

Module: wine Branch: master Commit: 1d08eb284ac3e9863e9fc689db4168030c431a83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d08eb284ac3e9863e9fc689d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 18:32:12 2015 +0300 oledb32: Handle CLSIDFromProgID() failure (Coverity). --- dlls/oledb32/datainit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 3cd3821..3e1f509 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -498,10 +498,10 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o TRACE("initial data source provider %s\n", debugstr_w(V_BSTR(&propset->rgProperties[0].vValue))); initprov = IID_NULL; - CLSIDFromProgID(V_BSTR(&propset->rgProperties[0].vValue), &initprov); + hr = CLSIDFromProgID(V_BSTR(&propset->rgProperties[0].vValue), &initprov); free_dbpropset(count, propset); - if (!IsEqualIID(&provclsid, &initprov)) return DB_E_MISMATCHEDPROVIDER; + if (FAILED(hr) || !IsEqualIID(&provclsid, &initprov)) return DB_E_MISMATCHEDPROVIDER; } if (!*datasource)

1 0

Nikolay Sivov : dwrite: Fix potential null pointer access in GetFontCollection() (Coverity).
by Alexandre Julliard 04 Jun '15

04 Jun '15

Module: wine Branch: master Commit: 6f99f196fc0bf48583a45ef1114e8a571f4dc3a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f99f196fc0bf48583a45ef11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 18:57:54 2015 +0300 dwrite: Fix potential null pointer access in GetFontCollection() (Coverity). --- dlls/dwrite/layout.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 365f0b2..8f42433 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1863,8 +1863,11 @@ static HRESULT WINAPI dwritetextlayout_layout_GetFontCollection(IDWriteTextLayou TRACE("(%p)->(%u %p %p)\n", This, position, collection, r); + if (position >= This->len) + return S_OK; + range = get_layout_range_by_pos(This, position); - *collection = range ? range->collection : NULL; + *collection = range->collection; if (*collection) IDWriteFontCollection_AddRef(*collection);

1 0

Nikolay Sivov : wineoss: Properly initialize pollfd structure (Coverity).
by Alexandre Julliard 04 Jun '15

04 Jun '15

Module: wine Branch: master Commit: d05999217e064d1fa42349984b8fa46bcfb93690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05999217e064d1fa42349984… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 20:28:23 2015 +0300 wineoss: Properly initialize pollfd structure (Coverity). --- dlls/wineoss.drv/midi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index c359fe0..3a2ab25 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -642,7 +642,7 @@ static DWORD WINAPI midRecThread(LPVOID arg) TRACE("Thread startup\n"); pfd.fd = midiSeqFD; - pfd.fd = POLLIN; + pfd.events = POLLIN; while(!end_thread) { TRACE("Thread loop\n");

1 0

Nikolay Sivov : shell32/tests: Fix Verbs instance leak (Valgrind).
by Alexandre Julliard 04 Jun '15

04 Jun '15

Module: wine Branch: master Commit: 98da69a83f504097d10f78414368f6edbeff8e49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98da69a83f504097d10f78414… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 23:08:08 2015 +0300 shell32/tests: Fix Verbs instance leak (Valgrind). --- dlls/shell32/tests/shelldispatch.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index f9d92ee..492d446 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -822,6 +822,7 @@ if (0) { /* crashes on winxp/win2k3 */ ok(hr == S_OK, "got 0x%08x\n", hr); ok(verb == NULL, "got %p\n", verb); + FolderItemVerbs_Release(verbs); FolderItem_Release(item); IShellDispatch_Release(sd); }

1 0

Nikolay Sivov : riched20/tests: Fix a BSTR leak (Valgrind).
by Alexandre Julliard 04 Jun '15

04 Jun '15

Module: wine Branch: master Commit: 17a50f39b2765488388bce5a4c1a17783b6f8791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17a50f39b2765488388bce5a4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 23:21:42 2015 +0300 riched20/tests: Fix a BSTR leak (Valgrind). --- dlls/riched20/tests/richole.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 101896e..da92e6c 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -2616,6 +2616,7 @@ static void test_SetText(void) str = SysAllocString(textW); hr = ITextRange_SetText(range, str); ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); value = 1; hr = ITextRange_GetStart(range, &value);

1 0