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

Thomas Faller : cmd: Fix invalid memory access.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 4e91fa5f6b82109540ae16b7ed1db86e27f43394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e91fa5f6b82109540ae16b7e… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Sun Jun 14 21:40:26 2015 +0200 cmd: Fix invalid memory access. --- programs/cmd/wcmdmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 36d2ec1..1e42c47 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1330,7 +1330,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, * Changing default drive has to be handled as a special case. */ - if ((cmd[1] == ':') && IsCharAlphaW(cmd[0]) && (strlenW(cmd) == 2)) { + if ((strlenW(cmd) == 2) && (cmd[1] == ':') && IsCharAlphaW(cmd[0])) { WCHAR envvar[5]; WCHAR dir[MAX_PATH];

1 0

Piotr Caban : msvcrt: Add _ungetwch implementation.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 27b7ff73e47fd50b9bf745f35d356770d51e7743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b7ff73e47fd50b9bf745f35… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jun 14 14:31:32 2015 +0200 msvcrt: Add _ungetwch implementation. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/console.c | 22 ++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 9 files changed, 35 insertions(+), 13 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index ce36cdf..b41037a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1412,8 +1412,8 @@ @ cdecl _ungetch(long) @ cdecl _ungetch_nolock(long) @ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock -@ stub _ungetwch -@ stub _ungetwch_nolock +@ cdecl _ungetwch(long) +@ cdecl _ungetwch_nolock(long) @ cdecl _unlink(str) MSVCRT__unlink @ cdecl _unloaddll(long) @ cdecl _unlock(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 8cf1202..eed8601 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1770,8 +1770,8 @@ @ cdecl _ungetch(long) @ cdecl _ungetch_nolock(long) @ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock -@ stub _ungetwch -@ stub _ungetwch_nolock +@ cdecl _ungetwch(long) +@ cdecl _ungetwch_nolock(long) @ cdecl _unlink(str) MSVCRT__unlink @ cdecl _unloaddll(long) @ cdecl _unlock(long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index bbf8f90..2c2b866 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1784,8 +1784,8 @@ @ cdecl _ungetch(long) @ cdecl _ungetch_nolock(long) @ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock -@ stub _ungetwch -@ stub _ungetwch_nolock +@ cdecl _ungetwch(long) +@ cdecl _ungetwch_nolock(long) @ cdecl _unlink(str) MSVCRT__unlink @ cdecl _unloaddll(long) @ cdecl _unlock(long) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 299a645..eb3464b 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -578,7 +578,7 @@ @ cdecl _ultow(long ptr long) ntdll._ultow @ cdecl _umask(long) MSVCRT__umask @ cdecl _ungetch(long) -@ stub _ungetwch +@ cdecl _ungetwch(long) @ cdecl _unlink(str) MSVCRT__unlink @ cdecl _unloaddll(long) @ cdecl _unlock(long) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 4741b85..92c71c3 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -574,7 +574,7 @@ @ cdecl _ultow(long ptr long) ntdll._ultow @ cdecl _umask(long) MSVCRT__umask @ cdecl _ungetch(long) -@ stub _ungetwch +@ cdecl _ungetwch(long) @ cdecl _unlink(str) MSVCRT__unlink @ cdecl _unloaddll(long) @ cdecl _unlock(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8f1f6f9..23bded4a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1092,8 +1092,8 @@ @ cdecl _ungetch(long) @ cdecl _ungetch_nolock(long) @ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock -@ stub _ungetwch -@ stub _ungetwch_nolock +@ cdecl _ungetwch(long) +@ cdecl _ungetwch_nolock(long) @ cdecl _unlink(str) MSVCRT__unlink @ cdecl _unloaddll(long) @ cdecl _unlock(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 109e2ad..32d850a 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1067,8 +1067,8 @@ @ cdecl _ungetch(long) @ cdecl _ungetch_nolock(long) @ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock -@ stub _ungetwch -@ stub _ungetwch_nolock +@ cdecl _ungetwch(long) +@ cdecl _ungetwch_nolock(long) @ cdecl _unlink(str) MSVCRT__unlink @ cdecl _unloaddll(long) @ cdecl _unlock(long) diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 59b1dbb..154e78c 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -439,6 +439,28 @@ int CDECL _ungetch(int c) } /********************************************************************* + * _ungetwch_nolock (MSVCR80.@) + */ +MSVCRT_wchar_t CDECL _ungetwch_nolock(MSVCRT_wchar_t c) +{ + MSVCRT_wchar_t retval = MSVCRT_WEOF; + if (c != MSVCRT_WEOF && __MSVCRT_console_buffer_w == MSVCRT_WEOF) + retval = __MSVCRT_console_buffer_w = c; + return retval; +} + +/********************************************************************* + * _ungetwch (MSVCRT.@) + */ +MSVCRT_wchar_t CDECL _ungetwch(MSVCRT_wchar_t c) +{ + LOCK_CONSOLE; + c = _ungetwch_nolock(c); + UNLOCK_CONSOLE; + return c; +} + +/********************************************************************* * _kbhit (MSVCRT.@) */ int CDECL _kbhit(void) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b81ebf9..d7a5878 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1025,7 +1025,7 @@ @ cdecl _umask(long) MSVCRT__umask # stub _umask_s(long ptr) @ cdecl _ungetch(long) -# stub _ungetwch(long) +@ cdecl _ungetwch(long) @ cdecl _unlink(str) MSVCRT__unlink @ cdecl _unloaddll(long) @ cdecl _unlock(long)

1 0

Piotr Caban : msvcrt: Fix return value of cputws.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: de68efdb7d69e03a91db8b61c33f3465bd324ade URL: http://source.winehq.org/git/wine.git/?a=commit;h=de68efdb7d69e03a91db8b61c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jun 14 14:31:08 2015 +0200 msvcrt: Fix return value of cputws. --- dlls/msvcrt/console.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 85fe7e0..e8eea7f 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -88,11 +88,14 @@ int CDECL _cputs(const char* str) int CDECL _cputws(const MSVCRT_wchar_t* str) { DWORD count; - int retval = MSVCRT_EOF; + int len, retval = -1; + + if (!MSVCRT_CHECK_PMT(str != NULL)) return -1; + len = lstrlenW(str); LOCK_CONSOLE; - if (WriteConsoleW(MSVCRT_console_out, str, lstrlenW(str), &count, NULL) - && count == 1) + if (WriteConsoleW(MSVCRT_console_out, str, len, &count, NULL) + && count == len) retval = 0; UNLOCK_CONSOLE; return retval;

1 0

Piotr Caban : msvcrt: Write directly to the console in _putwch.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: eb9e00857a7a2f6caedbc6041454ae18e7e59052 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb9e00857a7a2f6caedbc6041… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jun 14 14:30:51 2015 +0200 msvcrt: Write directly to the console in _putwch. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/console.c | 22 ++++++++++++++++++++++ dlls/msvcrt/file.c | 8 -------- dlls/msvcrt/msvcrt.spec | 2 +- 10 files changed, 35 insertions(+), 21 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 194554b..3e4badc 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1239,8 +1239,8 @@ @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw @ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock -@ cdecl _putwch(long) MSVCRT__putwch -@ stub _putwch_nolock +@ cdecl _putwch(long) +@ cdecl _putwch_nolock(long) @ cdecl _putws(wstr) MSVCRT__putws # extern _pwctype @ cdecl _read(long ptr long) MSVCRT__read diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 9114632..25efacd 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1597,8 +1597,8 @@ @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw @ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock -@ cdecl _putwch(long) MSVCRT__putwch -@ stub _putwch_nolock +@ cdecl _putwch(long) +@ cdecl _putwch_nolock(long) @ cdecl _putws(wstr) MSVCRT__putws # extern _pwctype @ cdecl _read(long ptr long) MSVCRT__read diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 9537d79..148b378 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1605,8 +1605,8 @@ @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw @ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock -@ cdecl _putwch(long) MSVCRT__putwch -@ stub _putwch_nolock +@ cdecl _putwch(long) +@ cdecl _putwch_nolock(long) @ cdecl _putws(wstr) MSVCRT__putws # extern _pwctype @ cdecl _read(long ptr long) MSVCRT__read diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index c494ce0..51415a9 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -495,7 +495,7 @@ @ cdecl _putch(long) @ cdecl _putenv(str) @ cdecl _putw(long ptr) MSVCRT__putw -@ cdecl _putwch(long) MSVCRT__putwch +@ cdecl _putwch(long) @ cdecl _putws(wstr) MSVCRT__putws # extern _pwctype @ cdecl _read(long ptr long) MSVCRT__read diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index f8a52f1..a28725b 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -490,7 +490,7 @@ @ cdecl _putch(long) @ cdecl _putenv(str) @ cdecl _putw(long ptr) MSVCRT__putw -@ cdecl _putwch(long) MSVCRT__putwch +@ cdecl _putwch(long) @ cdecl _putws(wstr) MSVCRT__putws # extern _pwctype @ cdecl _read(long ptr long) MSVCRT__read diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 00f7ab2..3c1bb87 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -914,8 +914,8 @@ @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw @ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock -@ cdecl _putwch(long) MSVCRT__putwch -@ stub _putwch_nolock +@ cdecl _putwch(long) +@ cdecl _putwch_nolock(long) @ cdecl _putws(wstr) MSVCRT__putws # extern _pwctype @ cdecl _read(long ptr long) MSVCRT__read diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9384a3f..547f668 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -889,8 +889,8 @@ @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw @ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock -@ cdecl _putwch(long) MSVCRT__putwch -@ stub _putwch_nolock +@ cdecl _putwch(long) +@ cdecl _putwch_nolock(long) @ cdecl _putws(wstr) MSVCRT__putws # extern _pwctype @ cdecl _read(long ptr long) MSVCRT__read diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 3da7fb8..d6bd40e 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -218,6 +218,28 @@ int CDECL _putch(int c) } /********************************************************************* + * _putwch_nolock (MSVCR80.@) + */ +MSVCRT_wchar_t CDECL _putwch_nolock(MSVCRT_wchar_t c) +{ + DWORD count; + if (WriteConsoleW(MSVCRT_console_out, &c, 1, &count, NULL) && count==1) + return c; + return MSVCRT_WEOF; +} + +/********************************************************************* + * _putwch (MSVCRT.@) + */ +MSVCRT_wchar_t CDECL _putwch(MSVCRT_wchar_t c) +{ + LOCK_CONSOLE; + c = _putwch_nolock(c); + UNLOCK_CONSOLE; + return c; +} + +/********************************************************************* * _getche_nolock (MSVCR80.@) */ int CDECL _getche_nolock(void) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1069cf7..241c337 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4631,14 +4631,6 @@ int CDECL MSVCRT_putchar(int c) } /********************************************************************* - * _putwch (MSVCRT.@) - */ -int CDECL MSVCRT__putwch(int c) -{ - return MSVCRT_fputwc(c, MSVCRT_stdout); -} - -/********************************************************************* * puts (MSVCRT.@) */ int CDECL MSVCRT_puts(const char *s) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 1f2a8ce..46cbf08 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -861,7 +861,7 @@ @ cdecl _putenv(str) @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw -@ cdecl _putwch(long) MSVCRT__putwch +@ cdecl _putwch(long) @ cdecl _putws(wstr) MSVCRT__putws # extern _pwctype @ cdecl _read(long ptr long) MSVCRT__read

1 0

Nikolay Sivov : regedit: Make it possible for save/ restore position on tree root.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 6827724e54c49a5f15993ba7e24dddafa68e8502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6827724e54c49a5f15993ba7e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 13 19:26:22 2015 +0300 regedit: Make it possible for save/restore position on tree root. --- programs/regedit/childwnd.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 6dc7d0c..55b11de 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -243,7 +243,14 @@ static void get_last_key(HWND hwndTV) if (RegCreateKeyExW(HKEY_CURRENT_USER, wszKeyName, 0, NULL, 0, KEY_READ, NULL, &hkey, NULL) == ERROR_SUCCESS) { if (RegQueryValueExW(hkey, wszLastKey, NULL, NULL, (LPBYTE)wszVal, &dwSize) == ERROR_SUCCESS) - SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)FindPathInTree(hwndTV, wszVal)); + { + HTREEITEM selection; + if (!strcmpW(wszVal, g_pChildWnd->szPath)) + selection = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_ROOT, 0); + else + selection = FindPathInTree(hwndTV, wszVal); + SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)selection); + } RegCloseKey(hkey); } @@ -258,15 +265,20 @@ static void get_last_key(HWND hwndTV) static void set_last_key(HWND hwndTV) { HKEY hkey; - WCHAR *wszVal; if (RegCreateKeyExW(HKEY_CURRENT_USER, wszKeyName, 0, NULL, 0, KEY_WRITE, NULL, &hkey, NULL) == ERROR_SUCCESS) { HTREEITEM selection = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_CARET, 0); - - wszVal = GetItemFullPath(g_pChildWnd->hTreeWnd, selection, FALSE); - RegSetValueExW(hkey, wszLastKey, 0, REG_SZ, (LPBYTE)wszVal, (lstrlenW(wszVal) + 1) * sizeof(WCHAR)); - HeapFree(GetProcessHeap(), 0, wszVal); + HTREEITEM root = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_ROOT, 0); + WCHAR *value; + + if (selection == root) + value = g_pChildWnd->szPath; + else + value = GetItemFullPath(g_pChildWnd->hTreeWnd, selection, FALSE); + RegSetValueExW(hkey, wszLastKey, 0, REG_SZ, (LPBYTE)value, (lstrlenW(value) + 1) * sizeof(WCHAR)); + if (selection != root) + HeapFree(GetProcessHeap(), 0, value); RegCloseKey(hkey); } }

1 0

Marcus Meissner : shlwapi: Add missing braces (Coverity).
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: a2869de4d40b94e6a4dfdda214ec97e078db0f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2869de4d40b94e6a4dfdda21… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jun 13 07:49:23 2015 +0200 shlwapi: Add missing braces (Coverity). --- dlls/shlwapi/ordinal.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 68b66e3..df15c40 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -1407,9 +1407,11 @@ HRESULT WINAPI IUnknown_GetClassID(IUnknown *lpUnknown, CLSID *clsid) hr = IUnknown_QueryInterface(lpUnknown, &IID_IPersist, (void**)&persist); if (hr != S_OK) + { hr = IUnknown_QueryInterface(lpUnknown, &IID_IPersistFolder, (void**)&persist); if (hr != S_OK) return hr; + } hr = IPersist_GetClassID(persist, clsid); IPersist_Release(persist);

1 0

Piotr Caban : msvcp60: Sync spec files.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 7c4f2b91d607c8c74b31f50080152dc2afcee10b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c4f2b91d607c8c74b31f5008… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 12 16:49:08 2015 +0200 msvcp60: Sync spec files. --- dlls/msvcp60/msvcp60.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 2658014..4ba1584 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -1363,8 +1363,8 @@ @ stub -arch=win64 ??5std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@AEAV?$complex(a)O@0@@Z @ stub -arch=win32 ??5std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@PAF(a)Z @ stub -arch=win64 ??5std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@PEAF(a)Z -@ stub -arch=win32 ??5std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@PAG(a)Z -@ stub -arch=win64 ??5std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@PEAG(a)Z +@ cdecl -arch=win32 ??5std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@PAG(a)Z(ptr ptr) basic_istream_wchar_read_ch +@ cdecl -arch=win64 ??5std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@PEAG(a)Z(ptr ptr) basic_istream_wchar_read_ch @ thiscall -arch=win32 ??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)F@Z(ptr long) basic_ostream_char_print_short @ cdecl -arch=win64 ??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)F@Z(ptr long) basic_ostream_char_print_short @ thiscall -arch=win32 ??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)G@Z(ptr long) basic_ostream_char_print_ushort @@ -1435,12 +1435,12 @@ @ cdecl -arch=win64 ??6?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV01(a)_N@Z(ptr long) basic_ostream_short_print_bool @ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_ostream_char_print_bstr @ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_ostream_char_print_bstr -@ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)M@0@@Z -@ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$complex(a)M@0@@Z -@ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)N@0@@Z -@ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$complex(a)N@0@@Z -@ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)O@0@@Z -@ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$complex(a)O@0@@Z +@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)M@0@@Z(ptr ptr) basic_ostream_char_print_complex_float +@ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$complex(a)M@0@@Z(ptr ptr) basic_ostream_char_print_complex_float +@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)N@0@@Z(ptr ptr) basic_ostream_char_print_complex_double +@ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$complex(a)N@0@@Z(ptr ptr) basic_ostream_char_print_complex_double +@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)O@0@@Z(ptr ptr) basic_ostream_char_print_complex_ldouble +@ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$complex(a)O@0@@Z(ptr ptr) basic_ostream_char_print_complex_ldouble @ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@C(a)Z(ptr long) basic_ostream_char_print_ch @ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@C(a)Z(ptr long) basic_ostream_char_print_ch @ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@D(a)Z(ptr long) basic_ostream_char_print_ch

1 0

Jacek Caban : scrrun: Added IFile::put_Attributes imeplementation.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: dd26d1f9811c9c9c4c81801718a80caf77cf075f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd26d1f9811c9c9c4c8180171… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 12 15:46:36 2015 +0200 scrrun: Added IFile::put_Attributes imeplementation. --- dlls/scrrun/filesystem.c | 6 ++++-- dlls/scrrun/tests/filesystem.c | 28 ++++++++++++++++++++++++---- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 8b771c7..d490d93 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -2645,8 +2645,10 @@ static HRESULT WINAPI file_get_Attributes(IFile *iface, FileAttribute *pfa) static HRESULT WINAPI file_put_Attributes(IFile *iface, FileAttribute pfa) { struct file *This = impl_from_IFile(iface); - FIXME("(%p)->(%x)\n", This, pfa); - return E_NOTIMPL; + + TRACE("(%p)->(%x)\n", This, pfa); + + return SetFileAttributesW(This->path, pfa) ? S_OK : create_error(GetLastError()); } static HRESULT WINAPI file_get_DateCreated(IFile *iface, DATE *pdate) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index db7c338..b22e006 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -542,7 +542,7 @@ static void test_GetFile(void) WCHAR pathW[MAX_PATH]; FileAttribute fa; VARIANT size; - DWORD gfa; + DWORD gfa, new_gfa; IFile *file; HRESULT hr; HANDLE hf; @@ -580,10 +580,30 @@ static void test_GetFile(void) ok(!lstrcmpW(str, pathW), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); +#define FILE_ATTR_MASK (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | \ + FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_ARCHIVE | \ + FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_COMPRESSED) + + hr = IFile_get_Attributes(file, &fa); + gfa = GetFileAttributesW(pathW) & FILE_ATTR_MASK; + ok(hr == S_OK, "get_Attributes returned %x, expected S_OK\n", hr); + ok(fa == gfa, "fa = %x, expected %x\n", fa, gfa); + + hr = IFile_put_Attributes(file, gfa | FILE_ATTRIBUTE_READONLY); + ok(hr == S_OK, "put_Attributes failed: %08x\n", hr); + new_gfa = GetFileAttributesW(pathW) & FILE_ATTR_MASK; + ok(new_gfa == (gfa|FILE_ATTRIBUTE_READONLY), "new_gfa = %x, expected %x\n", new_gfa, gfa|FILE_ATTRIBUTE_READONLY); + + hr = IFile_get_Attributes(file, &fa); + ok(hr == S_OK, "get_Attributes returned %x, expected S_OK\n", hr); + ok(fa == new_gfa, "fa = %x, expected %x\n", fa, new_gfa); + + hr = IFile_put_Attributes(file, gfa); + ok(hr == S_OK, "put_Attributes failed: %08x\n", hr); + new_gfa = GetFileAttributesW(pathW) & FILE_ATTR_MASK; + ok(new_gfa == gfa, "new_gfa = %x, expected %x\n", new_gfa, gfa); + hr = IFile_get_Attributes(file, &fa); - gfa = GetFileAttributesW(pathW) & (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | - FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_ARCHIVE | - FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_COMPRESSED); ok(hr == S_OK, "get_Attributes returned %x, expected S_OK\n", hr); ok(fa == gfa, "fa = %x, expected %x\n", fa, gfa);

1 0

Nikolay Sivov : dwrite: Check format directions in CreateEllipsisTrimmingSign().
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 6304a0f50a4852109e0ca78e23f4e9d853d290d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6304a0f50a4852109e0ca78e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 15 00:39:32 2015 +0300 dwrite: Check format directions in CreateEllipsisTrimmingSign(). --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/layout.c | 47 +++++++++++++++++++++++++++++++- dlls/dwrite/main.c | 4 +-- dlls/dwrite/tests/layout.c | 64 +++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 112 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index cd6d08c..a692e38 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -103,7 +103,7 @@ extern HRESULT create_textformat(const WCHAR*,IDWriteFontCollection*,DWRITE_FONT FLOAT,const WCHAR*,IDWriteTextFormat**) DECLSPEC_HIDDEN; extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextFormat*,FLOAT,FLOAT,IDWriteTextLayout**) DECLSPEC_HIDDEN; extern HRESULT create_gdicompat_textlayout(const WCHAR*,UINT32,IDWriteTextFormat*,FLOAT,FLOAT,FLOAT,const DWRITE_MATRIX*,BOOL,IDWriteTextLayout**) DECLSPEC_HIDDEN; -extern HRESULT create_trimmingsign(IDWriteInlineObject**) DECLSPEC_HIDDEN; +extern HRESULT create_trimmingsign(IDWriteTextFormat*,IDWriteInlineObject**) DECLSPEC_HIDDEN; extern HRESULT create_typography(IDWriteTypography**) DECLSPEC_HIDDEN; extern HRESULT create_gdiinterop(IDWriteFactory2*,IDWriteGdiInterop**) DECLSPEC_HIDDEN; extern void release_gdiinterop(IDWriteGdiInterop*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index bdd8ad6..bd50e8b 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3439,12 +3439,47 @@ static const IDWriteInlineObjectVtbl dwritetrimmingsignvtbl = { dwritetrimmingsign_GetBreakConditions }; -HRESULT create_trimmingsign(IDWriteInlineObject **sign) +static inline BOOL is_reading_direction_horz(DWRITE_READING_DIRECTION direction) +{ + return (direction == DWRITE_READING_DIRECTION_LEFT_TO_RIGHT) || + (direction == DWRITE_READING_DIRECTION_RIGHT_TO_LEFT); +} + +static inline BOOL is_reading_direction_vert(DWRITE_READING_DIRECTION direction) +{ + return (direction == DWRITE_READING_DIRECTION_TOP_TO_BOTTOM) || + (direction == DWRITE_READING_DIRECTION_BOTTOM_TO_TOP); +} + +static inline BOOL is_flow_direction_horz(DWRITE_FLOW_DIRECTION direction) +{ + return (direction == DWRITE_FLOW_DIRECTION_LEFT_TO_RIGHT) || + (direction == DWRITE_FLOW_DIRECTION_RIGHT_TO_LEFT); +} + +static inline BOOL is_flow_direction_vert(DWRITE_FLOW_DIRECTION direction) +{ + return (direction == DWRITE_FLOW_DIRECTION_TOP_TO_BOTTOM) || + (direction == DWRITE_FLOW_DIRECTION_BOTTOM_TO_TOP); +} + +HRESULT create_trimmingsign(IDWriteTextFormat *format, IDWriteInlineObject **sign) { struct dwrite_trimmingsign *This; + DWRITE_READING_DIRECTION reading; + DWRITE_FLOW_DIRECTION flow; *sign = NULL; + /* Validate reading/flow direction here, layout creation won't complain about + invalid combinations. */ + reading = IDWriteTextFormat_GetReadingDirection(format); + flow = IDWriteTextFormat_GetFlowDirection(format); + + if ((is_reading_direction_horz(reading) && is_flow_direction_horz(flow)) || + (is_reading_direction_vert(reading) && is_flow_direction_vert(flow))) + return DWRITE_E_FLOWDIRECTIONCONFLICTS; + This = heap_alloc(sizeof(struct dwrite_trimmingsign)); if (!This) return E_OUTOFMEMORY; @@ -3527,7 +3562,12 @@ static HRESULT WINAPI dwritetextformat_SetWordWrapping(IDWriteTextFormat1 *iface static HRESULT WINAPI dwritetextformat_SetReadingDirection(IDWriteTextFormat1 *iface, DWRITE_READING_DIRECTION direction) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); + TRACE("(%p)->(%d)\n", This, direction); + + if ((UINT32)direction > DWRITE_READING_DIRECTION_BOTTOM_TO_TOP) + return E_INVALIDARG; + This->format.readingdir = direction; return S_OK; } @@ -3535,7 +3575,12 @@ static HRESULT WINAPI dwritetextformat_SetReadingDirection(IDWriteTextFormat1 *i static HRESULT WINAPI dwritetextformat_SetFlowDirection(IDWriteTextFormat1 *iface, DWRITE_FLOW_DIRECTION direction) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); + TRACE("(%p)->(%d)\n", This, direction); + + if ((UINT32)direction > DWRITE_FLOW_DIRECTION_RIGHT_TO_LEFT) + return E_INVALIDARG; + This->format.flow = direction; return S_OK; } diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 20f9d36..10597f8 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1051,8 +1051,8 @@ static HRESULT WINAPI dwritefactory_CreateEllipsisTrimmingSign(IDWriteFactory2 * IDWriteInlineObject **trimming_sign) { struct dwritefactory *This = impl_from_IDWriteFactory2(iface); - FIXME("(%p)->(%p %p): semi-stub\n", This, format, trimming_sign); - return create_trimmingsign(trimming_sign); + TRACE("(%p)->(%p %p)\n", This, format, trimming_sign); + return create_trimmingsign(format, trimming_sign); } static HRESULT WINAPI dwritefactory_CreateTextAnalyzer(IDWriteFactory2 *iface, IDWriteTextAnalyzer **analyzer) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 2b19961..f041979 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -883,8 +883,19 @@ if (0) /* crashes on native */ ok(hr == S_OK, "got 0x%08x\n", hr); ok(before == DWRITE_BREAK_CONDITION_NEUTRAL, "got %d\n", before); ok(after == DWRITE_BREAK_CONDITION_NEUTRAL, "got %d\n", after); - IDWriteInlineObject_Release(sign); + + /* non-orthogonal flow/reading combination */ + hr = IDWriteTextFormat_SetReadingDirection(format, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextFormat_SetFlowDirection(format, DWRITE_FLOW_DIRECTION_LEFT_TO_RIGHT); + ok(hr == S_OK || broken(hr == E_INVALIDARG) /* vista, win7 */, "got 0x%08x\n", hr); + if (hr == S_OK) { + hr = IDWriteFactory_CreateEllipsisTrimmingSign(factory, format, &sign); + ok(hr == DWRITE_E_FLOWDIRECTIONCONFLICTS, "got 0x%08x\n", hr); + } + IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); } @@ -2362,6 +2373,56 @@ todo_wine { IDWriteFactory_Release(factory); } +static void test_SetFlowDirection(void) +{ + static const WCHAR strW[] = {'a','b','c','d',0}; + DWRITE_READING_DIRECTION reading; + DWRITE_FLOW_DIRECTION flow; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + IDWriteFactory *factory; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + flow = IDWriteTextFormat_GetFlowDirection(format); + ok(flow == DWRITE_FLOW_DIRECTION_TOP_TO_BOTTOM, "got %d\n", flow); + + reading = IDWriteTextFormat_GetReadingDirection(format); + ok(reading == DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, "got %d\n", reading); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 500.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextLayout_Release(layout); + + hr = IDWriteTextFormat_SetFlowDirection(format, DWRITE_FLOW_DIRECTION_LEFT_TO_RIGHT); + ok(hr == S_OK || broken(hr == E_INVALIDARG) /* vista,win7 */, "got 0x%08x\n", hr); + if (hr == S_OK) { + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 500.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextLayout_Release(layout); + + hr = IDWriteTextFormat_SetReadingDirection(format, DWRITE_READING_DIRECTION_TOP_TO_BOTTOM); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextFormat_SetFlowDirection(format, DWRITE_FLOW_DIRECTION_TOP_TO_BOTTOM); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 500.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextLayout_Release(layout); + } + else + win_skip("DWRITE_FLOW_DIRECTION_LEFT_TO_RIGHT is not supported\n"); + + IDWriteTextFormat_Release(format); + IDWriteFactory_Release(factory); +} + START_TEST(layout) { static const WCHAR ctrlstrW[] = {0x202a,0}; @@ -2399,6 +2460,7 @@ START_TEST(layout) test_SetFontStretch(); test_SetStrikethrough(); test_GetMetrics(); + test_SetFlowDirection(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Fix splitted range length, initial test for GetMetrics().
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: de2ae5e1b8f65a855d0fd62a50346042aac9bd29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de2ae5e1b8f65a855d0fd62a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 15 00:36:43 2015 +0300 dwrite: Fix splitted range length, initial test for GetMetrics(). --- dlls/dwrite/layout.c | 2 +- dlls/dwrite/tests/analyzer.c | 4 +-- dlls/dwrite/tests/layout.c | 75 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 903e53d..bdd8ad6 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3084,7 +3084,7 @@ static HRESULT WINAPI dwritetextlayout_sink_SetBidiLevel(IDWriteTextAnalysisSink /* reduce existing run */ cur->run.bidiLevel = resolvedLevel; - cur->descr.stringLength -= length; + cur->descr.stringLength = length; list_add_after(&cur_run->entry, &run->entry); break; diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 4e2e7ca..c514bec 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -523,8 +523,8 @@ static struct sa_test sa_tests[] = { }, { /* Arabic */ - {0x064a,0x064f,0x0633,0x0627,0x0648,0x0650,0x064a,0}, 1, - { { 0, 7, DWRITE_SCRIPT_SHAPES_DEFAULT }} + {0x064a,0x064f,0x0633,0x0627,0x0648,0x0650,0x064a,0x0661,0}, 1, + { { 0, 8, DWRITE_SCRIPT_SHAPES_DEFAULT }} }, { /* Arabic */ diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 4093633..2b19961 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1380,6 +1380,7 @@ static void test_typography(void) static void test_GetClusterMetrics(void) { + static const WCHAR str3W[] = {0x2066,')',')',0x661,'(',0x627,')',0}; static const WCHAR str2W[] = {0x202a,0x202c,'a',0}; static const WCHAR strW[] = {'a','b','c','d',0}; DWRITE_INLINE_OBJECT_METRICS inline_metrics; @@ -1399,6 +1400,13 @@ static void test_GetClusterMetrics(void) DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateTextLayout(factory, str3W, 7, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteTextLayout_GetClusterMetrics(layout, NULL, 0, &count); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); + ok(count == 7, "got %u\n", count); + IDWriteTextLayout_Release(layout); + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1873,6 +1881,7 @@ static void test_DetermineMinWidth(void) IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format); + IDWriteFactory_Release(factory); } static void test_SetFontSize(void) @@ -1964,6 +1973,7 @@ static void test_SetFontSize(void) IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format); + IDWriteFactory_Release(factory); } static void test_SetFontFamilyName(void) @@ -2044,6 +2054,7 @@ static void test_SetFontFamilyName(void) IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format); + IDWriteFactory_Release(factory); } static void test_SetFontStyle(void) @@ -2131,6 +2142,7 @@ static void test_SetFontStyle(void) IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format); + IDWriteFactory_Release(factory); } static void test_SetFontStretch(void) @@ -2225,6 +2237,7 @@ static void test_SetFontStretch(void) IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format); + IDWriteFactory_Release(factory); } static void test_SetStrikethrough(void) @@ -2286,6 +2299,67 @@ static void test_SetStrikethrough(void) IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format); + IDWriteFactory_Release(factory); +} + +static void test_GetMetrics(void) +{ + static const WCHAR str2W[] = {0x2066,')',')',0x661,'(',0x627,')',0}; + static const WCHAR strW[] = {'a','b','c','d',0}; + DWRITE_TEXT_METRICS metrics; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + IDWriteFactory *factory; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 500.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(&metrics, 0xcc, sizeof(metrics)); + hr = IDWriteTextLayout_GetMetrics(layout, &metrics); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(metrics.left == 0.0, "got %.2f\n", metrics.left); + ok(metrics.top == 0.0, "got %.2f\n", metrics.top); + ok(metrics.width > 0.0, "got %.2f\n", metrics.width); + ok(metrics.widthIncludingTrailingWhitespace > 0.0, "got %.2f\n", metrics.widthIncludingTrailingWhitespace); + ok(metrics.height > 0.0, "got %.2f\n", metrics.height); + ok(metrics.layoutWidth == 500.0, "got %.2f\n", metrics.layoutWidth); + ok(metrics.layoutHeight == 1000.0, "got %.2f\n", metrics.layoutHeight); + ok(metrics.maxBidiReorderingDepth == 1, "got %u\n", metrics.maxBidiReorderingDepth); + ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount); +} + IDWriteTextLayout_Release(layout); + + /* a string with more complex bidi sequence */ + hr = IDWriteFactory_CreateTextLayout(factory, str2W, 7, format, 500.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(&metrics, 0xcc, sizeof(metrics)); + metrics.maxBidiReorderingDepth = 0; + hr = IDWriteTextLayout_GetMetrics(layout, &metrics); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(metrics.left == 0.0, "got %.2f\n", metrics.left); + ok(metrics.top == 0.0, "got %.2f\n", metrics.top); + ok(metrics.width > 0.0, "got %.2f\n", metrics.width); + ok(metrics.widthIncludingTrailingWhitespace > 0.0, "got %.2f\n", metrics.widthIncludingTrailingWhitespace); + ok(metrics.height > 0.0, "got %.2f\n", metrics.height); + ok(metrics.layoutWidth == 500.0, "got %.2f\n", metrics.layoutWidth); + ok(metrics.layoutHeight == 1000.0, "got %.2f\n", metrics.layoutHeight); + ok(metrics.maxBidiReorderingDepth > 1, "got %u\n", metrics.maxBidiReorderingDepth); + ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount); +} + IDWriteTextLayout_Release(layout); + + IDWriteTextFormat_Release(format); + IDWriteFactory_Release(factory); } START_TEST(layout) @@ -2324,6 +2398,7 @@ START_TEST(layout) test_SetFontStyle(); test_SetFontStretch(); test_SetStrikethrough(); + test_GetMetrics(); IDWriteFactory_Release(factory); }

1 0