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

Nikolay Sivov : dwrite: Actually set isWhitespace for space clusters.
by Alexandre Julliard June 19, 2015

June 19, 2015

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

Matteo Bruni : d3dcompiler: Parse ": register()" syntax.
by Alexandre Julliard June 19, 2015

June 19, 2015

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 June 19, 2015

June 19, 2015

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

Piotr Caban : wininet: Improve handling of long URLs in CreateUrlCacheEntry function.
by Alexandre Julliard June 19, 2015

June 19, 2015

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 June 19, 2015

June 19, 2015

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 June 19, 2015

June 19, 2015

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: Set cluster length together with other metrics.
by Alexandre Julliard June 19, 2015

June 19, 2015

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

Bruno Jesus : ws2_32: Add a helper to get socket type.
by Alexandre Julliard June 19, 2015

June 19, 2015

Module: wine Branch: master Commit: 9d558c5c5fafe816a6e0e90ec3f5031fff702b66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d558c5c5fafe816a6e0e90ec… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jun 18 11:03:08 2015 -0300 ws2_32: Add a helper to get socket type. --- dlls/ws2_32/socket.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d7c3ff3..63c965e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1096,6 +1096,14 @@ static int _get_sock_error(SOCKET s, unsigned int bit) return events[bit]; } +static int _get_fd_type(int fd) +{ + int sock_type = -1; + socklen_t optlen = sizeof(sock_type); + getsockopt(fd, SOL_SOCKET, SO_TYPE, (char*) &sock_type, &optlen); + return sock_type; +} + static struct per_thread_data *get_per_thread_data(void) { struct per_thread_data * ptb = NtCurrentTeb()->WinSockData; @@ -2778,8 +2786,6 @@ static int WINAPI WS2_WSARecvMsg( SOCKET s, LPWSAMSG msg, LPDWORD lpNumberOfByte static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) { struct sockaddr_in *in_sock = (struct sockaddr_in *) addr; - unsigned int sock_type = 0; - socklen_t optlen = sizeof(sock_type); in_addr_t bind_addr = in_sock->sin_addr.s_addr; PIP_ADAPTER_INFO adapters = NULL, adapter; BOOL ret = FALSE; @@ -2788,7 +2794,7 @@ static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) if (bind_addr == htonl(INADDR_ANY) || bind_addr == htonl(INADDR_LOOPBACK)) return FALSE; /* Not binding to a network adapter, special interface binding unnecessary. */ - if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &sock_type, &optlen) == -1 || sock_type != SOCK_DGRAM) + if (_get_fd_type(fd) != SOCK_DGRAM) return FALSE; /* Special interface binding is only necessary for UDP datagrams. */ if (GetAdaptersInfo(NULL, &adap_size) != ERROR_BUFFER_OVERFLOW) goto cleanup; @@ -3231,12 +3237,12 @@ static void interface_bind_check(int fd, struct sockaddr_in *addr) return; #else int ifindex; - socklen_t len = sizeof(ifindex); + socklen_t len; /* Check for IPv4, address 0.0.0.0 and UDP socket */ if (addr->sin_family != AF_INET || addr->sin_addr.s_addr != 0) return; - if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &ifindex, &len) || ifindex != SOCK_DGRAM) + if (_get_fd_type(fd) != SOCK_DGRAM) return; ifindex = -1; @@ -3547,8 +3553,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_SO_LINGER: { struct linger lingval; - int so_type; - socklen_t len = sizeof(struct linger), slen = sizeof(int); + socklen_t len = sizeof(struct linger); /* struct linger and LINGER have different sizes */ if (!optlen || *optlen < sizeof(LINGER) || !optval) @@ -3559,7 +3564,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if ( (fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; - if ((getsockopt(fd, SOL_SOCKET, SO_TYPE, &so_type, &slen) == 0 && so_type == SOCK_DGRAM)) + if (_get_fd_type(fd) == SOCK_DGRAM) { SetLastError(WSAENOPROTOOPT); ret = SOCKET_ERROR; @@ -3643,6 +3648,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, } case WS_SO_TYPE: { + int sock_type; if (!optlen || *optlen < sizeof(int) || !optval) { SetLastError(WSAEFAULT); @@ -3651,13 +3657,14 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if ( (fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; - if (getsockopt(fd, SOL_SOCKET, SO_TYPE, optval, (socklen_t *)optlen) != 0 ) + sock_type = _get_fd_type(fd); + if (sock_type == -1) { SetLastError(wsaErrno()); ret = SOCKET_ERROR; } else - (*(int *)optval) = convert_socktype_u2w(*(int *)optval); + (*(int *)optval) = convert_socktype_u2w(sock_type); release_sock_fd( s, fd ); return ret;

1 0

Jacek Caban : wininet: Don't use blocking_mode_t in netconn.c.
by Alexandre Julliard June 19, 2015

June 19, 2015

Module: wine Branch: master Commit: 9d7d27ea7f8781e81f8efa343f4f12b998f156ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d7d27ea7f8781e81f8efa343… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 18 15:17:46 2015 +0200 wininet: Don't use blocking_mode_t in netconn.c. --- dlls/wininet/http.c | 6 ++++++ dlls/wininet/internet.h | 6 ------ dlls/wininet/netconnection.c | 35 ++++++++++++++--------------------- 3 files changed, 20 insertions(+), 27 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 42654a2..3be88b7 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -380,6 +380,12 @@ static WCHAR *get_host_header( http_request_t *req ) return ret; } +typedef enum { + BLOCKING_ALLOW, + BLOCKING_DISALLOW, + BLOCKING_WAITALL +} blocking_mode_t; + struct data_stream_vtbl_t { DWORD (*get_avail_data)(data_stream_t*,http_request_t*); BOOL (*end_of_data)(data_stream_t*,http_request_t*); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 955c7c5..4044bbf 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -415,12 +415,6 @@ VOID INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR dwContext, DWORD dwStatusInfoLength) DECLSPEC_HIDDEN; BOOL INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto, WCHAR *foundProxy, DWORD *foundProxyLen) DECLSPEC_HIDDEN; -typedef enum { - BLOCKING_ALLOW, - BLOCKING_DISALLOW, - BLOCKING_WAITALL -} blocking_mode_t; - DWORD create_netconn(BOOL,server_t*,DWORD,BOOL,DWORD,netconn_t**) DECLSPEC_HIDDEN; void free_netconn(netconn_t*) DECLSPEC_HIDDEN; void NETCON_unload(void) DECLSPEC_HIDDEN; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index e82dd30..40f53de 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -280,9 +280,9 @@ void init_winsock(void) InitOnceExecuteOnce(&init_once, winsock_startup, NULL, NULL); } -static void set_socket_blocking(int socket, blocking_mode_t mode) +static void set_socket_blocking(int socket, BOOL is_blocking) { - ULONG arg = mode == BLOCKING_DISALLOW; + ULONG arg = !is_blocking; ioctlsocket(socket, FIONBIO, &arg); } @@ -297,7 +297,7 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t assert(server->addr_len); result = netconn->socket = socket(server->addr.ss_family, SOCK_STREAM, 0); if(result != -1) { - set_socket_blocking(netconn->socket, BLOCKING_DISALLOW); + set_socket_blocking(netconn->socket, FALSE); result = connect(netconn->socket, (struct sockaddr*)&server->addr, server->addr_len); if(result == -1) { @@ -326,7 +326,7 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t netconn->socket = -1; } else { - set_socket_blocking(netconn->socket, BLOCKING_ALLOW); + set_socket_blocking(netconn->socket, TRUE); } } if(result == -1) @@ -688,22 +688,17 @@ DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, } } -static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, blocking_mode_t mode, SIZE_T *ret_size, BOOL *eof) +static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, BOOL blocking, SIZE_T *ret_size, BOOL *eof) { const SIZE_T ssl_buf_size = conn->ssl_sizes.cbHeader+conn->ssl_sizes.cbMaximumMessage+conn->ssl_sizes.cbTrailer; SecBuffer bufs[4]; SecBufferDesc buf_desc = {SECBUFFER_VERSION, sizeof(bufs)/sizeof(*bufs), bufs}; SSIZE_T size, buf_len = 0; - blocking_mode_t tmp_mode; int i; SECURITY_STATUS res; assert(conn->extra_len < ssl_buf_size); - /* BLOCKING_WAITALL is handled by caller */ - if(mode == BLOCKING_WAITALL) - mode = BLOCKING_ALLOW; - if(conn->extra_len) { memcpy(conn->ssl_buf, conn->extra_buf, conn->extra_len); buf_len = conn->extra_len; @@ -712,8 +707,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, blocking conn->extra_buf = NULL; } - tmp_mode = buf_len ? BLOCKING_DISALLOW : mode; - set_socket_blocking(conn->socket, tmp_mode); + set_socket_blocking(conn->socket, blocking && !buf_len); size = sock_recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, 0); if(size < 0) { if(!buf_len) { @@ -728,11 +722,10 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, blocking buf_len += size; } - *ret_size = buf_len; - if(!buf_len) { TRACE("EOF\n"); *eof = TRUE; + *ret_size = 0; return ERROR_SUCCESS; } @@ -755,7 +748,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, blocking case SEC_E_INCOMPLETE_MESSAGE: assert(buf_len < ssl_buf_size); - set_socket_blocking(conn->socket, mode); + set_socket_blocking(conn->socket, blocking); size = sock_recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, 0); if(size < 1) { if(size < 0 && WSAGetLastError() == WSAEWOULDBLOCK) { @@ -826,9 +819,9 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, BOOL blocking, i if (!connection->secure) { - set_socket_blocking(connection->socket, blocking ? BLOCKING_ALLOW : BLOCKING_DISALLOW); - *recvd = sock_recv(connection->socket, buf, len, 0); - return *recvd == -1 ? WSAGetLastError() : ERROR_SUCCESS; + set_socket_blocking(connection->socket, blocking); + *recvd = sock_recv(connection->socket, buf, len, 0); + return *recvd == -1 ? WSAGetLastError() : ERROR_SUCCESS; } else { @@ -852,7 +845,7 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, BOOL blocking, i } do { - res = read_ssl_chunk(connection, (BYTE*)buf+size, len-size, blocking ? BLOCKING_ALLOW : BLOCKING_DISALLOW, &size, &eof); + res = read_ssl_chunk(connection, (BYTE*)buf, len, blocking, &size, &eof); if(res != ERROR_SUCCESS) { if(res == WSAEWOULDBLOCK) { if(size) @@ -901,9 +894,9 @@ BOOL NETCON_is_alive(netconn_t *netconn) int len; char b; - set_socket_blocking(netconn->socket, BLOCKING_DISALLOW); + set_socket_blocking(netconn->socket, FALSE); len = sock_recv(netconn->socket, &b, 1, MSG_PEEK); - set_socket_blocking(netconn->socket, BLOCKING_ALLOW); + set_socket_blocking(netconn->socket, TRUE); return len == 1 || (len == -1 && WSAGetLastError() == WSAEWOULDBLOCK); }

1 0

Huw Davies : gdi32/tests: Japanese Win 7 uses MS Shell Dlg as its default GUI font.
by Alexandre Julliard June 19, 2015

June 19, 2015

Module: wine Branch: master Commit: c81ff0f8cfc1a7b6fa7546d8ffb656e290ef5e7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c81ff0f8cfc1a7b6fa7546d8f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 19 09:24:23 2015 +0100 gdi32/tests: Japanese Win 7 uses MS Shell Dlg as its default GUI font. --- dlls/gdi32/tests/font.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index a590ce8..f26c227 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5705,7 +5705,7 @@ static void test_stock_fonts(void) int charset, weight, height, height_pixels, dpi; const char face_name[LF_FACESIZE]; WORD lang_id; - } td[][11] = + } td[][12] = { { /* ANSI_FIXED_FONT */ { ANSI_CHARSET, FW_NORMAL, 12, 12, 96, "Courier", LANG_ARABIC }, @@ -5737,6 +5737,7 @@ static void test_stock_fonts(void) { 0 } }, { /* DEFAULT_GUI_FONT */ + { SHIFTJIS_CHARSET, FW_NORMAL, -11, 13, 96, "MS Shell Dlg" }, { SHIFTJIS_CHARSET, FW_NORMAL, -12, 15, 96, "?MS UI Gothic" }, { SHIFTJIS_CHARSET, FW_NORMAL, -15, 18, 120, "?MS UI Gothic" }, { HANGEUL_CHARSET, FW_NORMAL, -12, 15, 96, "?Gulim" }, @@ -5772,7 +5773,8 @@ static void test_stock_fonts(void) for (j = 0; td[i][j].face_name[0] != 0; j++) { if ((lf.lfCharSet != td[i][j].charset && td[i][j].charset != DEFAULT_CHARSET) || - (system_lang_id != td[i][j].lang_id && td[i][j].lang_id != LANG_NEUTRAL)) + (system_lang_id != td[i][j].lang_id && td[i][j].lang_id != LANG_NEUTRAL) || + (td[i][j].face_name[0] != '?' && strcmp(lf.lfFaceName, td[i][j].face_name))) { continue; }

1 0