wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

Alistair Leslie-Hughes : scrrun: Implement ITextStream Close.
by Alexandre Julliard 19 Jun '15

19 Jun '15

Module: wine Branch: master Commit: 0a19048795f8084c448bab6d87c2d8170b8b0ba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a19048795f8084c448bab6d8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 16 15:38:08 2015 +1000 scrrun: Implement ITextStream Close. --- dlls/scrrun/filesystem.c | 12 ++++++++++-- dlls/scrrun/tests/filesystem.c | 12 ++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index d490d93..3de38d2 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -633,8 +633,16 @@ static HRESULT WINAPI textstream_SkipLine(ITextStream *iface) static HRESULT WINAPI textstream_Close(ITextStream *iface) { struct textstream *This = impl_from_ITextStream(iface); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + HRESULT hr = S_OK; + + TRACE("(%p)\n", This); + + if(!CloseHandle(This->file)) + hr = S_FALSE; + + This->file = NULL; + + return hr; } static const ITextStreamVtbl textstreamvtbl = { diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index b22e006..28242ce 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -35,6 +35,9 @@ static IFileSystem3 *fs3; +/* w2k and 2k3 error code. */ +#define E_VAR_NOT_SET 0x800a005b + static inline ULONG get_refcount(IUnknown *iface) { IUnknown_AddRef(iface); @@ -1378,6 +1381,15 @@ static void test_CreateTextFile(void) hr = ITextStream_Read(stream, 1, &str); ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + hr = ITextStream_Close(stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextStream_Read(stream, 1, &str); + ok(hr == CTL_E_BADFILEMODE || hr == E_VAR_NOT_SET, "got 0x%08x\n", hr); + + hr = ITextStream_Close(stream); + ok(hr == S_FALSE || hr == E_VAR_NOT_SET, "got 0x%08x\n", hr); + ITextStream_Release(stream); /* check it's created */

1 0

Matteo Bruni : d3dcompiler: Parse ": register()" syntax.
by Alexandre Julliard 19 Jun '15

19 Jun '15

Module: wine Branch: master Commit: bd7e83f2920ece2c388ada1e2e5fb76256b956c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd7e83f2920ece2c388ada1e2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 16 22:45:44 2015 +0200 d3dcompiler: Parse ": register()" syntax. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 17 ++++- dlls/d3dcompiler_43/hlsl.y | 107 ++++++++++++++++++++++++++---- dlls/d3dcompiler_43/utils.c | 1 + 3 files changed, 112 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd7e83f2920ece2c388ad…

1 0

Matteo Bruni : d3dcompiler: Handle writemask in make_assignment().
by Alexandre Julliard 19 Jun '15

19 Jun '15

Module: wine Branch: master Commit: 5ae37d47f10618470bf16cc99d93fda1d6dedf42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ae37d47f10618470bf16cc99… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 16 22:45:43 2015 +0200 d3dcompiler: Handle writemask in make_assignment(). --- dlls/d3dcompiler_43/utils.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 7207399..ff44804 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1584,8 +1584,31 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig type = left->data_type; else { - FIXME("Assignments with writemasks not supported yet.\n"); - type = NULL; + unsigned int dimx = 0; + DWORD bitmask; + enum hlsl_type_class type_class; + + if (left->data_type->type > HLSL_CLASS_LAST_NUMERIC) + { + hlsl_report_message(left->loc.file, left->loc.line, left->loc.col, HLSL_LEVEL_ERROR, + "writemask on a non scalar/vector/matrix type"); + d3dcompiler_free(assign); + return NULL; + } + bitmask = writemask & ((1 << left->data_type->dimx) - 1); + while (bitmask) + { + if (bitmask & 1) + dimx++; + bitmask >>= 1; + } + if (left->data_type->type == HLSL_CLASS_MATRIX) + FIXME("Assignments with writemasks and matrices on lhs are not supported yet.\n"); + if (dimx == 1) + type_class = HLSL_CLASS_SCALAR; + else + type_class = left->data_type->type; + type = new_hlsl_type(NULL, type_class, left->data_type->base_type, dimx, 1); } assign->node.type = HLSL_IR_ASSIGNMENT; assign->node.loc = left->loc;

1 0

Matteo Bruni : d3dcompiler: Handle redefining an intrinsic function as a user-defined function.
by Alexandre Julliard 19 Jun '15

19 Jun '15

Module: wine Branch: master Commit: 10fcb9379e21279c88cb7f8a448b30f7af5eb2c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10fcb9379e21279c88cb7f8a4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 16 22:45:42 2015 +0200 d3dcompiler: Handle redefining an intrinsic function as a user-defined function. --- dlls/d3dcompiler_43/utils.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 83f815f..7207399 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2479,6 +2479,22 @@ void add_function_decl(struct wine_rb_tree *funcs, char *name, struct hlsl_ir_fu if (func_entry) { func = WINE_RB_ENTRY_VALUE(func_entry, struct hlsl_ir_function, entry); + if (intrinsic != func->intrinsic) + { + if (intrinsic) + { + ERR("Redeclaring a user defined function as an intrinsic.\n"); + return; + } + TRACE("Function %s redeclared as a user defined function.\n", debugstr_a(name)); + func->intrinsic = intrinsic; + wine_rb_destroy(&func->overloads, free_function_decl_rb, NULL); + if (wine_rb_init(&func->overloads, &hlsl_ir_function_decl_rb_funcs) == -1) + { + ERR("Failed to initialize function rbtree.\n"); + return; + } + } decl->func = func; if ((old_entry = wine_rb_get(&func->overloads, decl->parameters))) {

1 0

Nikolay Sivov : kernel32: Export RtlCopyMemory().
by Alexandre Julliard 19 Jun '15

19 Jun '15

Module: wine Branch: master Commit: 08247714232408f0a48bf95da141a7b906450af3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08247714232408f0a48bf95da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 19 04:00:26 2015 +0300 kernel32: Export RtlCopyMemory(). --- dlls/kernel32/kernel32.spec | 2 +- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/rtl.c | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 8e97cdb..f9a0770 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1284,7 +1284,7 @@ @ stdcall -register RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace @ stdcall -arch=x86_64 RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory -# @ stub -arch=x86_64 RtlCopyMemory +@ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) ntdll.RtlCopyMemory @ cdecl -arch=arm,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory @ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr ptr) ntdll.RtlInstallFunctionTableCallback diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 191115b..270d7ff 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -474,6 +474,7 @@ # @ stub RtlConvertVariantToProperty @ stdcall RtlCopyLuid(ptr ptr) @ stdcall RtlCopyLuidAndAttributesArray(long ptr ptr) +@ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) # @ stub RtlCopyMemoryStreamTo # @ stub RtlCopyOutOfProcessMemoryStreamTo # @ stub RtlCopyRangeList diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 8f6f386..855bdb9 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -534,6 +534,15 @@ SIZE_T WINAPI RtlCompareMemoryUlong(const ULONG *Source1, SIZE_T Length, ULONG d } /****************************************************************************** + * RtlCopyMemory [NTDLL.@] + */ +#undef RtlCopyMemory +void WINAPI RtlCopyMemory(void *dest, const void *src, SIZE_T len) +{ + memcpy(dest, src, len); +} + +/****************************************************************************** * RtlAssert [NTDLL.@] * * Fail a debug assertion.

1 0

Piotr Caban : wininet: Improve handling of long URLs in CreateUrlCacheEntry function.
by Alexandre Julliard 19 Jun '15

19 Jun '15

Module: wine Branch: master Commit: 1a738a556cf231a713c25b1d13decb202c77db90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a738a556cf231a713c25b1d1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 19 08:58:55 2015 +0200 wininet: Improve handling of long URLs in CreateUrlCacheEntry function. --- dlls/wininet/tests/urlcache.c | 26 ++++++++++++++++++++++++++ dlls/wininet/urlcache.c | 34 +++++++++++++++++++++++++--------- 2 files changed, 51 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index f4d1e35..37ee412 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -363,6 +363,7 @@ static void create_and_write_file(LPCSTR filename, void *data, DWORD len) static void test_urlcacheA(void) { + static char long_url[300] = "http://www.winehq.org/"; static char ok_header[] = "HTTP/1.0 200 OK\r\n\r\n"; BOOL ret; HANDLE hFile; @@ -372,6 +373,7 @@ static void test_urlcacheA(void) DWORD cbCacheEntryInfo; static const FILETIME filetime_zero; FILETIME now; + int len; ret = CreateUrlCacheEntryA(test_url, 0, "html", filenameA, 0); ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); @@ -807,6 +809,30 @@ static void test_urlcacheA(void) ret = pDeleteUrlCacheEntryA(test_hash_collisions2); ok(ret, "DeleteUrlCacheEntry failed: %d\n", GetLastError()); } + + len = strlen(long_url); + memset(long_url+len, 'a', sizeof(long_url)-len); + long_url[sizeof(long_url)-1] = 0; + ret = CreateUrlCacheEntryA(long_url, 0, NULL, filenameA, 0); + ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); + check_file_exists(filenameA); + DeleteFileA(filenameA); + + ret = CreateUrlCacheEntryA(long_url, 0, "extension", filenameA, 0); + ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); + check_file_exists(filenameA); + DeleteFileA(filenameA); + + long_url[250] = 0; + ret = CreateUrlCacheEntryA(long_url, 0, NULL, filenameA, 0); + ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); + check_file_exists(filenameA); + DeleteFileA(filenameA); + + ret = CreateUrlCacheEntryA(long_url, 0, "extension", filenameA, 0); + ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); + check_file_exists(filenameA); + DeleteFileA(filenameA); } static void test_urlcacheW(void) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 0e5fe3c..3229f21 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -979,7 +979,8 @@ static BOOL urlcache_create_file_pathW( LPCSTR szLocalFileName, BYTE Directory, LPWSTR wszPath, - LPLONG lpBufferSize) + LPLONG lpBufferSize, + BOOL trunc_name) { LONG nRequired; int path_len = strlenW(pContainer->path); @@ -993,6 +994,8 @@ static BOOL urlcache_create_file_pathW( nRequired = (path_len + file_name_len) * sizeof(WCHAR); if(Directory != CACHE_CONTAINER_NO_SUBDIR) nRequired += (DIR_LENGTH + 1) * sizeof(WCHAR); + if (trunc_name && nRequired >= *lpBufferSize) + nRequired = *lpBufferSize; if (nRequired <= *lpBufferSize) { int dir_len; @@ -1008,7 +1011,9 @@ static BOOL urlcache_create_file_pathW( { dir_len = 0; } - MultiByteToWideChar(CP_ACP, 0, szLocalFileName, -1, wszPath + dir_len + path_len, file_name_len); + MultiByteToWideChar(CP_ACP, 0, szLocalFileName, -1, wszPath + dir_len + path_len, + *lpBufferSize/sizeof(WCHAR)-dir_len-path_len); + wszPath[*lpBufferSize/sizeof(WCHAR)-1] = 0; *lpBufferSize = nRequired; return TRUE; } @@ -1097,7 +1102,7 @@ static DWORD urlcache_delete_file(const cache_container *container, if(!urlcache_create_file_pathW(container, header, (LPCSTR)url_entry+url_entry->local_name_off, - url_entry->cache_dir, path, &path_size)) + url_entry->cache_dir, path, &path_size, FALSE)) goto succ; if(!GetFileAttributesExW(path, GetFileExInfoStandard, &attr)) @@ -1320,8 +1325,10 @@ static DWORD urlcache_copy_entry(cache_container *container, const urlcache_head LPSTR file_name; file_name = (LPSTR)entry_info+size; file_name_size = *info_size-size; - if((unicode && urlcache_create_file_pathW(container, header, (LPCSTR)url_entry+url_entry->local_name_off, url_entry->cache_dir, (LPWSTR)file_name, &file_name_size)) || - (!unicode && urlcache_create_file_pathA(container, header, (LPCSTR)url_entry+url_entry->local_name_off, url_entry->cache_dir, file_name, &file_name_size))) { + if((unicode && urlcache_create_file_pathW(container, header, (LPCSTR)url_entry+url_entry->local_name_off, + url_entry->cache_dir, (LPWSTR)file_name, &file_name_size, FALSE)) || + (!unicode && urlcache_create_file_pathA(container, header, (LPCSTR)url_entry+url_entry->local_name_off, + url_entry->cache_dir, file_name, &file_name_size))) { entry_info->lpszLocalFileName = file_name; } size += file_name_size; @@ -2613,7 +2620,7 @@ static BOOL urlcache_entry_create(const char *url, const char *ext, WCHAR *full_ char file_name[MAX_PATH]; WCHAR extW[MAX_PATH]; BYTE cache_dir; - LONG full_path_len; + LONG full_path_len, ext_len = 0; BOOL generate_name = FALSE; DWORD error; HANDLE file; @@ -2630,7 +2637,7 @@ static BOOL urlcache_entry_create(const char *url, const char *ext, WCHAR *full_ if(!InternetCrackUrlA(url, 0, 0, &uc)) uc.dwUrlPathLength = 0; - if(!uc.dwUrlPathLength || uc.dwUrlPathLength >= sizeof(file_name)) { + if(!uc.dwUrlPathLength) { file_name[0] = 0; }else { char *p, *e; @@ -2644,6 +2651,8 @@ static BOOL urlcache_entry_create(const char *url, const char *ext, WCHAR *full_ p--; } + if(e-p >= MAX_PATH) + e = p+MAX_PATH-1; memcpy(file_name, p, e-p); file_name[e-p] = 0; @@ -2683,7 +2692,7 @@ static BOOL urlcache_entry_create(const char *url, const char *ext, WCHAR *full_ cache_dir = CACHE_CONTAINER_NO_SUBDIR; full_path_len = MAX_PATH * sizeof(WCHAR); - if(!urlcache_create_file_pathW(container, header, file_name, cache_dir, full_path, &full_path_len)) { + if(!urlcache_create_file_pathW(container, header, file_name, cache_dir, full_path, &full_path_len, TRUE)) { WARN("Failed to get full path for filename %s, needed %u bytes.\n", debugstr_a(file_name), full_path_len); cache_container_unlock_index(container, header); @@ -2697,7 +2706,7 @@ static BOOL urlcache_entry_create(const char *url, const char *ext, WCHAR *full_ WCHAR *p; extW[0] = '.'; - MultiByteToWideChar(CP_ACP, 0, ext, -1, extW+1, MAX_PATH-1); + ext_len = MultiByteToWideChar(CP_ACP, 0, ext, -1, extW+1, MAX_PATH-1); for(p=extW; *p; p++) { switch(*p) { @@ -2715,6 +2724,10 @@ static BOOL urlcache_entry_create(const char *url, const char *ext, WCHAR *full_ extW[0] = '\0'; } + if(!generate_name && full_path_len+5+ext_len>=MAX_PATH) { /* strlen("[255]") = 5 */ + full_path_len = MAX_PATH-5-ext_len-1; + } + for(i=0; i<255 && !generate_name; i++) { static const WCHAR format[] = {'[','%','u',']','%','s',0}; @@ -2728,6 +2741,9 @@ static BOOL urlcache_entry_create(const char *url, const char *ext, WCHAR *full_ } } + if(full_path_len+8+ext_len >= MAX_PATH) + full_path_len = MAX_PATH-8-ext_len-1; + /* Try to generate random name */ GetSystemTimeAsFileTime(&ft); strcpyW(full_path+full_path_len+8, extW);

1 0

Sebastian Lackner : server: Delay destruction of file object in set_irp_result.
by Alexandre Julliard 19 Jun '15

19 Jun '15

Module: wine Branch: master Commit: ece08c10a162f429262a56b76a9a1675cf48baea URL: http://source.winehq.org/git/wine.git/?a=commit;h=ece08c10a162f429262a56b76… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jun 16 03:16:10 2015 +0200 server: Delay destruction of file object in set_irp_result. --- server/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/device.c b/server/device.c index dc0325e..da99c32 100644 --- a/server/device.c +++ b/server/device.c @@ -288,7 +288,6 @@ static void set_irp_result( struct irp_call *irp, unsigned int status, irp->out_size = min( irp->out_size, out_size ); if (irp->out_size && !(irp->out_data = memdup( out_data, irp->out_size ))) irp->out_size = 0; - release_object( file ); irp->file = NULL; if (irp->async) { @@ -306,6 +305,7 @@ static void set_irp_result( struct irp_call *irp, unsigned int status, list_remove( &irp->dev_entry ); release_object( irp ); /* no longer on the device queue */ } + release_object( file ); }

1 0

Nikolay Sivov : dwrite: Count last cluster length too when building a line.
by Alexandre Julliard 19 Jun '15

19 Jun '15

Module: wine Branch: master Commit: b4592cbc7c0cfc718b723eb93f8e6110bed25775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4592cbc7c0cfc718b723eb93… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 18 16:01:34 2015 +0300 dwrite: Count last cluster length too when building a line. --- dlls/dwrite/layout.c | 18 ++++++++++++------ dlls/dwrite/tests/layout.c | 1 - 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index a8adb2a..8a5915c 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1026,7 +1026,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) s[0] = s[1] = layout_get_strikethrough_from_pos(layout, 0); for (i = 0, start = 0, textpos = 0, width = 0.0; i < layout->cluster_count; i++) { - BOOL can_wrap_after = layout->clustermetrics[i].canWrapLineAfter; + BOOL overflow; s[1] = layout_get_strikethrough_from_pos(layout, textpos); @@ -1041,12 +1041,18 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) start = i; } - /* check if we got new line */ - if (((can_wrap_after && (width + layout->clustermetrics[i].width > layout->maxwidth)) || - layout->clustermetrics[i].isNewline || /* always wrap on new line */ - i == layout->cluster_count - 1)) /* end of the text */ { + overflow = layout->clustermetrics[i].canWrapLineAfter && + (width + layout->clustermetrics[i].width > layout->maxwidth); + /* check if we got new */ + if (overflow || + layout->clustermetrics[i].isNewline || /* always wrap on new line */ + i == layout->cluster_count - 1) /* end of the text */ { - UINT32 strlength = metrics.length, index = i; + UINT32 strlength, index = i; + + if (!overflow) + metrics.length += layout->clustermetrics[i].length; + strlength = metrics.length; if (i >= start) { hr = layout_add_effective_run(layout, run, start, i - start + 1, origin_x, s[0]); diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index e8450df..d1374b6 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2745,7 +2745,6 @@ static void test_GetLineMetrics(void) memset(&metrics, 0, sizeof(metrics)); hr = IDWriteTextLayout_GetLineMetrics(layout, &metrics, 1, &count); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine ok(metrics.length == 5, "got %u\n", metrics.length); ok(metrics.trailingWhitespaceLength == 1, "got %u\n", metrics.trailingWhitespaceLength);

1 0

Nikolay Sivov : dwrite: Actually set isWhitespace for space clusters.
by Alexandre Julliard 19 Jun '15

19 Jun '15

Module: wine Branch: master Commit: e8c4951a2a81e0f3ec162998390ce38e635b6613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8c4951a2a81e0f3ec1629983… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 17 21:52:53 2015 +0300 dwrite: Actually set isWhitespace for space clusters. --- dlls/dwrite/layout.c | 4 ++-- dlls/dwrite/tests/layout.c | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index e001e49..a8adb2a 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -495,10 +495,10 @@ static inline void init_cluster_metrics(const struct dwrite_textlayout *layout, metrics->canWrapLineAfter = breakcondition == DWRITE_BREAK_CONDITION_CAN_BREAK || breakcondition == DWRITE_BREAK_CONDITION_MUST_BREAK; if (metrics->length == 1) { - WORD type; + WORD type = 0; GetStringTypeW(CT_CTYPE1, &layout->str[position], 1, &type); - metrics->isWhitespace = type == C1_SPACE; + metrics->isWhitespace = !!(type & C1_SPACE); metrics->isNewline = FALSE /* FIXME */; metrics->isSoftHyphen = layout->str[position] == 0x00ad /* Unicode Soft Hyphen */; } diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 5d655b6..e8450df 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1716,7 +1716,6 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok(count == 2, "got %u\n", count); ok(metrics[0].isWhitespace == 0, "got %d\n", metrics[0].isWhitespace); -todo_wine ok(metrics[1].isWhitespace == 1, "got %d\n", metrics[1].isWhitespace); IDWriteTextLayout_Release(layout); @@ -2746,10 +2745,10 @@ static void test_GetLineMetrics(void) memset(&metrics, 0, sizeof(metrics)); hr = IDWriteTextLayout_GetLineMetrics(layout, &metrics, 1, &count); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine { +todo_wine ok(metrics.length == 5, "got %u\n", metrics.length); ok(metrics.trailingWhitespaceLength == 1, "got %u\n", metrics.trailingWhitespaceLength); -} + ok(metrics.newlineLength == 0, "got %u\n", metrics.newlineLength); ok(metrics.isTrimmed == FALSE, "got %d\n", metrics.isTrimmed);

1 0

Nikolay Sivov : dwrite: Set cluster length together with other metrics.
by Alexandre Julliard 19 Jun '15

19 Jun '15

Module: wine Branch: master Commit: f68f63152f94f6c8429901866df0bccf355d50b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f68f63152f94f6c8429901866… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 17 21:51:01 2015 +0300 dwrite: Set cluster length together with other metrics. --- dlls/dwrite/layout.c | 17 ++++++++--------- dlls/dwrite/tests/layout.c | 15 +++++++++++++++ 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 72f0885..e001e49 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -469,21 +469,20 @@ static inline DWRITE_LINE_BREAKPOINT get_effective_breakpoint(const struct dwrit } static inline void init_cluster_metrics(const struct dwrite_textlayout *layout, const struct regular_layout_run *run, - UINT16 start_glyph, UINT16 stop_glyph, UINT32 stop_position, DWRITE_CLUSTER_METRICS *metrics) + UINT16 start_glyph, UINT16 stop_glyph, UINT32 stop_position, UINT16 length, DWRITE_CLUSTER_METRICS *metrics) { UINT8 breakcondition; UINT32 position; UINT16 j; - metrics->width = 0.0; - - /* For clusters on control chars we report zero glyphs, and we need zero cluster + /* For clusters made of control chars we report zero glyphs, and we need zero cluster width as well; advances are already computed at this point and are not necessary zero. */ + metrics->width = 0.0; if (run->run.glyphCount) { for (j = start_glyph; j < stop_glyph; j++) metrics->width += run->run.glyphAdvances[j]; } - metrics->length = 0; + metrics->length = length; position = stop_position; if (stop_glyph == run->glyphcount) @@ -531,8 +530,8 @@ static void layout_set_cluster_metrics(struct dwrite_textlayout *layout, const s BOOL end = i == run->descr.stringLength - 1; if (run->descr.clusterMap[start] != run->descr.clusterMap[i]) { - init_cluster_metrics(layout, run, run->descr.clusterMap[start], run->descr.clusterMap[i], i, metrics); - metrics->length = i - start; + init_cluster_metrics(layout, run, run->descr.clusterMap[start], run->descr.clusterMap[i], i, + i - start, metrics); c->position = start; c->run = r; @@ -543,8 +542,8 @@ static void layout_set_cluster_metrics(struct dwrite_textlayout *layout, const s } if (end) { - init_cluster_metrics(layout, run, run->descr.clusterMap[start], run->glyphcount, i, metrics); - metrics->length = i - start + 1; + init_cluster_metrics(layout, run, run->descr.clusterMap[start], run->glyphcount, i, + i - start + 1, metrics); c->position = start; c->run = r; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 3e654ae..5d655b6 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1486,6 +1486,7 @@ 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}; + static const WCHAR str4W[] = {'a',' ',0}; DWRITE_INLINE_OBJECT_METRICS inline_metrics; DWRITE_CLUSTER_METRICS metrics[4]; IDWriteTextLayout1 *layout1; @@ -1705,6 +1706,20 @@ todo_wine ok(count == 0, "got %u\n", count); IDWriteTextLayout_Release(layout); + /* whitespace */ + hr = IDWriteFactory_CreateTextLayout(factory, str4W, 2, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + memset(metrics, 0, sizeof(metrics)); + hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, 2, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 2, "got %u\n", count); + ok(metrics[0].isWhitespace == 0, "got %d\n", metrics[0].isWhitespace); +todo_wine + ok(metrics[1].isWhitespace == 1, "got %d\n", metrics[1].isWhitespace); + IDWriteTextLayout_Release(layout); + IDWriteInlineObject_Release(trimm); IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory);

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2015