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

Jacek Caban : ws2_32/tests: Added WSARecv tests using completion function.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: b9f6f3896a128cca1f396713216bdce03e79cc69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9f6f3896a128cca1f3967132… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 5 14:03:17 2017 +0200 ws2_32/tests: Added WSARecv tests using completion function. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 45 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c77f43b..023eb42 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6656,6 +6656,13 @@ static DWORD WINAPI recv_thread(LPVOID arg) return 0; } +static int completion_called; + +static void WINAPI io_completion(DWORD error, DWORD transferred, WSAOVERLAPPED *overlapped, DWORD flags) +{ + completion_called++; +} + static void test_WSARecv(void) { SOCKET src, dest, server = INVALID_SOCKET; @@ -6668,7 +6675,7 @@ static void test_WSARecv(void) int iret, len; DWORD dwret; BOOL bret; - HANDLE thread; + HANDLE thread, event = NULL, io_port; tcp_socketpair(&src, &dest); if (src == INVALID_SOCKET || dest == INVALID_SOCKET) @@ -6732,9 +6739,9 @@ static void test_WSARecv(void) ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); bufs[0].len = sizeof(buf); - ov.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + ov.hEvent = event = CreateEventA(NULL, FALSE, FALSE, NULL); ok(ov.hEvent != NULL, "could not create event object, errno = %d\n", GetLastError()); - if (!ov.hEvent) + if (!event) goto end; ling.l_onoff = 1; @@ -6795,6 +6802,34 @@ static void test_WSARecv(void) WaitForSingleObject(thread, 3000); CloseHandle(thread); + memset(&ov, 0, sizeof(ov)); + ov.hEvent = event; + ResetEvent(event); + iret = WSARecv(dest, bufs, 1, NULL, &flags, &ov, io_completion); + ok(iret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING, "WSARecv failed - %d error %d\n", iret, GetLastError()); + send(src, "test message", sizeof("test message"), 0); + + completion_called = 0; + dwret = SleepEx(1000, TRUE); + ok(dwret == WAIT_IO_COMPLETION, "got %u\n", dwret); + ok(completion_called == 1, "completion not called\n"); + + dwret = WaitForSingleObject(event, 1); + ok(dwret == WAIT_TIMEOUT, "got %u\n", dwret); + + io_port = CreateIoCompletionPort( (HANDLE)dest, NULL, 0, 0 ); + ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); + + /* Using completion function on socket associated with completion port is not allowed. */ + memset(&ov, 0, sizeof(ov)); + completion_called = 0; + iret = WSARecv(dest, bufs, 1, NULL, &flags, &ov, io_completion); + todo_wine + ok(iret == SOCKET_ERROR && GetLastError() == WSAEINVAL, "WSARecv failed - %d error %d\n", iret, GetLastError()); + ok(!completion_called, "completion called\n"); + + CloseHandle(io_port); + end: if (server != INVALID_SOCKET) closesocket(server); @@ -6802,8 +6837,8 @@ end: closesocket(dest); if (src != INVALID_SOCKET) closesocket(src); - if (ov.hEvent) - WSACloseEvent(ov.hEvent); + if (event) + WSACloseEvent(event); } #define POLL_CLEAR() ix = 0

1 0

Jacek Caban : ws2_32: Use register_async for WS2_async_recv.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: 57e93b72bb620306731ad44f5a2c9f88d913dd4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=57e93b72bb620306731ad44f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 5 13:38:03 2017 +0200 ws2_32: Use register_async for WS2_async_recv. This changes behaviour in case when winsock attempts to use both completion routine and completion value. Tests from previous patch show that it should fail anyway. It will be possible to properly return error once APCs are passed to server in register_async request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 702d281..2a957ce 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7792,18 +7792,12 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, iosb->u.Status = STATUS_PENDING; iosb->Information = 0; - SERVER_START_REQ( register_async ) - { - req->type = ASYNC_TYPE_READ; - req->async.handle = wine_server_obj_handle( wsa->hSocket ); - req->async.callback = wine_server_client_ptr( WS2_async_recv ); - req->async.iosb = wine_server_client_ptr( iosb ); - req->async.arg = wine_server_client_ptr( wsa ); - req->async.event = wine_server_obj_handle( lpCompletionRoutine ? 0 : lpOverlapped->hEvent ); - req->async.cvalue = cvalue; - err = wine_server_call( req ); - } - SERVER_END_REQ; + if (wsa->completion_func) + err = register_async( ASYNC_TYPE_READ, wsa->hSocket, WS2_async_recv, wsa, NULL, + ws2_async_apc, wsa, iosb ); + else + err = register_async( ASYNC_TYPE_READ, wsa->hSocket, WS2_async_recv, wsa, lpOverlapped->hEvent, + NULL, (void *)cvalue, iosb ); if (err != STATUS_PENDING) HeapFree( GetProcessHeap(), 0, wsa ); SetLastError(NtStatusToWSAError( err ));

1 0

Jacek Caban : ws2_32: Use register_async for WS2_async_send.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: 35ca862025fa14065d4ebed761783de225cb6690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35ca862025fa14065d4ebed76… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 5 13:38:17 2017 +0200 ws2_32: Use register_async for WS2_async_send. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2a957ce..22ff479 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3592,19 +3592,8 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n wsa->iovec[0].iov_base = sendBuf; wsa->iovec[0].iov_len = sendBufLen; - SERVER_START_REQ( register_async ) - { - req->type = ASYNC_TYPE_WRITE; - req->async.handle = wine_server_obj_handle( wsa->hSocket ); - req->async.callback = wine_server_client_ptr( WS2_async_send ); - req->async.iosb = wine_server_client_ptr( iosb ); - req->async.arg = wine_server_client_ptr( wsa ); - req->async.event = wine_server_obj_handle( ov->hEvent ); - req->async.cvalue = cvalue; - status = wine_server_call( req ); - } - SERVER_END_REQ; - + status = register_async( ASYNC_TYPE_WRITE, wsa->hSocket, WS2_async_send, wsa, ov->hEvent, + NULL, (void *)cvalue, iosb ); if (status != STATUS_PENDING) HeapFree(GetProcessHeap(), 0, wsa); /* If the connect already failed */ @@ -5609,18 +5598,12 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, iosb->u.Status = STATUS_PENDING; iosb->Information = n == -1 ? 0 : n; - SERVER_START_REQ( register_async ) - { - req->type = ASYNC_TYPE_WRITE; - req->async.handle = wine_server_obj_handle( wsa->hSocket ); - req->async.callback = wine_server_client_ptr( WS2_async_send ); - req->async.iosb = wine_server_client_ptr( iosb ); - req->async.arg = wine_server_client_ptr( wsa ); - req->async.event = wine_server_obj_handle( lpCompletionRoutine ? 0 : lpOverlapped->hEvent ); - req->async.cvalue = cvalue; - err = wine_server_call( req ); - } - SERVER_END_REQ; + if (wsa->completion_func) + err = register_async( ASYNC_TYPE_WRITE, wsa->hSocket, WS2_async_send, wsa, NULL, + ws2_async_apc, wsa, iosb ); + else + err = register_async( ASYNC_TYPE_WRITE, wsa->hSocket, WS2_async_send, wsa, lpOverlapped->hEvent, + NULL, (void *)cvalue, iosb ); /* Enable the event only after starting the async. The server will deliver it as soon as the async is done. */

1 0

Huw Davies : gdi32/tests: Prevent a crash if the shell dlg font is not found.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: 8dc039a7d150cc9f2f815ffe19542195dcb5ea03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dc039a7d150cc9f2f815ffe1… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 5 09:35:07 2017 +0100 gdi32/tests: Prevent a crash if the shell dlg font is not found. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index fb27f8e..0b8cfd5 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5305,10 +5305,13 @@ static void test_EnumFonts_subst(void) ret = EnumFontFamiliesExA(hdc, &lf, enum_ms_shell_dlg_proc, (LPARAM)&efnd, 0); ok(!ret, "MS Shell Dlg should be enumerated\n"); ok(efnd.total > 0, "MS Shell Dlg should be enumerated\n"); - ret = strcmp((const char *)efnd.elf[0].elfLogFont.lfFaceName, "MS Shell Dlg"); - ok(!ret, "expected MS Shell Dlg, got %s\n", efnd.elf[0].elfLogFont.lfFaceName); - ret = strcmp((const char *)efnd.elf[0].elfFullName, "MS Shell Dlg"); - ok(ret, "did not expect MS Shell Dlg\n"); + if (efnd.total) + { + ret = strcmp((const char *)efnd.elf[0].elfLogFont.lfFaceName, "MS Shell Dlg"); + ok(!ret, "expected MS Shell Dlg, got %s\n", efnd.elf[0].elfLogFont.lfFaceName); + ret = strcmp((const char *)efnd.elf[0].elfFullName, "MS Shell Dlg"); + ok(ret, "did not expect MS Shell Dlg\n"); + } efnd.total = 0; ret = EnumFontFamiliesExA(hdc, NULL, enum_ms_shell_dlg2_proc, (LPARAM)&efnd, 0); @@ -5320,10 +5323,13 @@ static void test_EnumFonts_subst(void) ret = EnumFontFamiliesExA(hdc, &lf, enum_ms_shell_dlg2_proc, (LPARAM)&efnd, 0); ok(!ret, "MS Shell Dlg 2 should be enumerated\n"); ok(efnd.total > 0, "MS Shell Dlg 2 should be enumerated\n"); - ret = strcmp((const char *)efnd.elf[0].elfLogFont.lfFaceName, "MS Shell Dlg 2"); - ok(!ret, "expected MS Shell Dlg 2, got %s\n", efnd.elf[0].elfLogFont.lfFaceName); - ret = strcmp((const char *)efnd.elf[0].elfFullName, "MS Shell Dlg 2"); - ok(ret, "did not expect MS Shell Dlg 2\n"); + if (efnd.total) + { + ret = strcmp((const char *)efnd.elf[0].elfLogFont.lfFaceName, "MS Shell Dlg 2"); + ok(!ret, "expected MS Shell Dlg 2, got %s\n", efnd.elf[0].elfLogFont.lfFaceName); + ret = strcmp((const char *)efnd.elf[0].elfFullName, "MS Shell Dlg 2"); + ok(ret, "did not expect MS Shell Dlg 2\n"); + } heap_free(efnd.elf); DeleteDC(hdc);

1 0

Alistair Leslie-Hughes : odbccp32: Implement SQLInstallTranslator.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: d687fc8f34b8cc20677c8082ca0b82a74dae2f50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d687fc8f34b8cc20677c8082c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 5 01:29:09 2017 +0000 odbccp32: Implement SQLInstallTranslator. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 13 ++++----- dlls/odbccp32/tests/misc.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 6 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 6a2c484..7b2f020 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -41,6 +41,7 @@ static const WCHAR drivers_key[] = {'S','o','f','t','w','a','r','e','\\','O','D' static const WCHAR odbcW[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C',0}; static const WCHAR odbcini[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','O','D','B','C','I','N','S','T','.','I','N','I','\\',0}; static const WCHAR odbcdrivers[] = {'O','D','B','C',' ','D','r','i','v','e','r','s',0}; +static const WCHAR odbctranslators[] = {'O','D','B','C',' ','T','r','a','n','s','l','a','t','o','r','s',0}; /* This config mode is known to be process-wide. * MSDN documentation suggests that the value is hidden somewhere in the registry but I haven't found it yet. @@ -636,6 +637,7 @@ static void write_registry_values(const WCHAR *regkey, const WCHAR *driver, cons static const WCHAR slash[] = {'\\', 0}; static const WCHAR driverW[] = {'D','r','i','v','e','r',0}; static const WCHAR setupW[] = {'S','e','t','u','p',0}; + static const WCHAR translator[] = {'T','r','a','n','s','l','a','t','o','r',0}; HKEY hkey, hkeydriver; if (RegCreateKeyW(HKEY_LOCAL_MACHINE, odbcini, &hkey) == ERROR_SUCCESS) @@ -684,8 +686,9 @@ static void write_registry_values(const WCHAR *regkey, const WCHAR *driver, cons divider++; TRACE("Writing pair %s,%s\n", debugstr_w(entry), debugstr_w(divider)); - /* Driver and Setup entries use the system path unless a path is specified. */ - if(lstrcmpiW(driverW, entry) == 0 || lstrcmpiW(setupW, entry) == 0) + /* Driver, Setup, Translator entries use the system path unless a path is specified. */ + if(lstrcmpiW(driverW, entry) == 0 || lstrcmpiW(setupW, entry) == 0 || + lstrcmpiW(translator, entry) == 0) { len = lstrlenW(path) + lstrlenW(slash) + lstrlenW(divider) + 1; value = heap_alloc(len * sizeof(WCHAR)); @@ -976,7 +979,6 @@ BOOL WINAPI SQLInstallTranslatorExW(LPCWSTR lpszTranslator, LPCWSTR lpszPathIn, WORD fRequest, LPDWORD lpdwUsageCount) { UINT len; - LPCWSTR p; WCHAR path[MAX_PATH]; clear_errors(); @@ -984,10 +986,9 @@ BOOL WINAPI SQLInstallTranslatorExW(LPCWSTR lpszTranslator, LPCWSTR lpszPathIn, debugstr_w(lpszPathIn), lpszPathOut, cbPathOutMax, pcbPathOut, fRequest, lpdwUsageCount); - for (p = lpszTranslator; *p; p += lstrlenW(p) + 1) - TRACE("%s\n", debugstr_w(p)); + write_registry_values(odbctranslators, lpszTranslator, lpszPathIn, path, lpdwUsageCount); - len = GetSystemDirectoryW(path, MAX_PATH); + len = lstrlenW(path); if (pcbPathOut) *pcbPathOut = len; diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index 35b9f35..7a6e8db 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -473,6 +473,72 @@ static void test_SQLInstallDriverEx(void) ok(cnt == 0, "SQLRemoveDriver failed %d\n", cnt); } +void test_SQLInstallTranslatorEx(void) +{ + char path[MAX_PATH]; + char syspath[MAX_PATH]; + WORD size = 0; + BOOL ret, sql_ret; + DWORD cnt, error_code = 0; + HKEY hkey; + LONG res; + + GetSystemDirectoryA(syspath, MAX_PATH); + + ret = SQLInstallTranslatorEx("WINE ODBC Translator\0Translator=sample.dll\0Setup=sample.dll\0", + NULL, path, MAX_PATH, &size, ODBC_INSTALL_COMPLETE, NULL); + sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + if (sql_ret && error_code == ODBC_ERROR_WRITING_SYSINFO_FAILED) + { + win_skip("not enough privileges\n"); + return; + } + ok(sql_ret && error_code == SQL_SUCCESS, "SQLInstallDriverEx failed %d, %u\n", sql_ret, error_code); + ok(!strcmp(path, syspath), "invalid path %s\n", path); + ok(size == strlen(path), "invalid length %d\n", size); + + ret = SQLInstallTranslatorEx("WINE ODBC Translator Path\0Translator=sample.dll\0Setup=sample.dll\0", + "c:\\temp", path, MAX_PATH, &size, ODBC_INSTALL_COMPLETE, NULL); + sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + ok(sql_ret && error_code == SQL_SUCCESS, "SQLInstallTranslatorEx failed %d, %u\n", sql_ret, error_code); + ok(!strcmp(path, "c:\\temp"), "invalid path %s\n", path); + ok(size == strlen(path), "invalid length %d\n", size); + + if(ret) + { + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBCINST.INI\\WINE ODBC Translator", 0, + KEY_READ, &hkey); + ok(res == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); + if (res == ERROR_SUCCESS) + { + DWORD type = 0xdeadbeef, size = MAX_PATH; + char driverpath[MAX_PATH]; + + strcpy(driverpath, syspath); + strcat(driverpath, "\\sample.dll"); + + memset(path, 0, sizeof(path)); + res = RegQueryValueExA(hkey, "Translator", NULL, &type, (BYTE *)path, &size); + ok(res == ERROR_SUCCESS, "RegGetValueA failed\n"); + ok(type == REG_SZ, "got %u\n", type); + ok(size == strlen(driverpath) + 1, "got %u\n", size); + ok(!strcmp(path, driverpath), "invalid path %s\n", path); + + RegCloseKey(hkey); + } + } + + cnt = 100; + ret = SQLRemoveTranslator("WINE ODBC Translator", &cnt); + todo_wine ok(ret, "SQLRemoveTranslator failed\n"); + todo_wine ok(cnt == 0, "SQLRemoveTranslator failed %d\n", cnt); + + cnt = 100; + ret = SQLRemoveTranslator("WINE ODBC Translator Path", &cnt); + todo_wine ok(ret, "SQLRemoveTranslator failed\n"); + todo_wine ok(cnt == 0, "SQLRemoveTranslator failed %d\n", cnt); +} + START_TEST(misc) { test_SQLConfigMode(); @@ -482,4 +548,5 @@ START_TEST(misc) test_SQLGetPrivateProfileString(); test_SQLGetPrivateProfileStringW(); test_SQLInstallDriverEx(); + test_SQLInstallTranslatorEx(); }

1 0

Nikolay Sivov : comctl32/tests: Some tests for TVM_SORTCHILDREN.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: 7fae248552070ab3bb94a6687199a7bf4147bd6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fae248552070ab3bb94a6687… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 5 11:39:02 2017 +0300 comctl32/tests: Some tests for TVM_SORTCHILDREN. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 190 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 190 insertions(+) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 8180a4f..19a5ac0 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -2396,6 +2396,195 @@ static void test_TVS_FULLROWSELECT(void) DestroyWindow(hwnd); } +static void get_item_names_string(HWND hwnd, HTREEITEM item, char *str) +{ + TVITEMA tvitem = { 0 }; + HTREEITEM child; + char name[16]; + + if (!item) + { + item = (HTREEITEM)SendMessageA(hwnd, TVM_GETNEXTITEM, TVGN_ROOT, 0); + str[0] = 0; + } + + child = (HTREEITEM)SendMessageA(hwnd, TVM_GETNEXTITEM, TVGN_CHILD, (LPARAM)item); + + tvitem.mask = TVIF_TEXT; + tvitem.hItem = item; + tvitem.pszText = name; + tvitem.cchTextMax = sizeof(name); + SendMessageA(hwnd, TVM_GETITEMA, 0, (LPARAM)&tvitem); + strcat(str, tvitem.pszText); + + while (child != NULL) + { + get_item_names_string(hwnd, child, str); + child = (HTREEITEM)SendMessageA(hwnd, TVM_GETNEXTITEM, TVGN_NEXT, (LPARAM)child); + } +} + +static void fill_treeview_sort_test(HWND hwnd) +{ + static const char *itemnames[] = + { + "root", "Wasp", "Caribou", "Vacuum", + "Ocelot", "Newspaper", "Litter bin" + }; + + HTREEITEM root, children[2]; + TVINSERTSTRUCTA ins; + unsigned i = 0; + + SendMessageA(hwnd, TVM_DELETEITEM, 0, 0); + + /* root, two children, with two children each */ + ins.hParent = TVI_ROOT; + ins.hInsertAfter = TVI_ROOT; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = (char *)itemnames[i++]; + root = (HTREEITEM)SendMessageA(hwnd, TVM_INSERTITEMA, 0, (LPARAM)&ins); + + ins.hParent = root; + ins.hInsertAfter = TVI_LAST; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = (char *)itemnames[i++]; + children[0] = (HTREEITEM)SendMessageA(hwnd, TVM_INSERTITEMA, 0, (LPARAM)&ins); + + U(ins).item.pszText = (char *)itemnames[i++]; + children[1] = (HTREEITEM)SendMessageA(hwnd, TVM_INSERTITEMA, 0, (LPARAM)&ins); + + ins.hParent = children[0]; + U(ins).item.pszText = (char *)itemnames[i++]; + SendMessageA(hwnd, TVM_INSERTITEMA, 0, (LPARAM)&ins); + + U(ins).item.pszText = (char *)itemnames[i++]; + SendMessageA(hwnd, TVM_INSERTITEMA, 0, (LPARAM)&ins); + + ins.hParent = children[1]; + U(ins).item.pszText = (char *)itemnames[i++]; + SendMessageA(hwnd, TVM_INSERTITEMA, 0, (LPARAM)&ins); + + U(ins).item.pszText = (char *)itemnames[i++]; + SendMessageA(hwnd, TVM_INSERTITEMA, 0, (LPARAM)&ins); +} + +static void test_TVM_SORTCHILDREN(void) +{ + static const char *initial_order = "rootWaspVacuumOcelotCaribouNewspaperLitter bin"; + static const char *sorted_order = "rootCaribouNewspaperLitter binWaspVacuumOcelot"; + TVINSERTSTRUCTA ins; + char buff[256]; + HTREEITEM root; + HWND hwnd; + BOOL ret; + + hwnd = create_treeview_control(0); + + /* call on empty tree */ + ret = SendMessageA(hwnd, TVM_SORTCHILDREN, 0, 0); + ok(!ret, "Unexpected ret value %d\n", ret); + + ret = SendMessageA(hwnd, TVM_SORTCHILDREN, 0, (LPARAM)TVI_ROOT); + ok(!ret, "Unexpected ret value %d\n", ret); + + /* add only root, sort from it */ + ins.hParent = TVI_ROOT; + ins.hInsertAfter = TVI_ROOT; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = (char *)"root"; + root = (HTREEITEM)SendMessageA(hwnd, TVM_INSERTITEMA, 0, (LPARAM)&ins); + ok(root != NULL, "Expected root node\n"); + + ret = SendMessageA(hwnd, TVM_SORTCHILDREN, 0, (LPARAM)root); + ok(!ret, "Unexpected ret value %d\n", ret); + + ret = SendMessageA(hwnd, TVM_SORTCHILDREN, TRUE, (LPARAM)root); + ok(!ret, "Unexpected ret value %d\n", ret); + + /* root, two children, with two children each */ + fill_treeview_sort_test(hwnd); + get_item_names_string(hwnd, NULL, buff); + ok(!strcmp(buff, initial_order), "Wrong initial order %s, expected %s\n", buff, initial_order); + + /* with NULL item nothing is sorted */ + fill_treeview_sort_test(hwnd); + ret = SendMessageA(hwnd, TVM_SORTCHILDREN, 0, 0); +todo_wine + ok(ret, "Unexpected ret value %d\n", ret); + get_item_names_string(hwnd, NULL, buff); + ok(!strcmp(buff, initial_order), "Wrong sorted order %s, expected %s\n", buff, initial_order); + + /* TVI_ROOT as item */ + fill_treeview_sort_test(hwnd); + ret = SendMessageA(hwnd, TVM_SORTCHILDREN, 0, (LPARAM)TVI_ROOT); +todo_wine + ok(ret, "Unexpected ret value %d\n", ret); + get_item_names_string(hwnd, NULL, buff); + ok(!strcmp(buff, initial_order), "Wrong sorted order %s, expected %s\n", buff, initial_order); + + /* zero WPARAM, item is specified */ + fill_treeview_sort_test(hwnd); + root = (HTREEITEM)SendMessageA(hwnd, TVM_GETNEXTITEM, TVGN_ROOT, 0); + ok(root != NULL, "Failed to get root item\n"); + ret = SendMessageA(hwnd, TVM_SORTCHILDREN, 0, (LPARAM)root); + ok(ret, "Unexpected ret value %d\n", ret); + get_item_names_string(hwnd, NULL, buff); + ok(!strcmp(buff, sorted_order), "Wrong sorted order %s, expected %s\n", buff, sorted_order); + + /* non-zero WPARAM, NULL item */ + fill_treeview_sort_test(hwnd); + ret = SendMessageA(hwnd, TVM_SORTCHILDREN, TRUE, 0); +todo_wine + ok(ret, "Unexpected ret value %d\n", ret); + get_item_names_string(hwnd, NULL, buff); + ok(!strcmp(buff, initial_order), "Wrong sorted order %s, expected %s\n", buff, sorted_order); + + /* TVI_ROOT as item */ + fill_treeview_sort_test(hwnd); + ret = SendMessageA(hwnd, TVM_SORTCHILDREN, TRUE, (LPARAM)TVI_ROOT); +todo_wine + ok(ret, "Unexpected ret value %d\n", ret); + get_item_names_string(hwnd, NULL, buff); + ok(!strcmp(buff, initial_order), "Wrong sorted order %s, expected %s\n", buff, sorted_order); + + /* non-zero WPARAM, item is specified */ + fill_treeview_sort_test(hwnd); + root = (HTREEITEM)SendMessageA(hwnd, TVM_GETNEXTITEM, TVGN_ROOT, 0); + ok(root != NULL, "Failed to get root item\n"); + ret = SendMessageA(hwnd, TVM_SORTCHILDREN, TRUE, (LPARAM)root); + ok(ret, "Unexpected ret value %d\n", ret); + get_item_names_string(hwnd, NULL, buff); + ok(!strcmp(buff, sorted_order), "Wrong sorted order %s, expected %s\n", buff, sorted_order); + + /* case insensitive comparison */ + SendMessageA(hwnd, TVM_DELETEITEM, 0, 0); + + ins.hParent = TVI_ROOT; + ins.hInsertAfter = TVI_ROOT; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = (char *)"root"; + root = (HTREEITEM)SendMessageA(hwnd, TVM_INSERTITEMA, 0, (LPARAM)&ins); + ok(root != NULL, "Expected root node\n"); + + ins.hParent = root; + ins.hInsertAfter = TVI_LAST; + U(ins).item.pszText = (char *)"I1"; + SendMessageA(hwnd, TVM_INSERTITEMA, 0, (LPARAM)&ins); + + ins.hParent = root; + ins.hInsertAfter = TVI_LAST; + U(ins).item.pszText = (char *)"i1"; + SendMessageA(hwnd, TVM_INSERTITEMA, 0, (LPARAM)&ins); + + ret = SendMessageA(hwnd, TVM_SORTCHILDREN, TRUE, (LPARAM)root); + ok(ret, "Unexpected ret value %d\n", ret); + get_item_names_string(hwnd, NULL, buff); + ok(!strcmp(buff, "rootI1i1"), "Wrong sorted order %s\n", buff); + + DestroyWindow(hwnd); +} + START_TEST(treeview) { HMODULE hComctl32; @@ -2472,6 +2661,7 @@ START_TEST(treeview) test_customdraw(); test_WM_KEYDOWN(); test_TVS_FULLROWSELECT(); + test_TVM_SORTCHILDREN(); if (!load_v6_module(&ctx_cookie, &hCtx)) {

1 0

Nikolay Sivov : dwrite: Classify direction control characters as complex.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: a42a9940cf310a9f083e80b0dcc671733b4e0f21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a42a9940cf310a9f083e80b0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 5 11:56:03 2017 +0300 dwrite: Classify direction control characters as complex. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 4 +++- dlls/dwrite/tests/analyzer.c | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 14a93e8..27a11f9 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1524,7 +1524,9 @@ static HRESULT WINAPI dwritetextanalyzer1_GetScriptProperties(IDWriteTextAnalyze static inline BOOL is_char_from_simple_script(WCHAR c) { - if (IS_HIGH_SURROGATE(c) || IS_LOW_SURROGATE(c)) + if (IS_HIGH_SURROGATE(c) || IS_LOW_SURROGATE(c) || + /* LRM, RLM, LRE, RLE, PDF, LRO, RLO */ + c == 0x200e || c == 0x200f || (c >= 0x202a && c <= 0x202e)) return FALSE; else { UINT16 script = get_char_script(c); diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index a0dbb186..21809ee 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1197,7 +1197,13 @@ static const struct textcomplexity_test textcomplexity_tests[] = { { {0x610,0x610,'C','D',0}, 2, FALSE, 2 }, { {0xd800,'A','B',0}, 1, FALSE, 1 }, { {0xd800,'A','B',0}, 2, FALSE, 1 }, - { {0xdc00,'A','B',0}, 2, FALSE, 1 } + { {0xdc00,'A','B',0}, 2, FALSE, 1 }, + { {0x202a,'A',0x202c,0}, 3, FALSE, 1 }, + { {0x200e,'A',0}, 2, FALSE, 1 }, + { {0x200f,'A',0}, 2, FALSE, 1 }, + { {0x202d,'A',0}, 2, FALSE, 1 }, + { {0x202e,'A',0}, 2, FALSE, 1 }, + }; static void test_GetTextComplexity(void)

1 0

Nikolay Sivov : dwrite/tests: Test number of lines for a failing drawing test.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: 862503df704c7033e9fda2480df3973f0ec57382 URL: http://source.winehq.org/git/wine.git/?a=commit;h=862503df704c7033e9fda2480… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 5 11:56:04 2017 +0300 dwrite/tests: Test number of lines for a failing drawing test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index daffd81..ecc57df 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1636,6 +1636,10 @@ static void test_Draw(void) hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0, 0.0); ok(hr == S_OK, "got 0x%08x\n", hr); ok_sequence(sequences, RENDERER_ID, draw_seq2, "draw test 2", TRUE); + hr = IDWriteTextLayout_GetMetrics(layout, &tm); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(tm.lineCount == 6, "got %u\n", tm.lineCount); IDWriteTextLayout_Release(layout); /* string with control characters */

1 0

Nikolay Sivov : dwrite/tests: Some bidi resolution tests.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: 98a8989908bd9eca06fed22368e4e61049c65e27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98a8989908bd9eca06fed2236… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 5 11:56:05 2017 +0300 dwrite/tests: Some bidi resolution tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 141 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 135 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 21809ee..7af19d7 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -34,6 +34,16 @@ static IDWriteFactory *factory; static const WCHAR test_fontfile[] = {'w','i','n','e','_','t','e','s','t','_','f','o','n','t','.','t','t','f',0}; +#define LRE 0x202a +#define RLE 0x202b +#define PDF 0x202c +#define LRO 0x202d +#define RLO 0x202e +#define LRI 0x2066 +#define RLI 0x2067 +#define FSI 0x2068 +#define PDI 0x2069 + enum analysis_kind { ScriptAnalysis, LastKind @@ -894,14 +904,14 @@ static struct sa_test sa_tests[] = { }, { /* LRE/PDF */ - {0x202a,0x202c,'a','b','c','\r',0}, 3, + {LRE,PDF,'a','b','c','\r',0}, 3, { { 0, 2, DWRITE_SCRIPT_SHAPES_NO_VISUAL }, { 2, 3, DWRITE_SCRIPT_SHAPES_DEFAULT }, { 5, 1, DWRITE_SCRIPT_SHAPES_NO_VISUAL } } }, { /* LRE/PDF and other visual and non-visual codes from Common script range */ - {0x202a,0x202c,'r','!',0x200b,'\r',0}, 3, + {LRE,PDF,'r','!',0x200b,'\r',0}, 3, { { 0, 2, DWRITE_SCRIPT_SHAPES_NO_VISUAL }, { 2, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }, { 4, 2, DWRITE_SCRIPT_SHAPES_NO_VISUAL } } @@ -2227,6 +2237,7 @@ struct bidi_test DWRITE_READING_DIRECTION direction; UINT8 explicit[BIDI_LEVELS_COUNT]; UINT8 resolved[BIDI_LEVELS_COUNT]; + BOOL todo; }; static const struct bidi_test bidi_tests[] = { @@ -2267,14 +2278,132 @@ static const struct bidi_test bidi_tests[] = { { 0, 0, 0 } }, { + { LRE, PDF, 'a', 'b', 0 }, + DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, + { 2, 2, 0, 0 }, + { 0, 0, 0, 0 }, + TRUE + }, + { + { 'a', LRE, PDF, 'b', 0 }, + DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, + { 0, 2, 2, 0 }, + { 0, 0, 0, 0 }, + TRUE + }, + { + { RLE, PDF, 'a', 'b', 0 }, + DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, + { 1, 1, 0, 0 }, + { 0, 0, 0, 0 }, + TRUE + }, + { + { 'a', RLE, PDF, 'b', 0 }, + DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, + { 0, 1, 1, 0 }, + { 0, 0, 0, 0 }, + TRUE + }, + { + { 'a', RLE, PDF, 'b', 0 }, + DWRITE_READING_DIRECTION_RIGHT_TO_LEFT, + { 1, 3, 3, 1 }, + { 2, 2, 2, 2 }, + TRUE + }, + { + { LRE, PDF, 'a', 'b', 0 }, + DWRITE_READING_DIRECTION_RIGHT_TO_LEFT, + { 2, 2, 1, 1 }, + { 1, 1, 2, 2 }, + TRUE + }, + { + { PDF, 'a', 'b', 0 }, + DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 } + }, + { + { LRE, 'a', 'b', PDF, 0 }, + DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, + { 2, 2, 2, 2 }, + { 0, 2, 2, 2 }, + TRUE + }, + { + { LRI, 'a', 'b', PDI, 0 }, + DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + TRUE + }, + { + { RLI, 'a', 'b', PDI, 0 }, + DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + TRUE + }, + { { 0 } } }; -static void compare_bidi_levels(const struct bidi_test *test, UINT32 len, UINT8 *explicit, UINT8 *resolved) +static void compare_bidi_levels(unsigned int seq, const struct bidi_test *test, UINT32 len, UINT8 *explicit, UINT8 *resolved) { - ok(!memcmp(explicit, test->explicit, len), "wrong explicit levels\n"); - ok(!memcmp(resolved, test->resolved, len), "wrong resolved levels\n"); + unsigned int i, failcount = 0; + BOOL match; + + match = !memcmp(explicit, test->explicit, len); + if (!match) { + if (test->todo) { + failcount++; + todo_wine + ok(0, "test %u: %s wrong explicit levels:\n", seq, wine_dbgstr_w(test->text)); + } + else + ok(0, "test %u: %s wrong explicit levels:\n", seq, wine_dbgstr_w(test->text)); + + for (i = 0; i < len; i++) { + if (test->explicit[i] != explicit[i]) { + if (test->todo) { + failcount++; + todo_wine + ok(0, "\tat %u, explicit level %u, expected %u\n", i, explicit[i], test->explicit[i]); + } + else + ok(0, "\tat %u, explicit level %u, expected %u\n", i, explicit[i], test->explicit[i]); + } + } + } + + match = !memcmp(resolved, test->resolved, len); + if (!match) { + if (test->todo) { + failcount++; + todo_wine + ok(0, "test %u: %s wrong resolved levels:\n", seq, wine_dbgstr_w(test->text)); + } + else + ok(0, "test %u: %s wrong resolved levels:\n", seq, wine_dbgstr_w(test->text)); + + for (i = 0; i < len; i++) { + if (test->resolved[i] != resolved[i]) { + if (test->todo) { + failcount++; + todo_wine + ok(0, "\tat %u, resolved level %u, expected %u\n", i, resolved[i], test->resolved[i]); + } + else + ok(0, "\tat %u, resolved level %u, expected %u\n", i, resolved[i], test->resolved[i]); + } + } + } + + todo_wine_if(test->todo && failcount == 0) + ok(1, "test %u: marked as \"todo_wine\" but succeeds\n", seq); } static void test_AnalyzeBidi(void) @@ -2307,7 +2436,7 @@ static void test_AnalyzeBidi(void) hr = IDWriteTextAnalyzer_AnalyzeBidi(analyzer, &analysissource.IDWriteTextAnalysisSource_iface, 0, len, &analysissink); ok(hr == S_OK, "%u: got 0x%08x\n", i, hr); - compare_bidi_levels(ptr, len, g_explicit_levels, g_resolved_levels); + compare_bidi_levels(i, ptr, len, g_explicit_levels, g_resolved_levels); i++; ptr++;

1 0

Nikolay Sivov : dwrite: Fix explicit levels returned for LRE and RLE control characters.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: abfc973c85290d8c30bf0c7d19b03a2ef85e7208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abfc973c85290d8c30bf0c7d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 5 11:56:06 2017 +0300 dwrite: Fix explicit levels returned for LRE and RLE control characters. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/bidi.c | 4 ++-- dlls/dwrite/tests/analyzer.c | 6 ------ dlls/dwrite/tests/layout.c | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/bidi.c b/dlls/dwrite/bidi.c index 3a7367e..d4ee2ca 100644 --- a/dlls/dwrite/bidi.c +++ b/dlls/dwrite/bidi.c @@ -278,7 +278,7 @@ static void bidi_resolve_explicit(UINT8 baselevel, UINT8 *classes, UINT8 *levels /* X2 */ case RLE: least_odd = get_greater_odd_level(stack[stack_top].level); - levels[i] = stack[stack_top].level; + levels[i] = valid_level(least_odd) ? least_odd : stack[stack_top].level; if (valid_level(least_odd)) push_stack(least_odd, NI, FALSE); else if (overflow_isolate_count == 0) @@ -288,7 +288,7 @@ static void bidi_resolve_explicit(UINT8 baselevel, UINT8 *classes, UINT8 *levels /* X3 */ case LRE: least_even = get_greater_even_level(stack[stack_top].level); - levels[i] = stack[stack_top].level; + levels[i] = valid_level(least_even) ? least_even : stack[stack_top].level; if (valid_level(least_even)) push_stack(least_even, NI, FALSE); else if (overflow_isolate_count == 0) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 7af19d7..2e2a2e9 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -2282,42 +2282,36 @@ static const struct bidi_test bidi_tests[] = { DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, { 2, 2, 0, 0 }, { 0, 0, 0, 0 }, - TRUE }, { { 'a', LRE, PDF, 'b', 0 }, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, { 0, 2, 2, 0 }, { 0, 0, 0, 0 }, - TRUE }, { { RLE, PDF, 'a', 'b', 0 }, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, { 1, 1, 0, 0 }, { 0, 0, 0, 0 }, - TRUE }, { { 'a', RLE, PDF, 'b', 0 }, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, { 0, 1, 1, 0 }, { 0, 0, 0, 0 }, - TRUE }, { { 'a', RLE, PDF, 'b', 0 }, DWRITE_READING_DIRECTION_RIGHT_TO_LEFT, { 1, 3, 3, 1 }, { 2, 2, 2, 2 }, - TRUE }, { { LRE, PDF, 'a', 'b', 0 }, DWRITE_READING_DIRECTION_RIGHT_TO_LEFT, { 2, 2, 1, 1 }, { 1, 1, 2, 2 }, - TRUE }, { { PDF, 'a', 'b', 0 }, diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index ecc57df..38b818c 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1648,7 +1648,7 @@ todo_wine flush_sequence(sequences, RENDERER_ID); hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0, 0.0); ok(hr == S_OK, "got 0x%08x\n", hr); - ok_sequence(sequences, RENDERER_ID, draw_seq3, "draw test 3", TRUE); + ok_sequence(sequences, RENDERER_ID, draw_seq3, "draw test 3", FALSE); IDWriteTextLayout_Release(layout); /* strikethrough splits ranges from renderer point of view, but doesn't break

1 0