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

Ken Thomases : winemac: Remove extraneous CDECL attribute.
by Alexandre Julliard June 5, 2015

June 5, 2015

Module: wine Branch: master Commit: 0c395c24e3f7a5849b92e9d479ce574e7ab27df4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c395c24e3f7a5849b92e9d47… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jun 4 13:57:32 2015 -0500 winemac: Remove extraneous CDECL attribute. --- dlls/winemac.drv/macdrv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index a874dfb..a31d7e3 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -197,7 +197,7 @@ extern void macdrv_clipboard_process_attach(void) DECLSPEC_HIDDEN; extern BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) DECLSPEC_HIDDEN; extern const char *debugstr_format(UINT id) DECLSPEC_HIDDEN; extern HANDLE macdrv_get_pasteboard_data(CFTypeRef pasteboard, UINT desired_format) DECLSPEC_HIDDEN; -extern BOOL CDECL macdrv_pasteboard_has_format(CFTypeRef pasteboard, UINT desired_format) DECLSPEC_HIDDEN; +extern BOOL macdrv_pasteboard_has_format(CFTypeRef pasteboard, UINT desired_format) DECLSPEC_HIDDEN; extern CFArrayRef macdrv_copy_pasteboard_formats(CFTypeRef pasteboard) DECLSPEC_HIDDEN; extern BOOL query_drag_operation(macdrv_query* query) DECLSPEC_HIDDEN;

1 0

Qian Hong : ntdll/tests: Add a few more ObjectTypeInformation tests.
by Alexandre Julliard June 5, 2015

June 5, 2015

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 : ntdll: Implemenent ObjectTypeInformation class support in NtQueryObject.
by Alexandre Julliard June 5, 2015

June 5, 2015

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 : server: Fix type name of IoCompletion.
by Alexandre Julliard June 5, 2015

June 5, 2015

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

Nikolay Sivov : shell32/tests: Fix tests failures on win2k.
by Alexandre Julliard June 5, 2015

June 5, 2015

Module: wine Branch: master Commit: d5d49464d30582c904c199be21975562be3366c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5d49464d30582c904c199be2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 4 20:28:50 2015 +0300 shell32/tests: Fix tests failures on win2k. --- dlls/shell32/tests/shelldispatch.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 22eabf5..1f27cfa 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -451,7 +451,7 @@ if (0) /* crashes on pre-vista */ { disp = (void*)0xdeadbeef; hr = IShellView_GetItemObject(view, SVGIO_BACKGROUND, &IID_IShellFolderViewDual, (void**)&disp); - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + ok(hr == E_NOINTERFACE || broken(hr == E_NOTIMPL) /* win2k */, "got 0x%08x\n", hr); ok(disp == NULL, "got %p\n", disp); IShellView_Release(view); @@ -704,14 +704,14 @@ static void test_ParseName(void) item = (void*)0xdeadbeef; hr = Folder_ParseName(folder, NULL, &item); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == E_INVALIDARG) /* win2k */, "got 0x%08x\n", hr); ok(item == NULL, "got %p\n", item); /* empty name */ str = SysAllocStringLen(NULL, 0); item = (void*)0xdeadbeef; hr = Folder_ParseName(folder, str, &item); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == E_INVALIDARG) /* win2k */, "got 0x%08x\n", hr); ok(item == NULL, "got %p\n", item); SysFreeString(str); @@ -719,7 +719,7 @@ static void test_ParseName(void) str = SysAllocString(cadabraW); item = (void*)0xdeadbeef; hr = Folder_ParseName(folder, str, &item); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == E_INVALIDARG) /* win2k */, "got 0x%08x\n", hr); ok(item == NULL, "got %p\n", item); SysFreeString(str);

1 0

Piotr Caban : msvcrt: Don't lock __badioinfo.
by Alexandre Julliard June 4, 2015

June 4, 2015

Module: wine Branch: master Commit: eec7a565bec2564ef4aef650ea3e5ff93a776085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eec7a565bec2564ef4aef650e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 4 11:24:52 2015 +0200 msvcrt: Don't lock __badioinfo. --- dlls/msvcrt/file.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c9f9cae..07863be 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -260,6 +260,8 @@ static inline ioinfo* get_ioinfo_nolock(int fd) static inline ioinfo* get_ioinfo(int fd) { ioinfo *ret = get_ioinfo_nolock(fd); + if(ret == &MSVCRT___badioinfo) + return ret; if(!(ret->exflag & EF_CRIT_INIT)) { LOCK_FILES(); if(!(ret->exflag & EF_CRIT_INIT)) { @@ -274,7 +276,7 @@ static inline ioinfo* get_ioinfo(int fd) static inline void release_ioinfo(ioinfo *info) { - if(info->exflag & EF_CRIT_INIT) + if(info!=&MSVCRT___badioinfo && info->exflag & EF_CRIT_INIT) LeaveCriticalSection(&info->crit); }

1 0

Sebastian Lackner : server: Fix opening clipboard from multiple threads.
by Alexandre Julliard June 4, 2015

June 4, 2015

Module: wine Branch: master Commit: e05e99d7548d5c7b1c0ec6176532a6a6ffb7cf0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e05e99d7548d5c7b1c0ec6176… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jun 3 18:12:07 2015 +0200 server: Fix opening clipboard from multiple threads. --- dlls/user32/tests/clipboard.c | 17 ++++++++++++++++- server/clipboard.c | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index a9aef84..2a0d6e2 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -24,9 +24,18 @@ #include "wingdi.h" #include "winuser.h" +static DWORD WINAPI open_clipboard_thread(LPVOID arg) +{ + HWND hWnd = arg; + ok(OpenClipboard(hWnd), "OpenClipboard failed\n"); + return 0; +} + static void test_ClipboardOwner(void) { + HANDLE thread; HWND hWnd1, hWnd2; + DWORD dwret; BOOL ret; SetLastError(0xdeadbeef); @@ -56,7 +65,13 @@ static void test_ClipboardOwner(void) ok( ret, "CloseClipboard error %d\n", GetLastError()); ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); - ok(OpenClipboard(hWnd1), "OpenClipboard second time in the same hwnd failed\n"); + thread = CreateThread(NULL, 0, open_clipboard_thread, hWnd1, 0, NULL); + ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); + dwret = WaitForSingleObject(thread, 1000); + ok(dwret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", dwret); + CloseHandle(thread); + ok(!CloseClipboard(), "CloseClipboard should fail if clipboard wasn't open\n"); + ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); SetLastError(0xdeadbeef); ret = OpenClipboard(hWnd2); diff --git a/server/clipboard.c b/server/clipboard.c index 9acee98..87dde50 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -138,7 +138,7 @@ void cleanup_clipboard_thread(struct thread *thread) static int open_clipboard( struct clipboard *clipboard, user_handle_t win ) { win = get_user_full_handle( win ); - if (clipboard->open_thread && (clipboard->open_thread != current || clipboard->open_win != win)) + if (clipboard->open_thread && clipboard->open_win != win) { set_error(STATUS_WAS_LOCKED); return 0;

1 0

Michael Müller : wbemprox: Treat \r as whitespace.
by Alexandre Julliard June 4, 2015

June 4, 2015

Module: wine Branch: master Commit: 688db4d273ed7f2155094bae03033eafc62760ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=688db4d273ed7f2155094bae0… Author: Michael Müller <michael(a)fds-team.de> Date: Sun May 24 03:53:13 2015 +0200 wbemprox: Treat \r as whitespace. --- dlls/wbemprox/tests/query.c | 4 +++- dlls/wbemprox/wql.y | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index a7bf201..b46ff52 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -96,7 +96,9 @@ static void test_select( IWbemServices *services ) {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', 'D','i','s','k','D','r','i','v','e',' ','W','H','E','R','E',' ','D','e','v','i','c','e','I','D','=', '\"','\\','\\','\\','\\','.','\\','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0','\"',0}; - static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7, query8 }; + static const WCHAR query9[] = + {'S','E','L','E','C','T','\n','a','\r','F','R','O','M','\t','b',0}; + static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7, query8, query9 }; HRESULT hr; IEnumWbemClassObject *result; BSTR wql = SysAllocString( wqlW ); diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 6eabe19..734c4da 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -583,6 +583,7 @@ static int get_token( const WCHAR *s, int *token ) { case ' ': case '\t': + case '\r': case '\n': for (i = 1; isspaceW( s[i] ); i++) {} *token = TK_SPACE;

1 0

Nikolay Sivov : shell32/tests: Fix one of test failures on win2k.
by Alexandre Julliard June 4, 2015

June 4, 2015

Module: wine Branch: master Commit: 8c11e6b2f09edf9d32b88e7d9c876522e4ed177f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c11e6b2f09edf9d32b88e7d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 4 00:57:12 2015 +0300 shell32/tests: Fix one of test failures on win2k. --- 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 492d446..22eabf5 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -398,6 +398,7 @@ static void test_ShellFolderViewDual(void) &IID_IShellDispatch6, &IID_IShellDispatch5, &IID_IShellDispatch4, + &IID_IShellDispatch2, &IID_NULL }; IShellFolderViewDual *viewdual;

1 0

Nikolay Sivov : riched20/tests: Fix a BSTR leak (Valgrind).
by Alexandre Julliard June 4, 2015

June 4, 2015

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