January 2018 - Wine-Devel - list.winehq.org

[PATCH 1/2] wininet/test: Add InternetGetSecurityInfoByURLW test
by Wei Xie Jan. 5, 2018

Jan. 5, 2018

2 1

Re: [PATCH 1/2] wininet/test: Add InternetGetSecurityInfoByURLW test
by Marvin Jan. 5, 2018

Jan. 5, 2018

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=35089 Your paranoid android. === wvistau64 (64 bit http) === http.c:354: Test failed: unexpected status 30 (INTERNET_STATUS_SENDING_REQUEST) http.c:354: Test failed: unexpected status 31 (INTERNET_STATUS_REQUEST_SENT) http.c:354: Test failed: unexpected status 40 (INTERNET_STATUS_RECEIVING_RESPONSE) http.c:354: Test failed: unexpected status 50 (INTERNET_STATUS_CLOSING_CONNECTION) http.c:354: Test failed: unexpected status 51 (INTERNET_STATUS_CONNECTION_CLOSED) http.c:3253: Test failed: expected status 30 (INTERNET_STATUS_SENDING_REQUEST) 1 times, received 2 times http.c:3254: Test failed: expected status 31 (INTERNET_STATUS_REQUEST_SENT) 1 times, received 2 times http.c:3255: Test failed: expected status 40 (INTERNET_STATUS_RECEIVING_RESPONSE) 1 times, received 2 times === w2008s64 (64 bit http) === http.c:354: Test failed: unexpected status 50 (INTERNET_STATUS_CLOSING_CONNECTION) http.c:354: Test failed: unexpected status 51 (INTERNET_STATUS_CONNECTION_CLOSED) http.c:354: Test failed: unexpected status 30 (INTERNET_STATUS_SENDING_REQUEST) http.c:354: Test failed: unexpected status 31 (INTERNET_STATUS_REQUEST_SENT) http.c:4659: Test failed: expected status 30 (INTERNET_STATUS_SENDING_REQUEST) 1 times, received 2 times http.c:4660: Test failed: expected status 31 (INTERNET_STATUS_REQUEST_SENT) 1 times, received 2 times http.c:5314: Test failed: expected status 50 (INTERNET_STATUS_CLOSING_CONNECTION) 1 times, received 2 times http.c:5315: Test failed: expected status 51 (INTERNET_STATUS_CONNECTION_CLOSED) 1 times, received 2 times

1 0

[PATCH 1/1] wininet: Fix crash when connection is null in NETCON_secure_connect
by Wei Xie Jan. 4, 2018

Jan. 4, 2018

request->netconn may be released before call NETCON_secure_connect. 5029 if(!request->contentLength) 5030 http_release_netconn(request, TRUE); 5121 if (secure_proxy_connect && request->status_code == HTTP_STATUS_OK) 5122 { 5123 res = NETCON_secure_connect(request->netconn, request->server); I don't know how write a test patch

1 0

[PATCH 2/2] wininet: Check null pointer in InternetGetSecurityInfoByURLW
by Wei Xie Jan. 4, 2018

Jan. 4, 2018

The test will crash before apply this patch

1 0

[PATCH] gameux/tests: Add a trailing '\n' to an ok() call
by Alex Henrie Jan. 4, 2018

Jan. 4, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/gameux/tests/gameexplorer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 1ef7a780de..05c2a1104f 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -454,7 +454,7 @@ static void _findGameInstanceId(int line, ++dwMaxSubKeyLen; /* for string terminator */ lpName = CoTaskMemAlloc(dwMaxSubKeyLen*sizeof(WCHAR)); if(!lpName) hr = E_OUTOFMEMORY; - ok_(__FILE__, line)(SUCCEEDED(hr), "cannot allocate memory for key name"); + ok_(__FILE__, line)(SUCCEEDED(hr), "cannot allocate memory for key name\n"); } if(SUCCEEDED(hr)) -- 2.15.1

2 1

[PATCH 2/2] wininet: Check null pointer in InternetGetSecurityInfoByURLW
by Wei Xie Jan. 4, 2018

Jan. 4, 2018

The test will crash before apply this patch ------------------ 武汉深之度科技有限公司 Wuhan Deepin Technology Co., Ltd. 　　谢威手机：18038104349 武汉：武汉市光谷大道77号光谷金融港B18栋6楼北京：北京市西城区新街口外大街28号院普天德胜B座603室上海：上海市长宁区愚园路1258号15A01室官网：www.deepin.org　　官博：深度操作系统

1 0

Re: [PATCH] kernel32/tests: A spelling fix in a comment.
by Alex Henrie Jan. 4, 2018

Jan. 4, 2018

- /* Setup the remote process enviornment */ + /* Setup the remote process environment */ While you're at it, this should be "Set up" (the verb), not "Setup" (the noun). -Alex

2 1

[PATCH v2 1/9] wined3d: Add WINED3D_RTYPE_TEXTURE_1D.
by Sven Hesse Jan. 4, 2018

Jan. 4, 2018

Signed-off-by: Sven Hesse <shesse(a)codeweavers.com> --- dlls/wined3d/context.c | 6 ++++-- dlls/wined3d/device.c | 4 +++- dlls/wined3d/directx.c | 14 ++++++++++++++ dlls/wined3d/resource.c | 1 + dlls/wined3d/utils.c | 1 + include/wine/wined3d.h | 5 +++-- 6 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2e12d75213..53f177980d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -392,10 +392,11 @@ static inline void context_set_fbo_key_for_render_target(const struct wined3d_co struct wined3d_resource *resource = render_target->resource; struct wined3d_texture *texture; + if (resource && (resource->type == WINED3D_RTYPE_BUFFER || resource->type == WINED3D_RTYPE_TEXTURE_1D)) + FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); + if (!resource || resource->format->id == WINED3DFMT_NULL || resource->type == WINED3D_RTYPE_BUFFER) { - if (resource && resource->type == WINED3D_RTYPE_BUFFER) - FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); key->objects[idx].object = 0; key->objects[idx].target = 0; key->objects[idx].level = key->objects[idx].layer = 0; @@ -1017,6 +1018,7 @@ void context_resource_released(const struct wined3d_device *device, switch (type) { + case WINED3D_RTYPE_TEXTURE_1D: case WINED3D_RTYPE_TEXTURE_2D: case WINED3D_RTYPE_TEXTURE_3D: texture = texture_from_resource(resource); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a25b98d749..2b7d515af4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4239,7 +4239,8 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str height = 1; depth = 1; } - else if (resource->type == WINED3D_RTYPE_TEXTURE_2D || resource->type == WINED3D_RTYPE_TEXTURE_3D) + else if (resource->type == WINED3D_RTYPE_TEXTURE_1D || resource->type == WINED3D_RTYPE_TEXTURE_2D + || resource->type == WINED3D_RTYPE_TEXTURE_3D) { struct wined3d_texture *texture = texture_from_resource(resource); unsigned int level; @@ -5003,6 +5004,7 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso switch (type) { + case WINED3D_RTYPE_TEXTURE_1D: case WINED3D_RTYPE_TEXTURE_2D: case WINED3D_RTYPE_TEXTURE_3D: for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1586bdc821..abab0b1024 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5300,6 +5300,20 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad gl_type_end = WINED3D_GL_RES_TYPE_TEX_3D; break; + case WINED3D_RTYPE_TEXTURE_1D: + allowed_usage = WINED3DUSAGE_AUTOGENMIPMAP + | WINED3DUSAGE_DYNAMIC + | WINED3DUSAGE_SOFTWAREPROCESSING + | WINED3DUSAGE_TEXTURE + | WINED3DUSAGE_QUERY_FILTER + | WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING + | WINED3DUSAGE_QUERY_SRGBREAD + | WINED3DUSAGE_QUERY_SRGBWRITE + | WINED3DUSAGE_QUERY_VERTEXTEXTURE + | WINED3DUSAGE_QUERY_WRAPANDMIP; + gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_1D; + break; + case WINED3D_RTYPE_TEXTURE_2D: allowed_usage = WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_RENDERTARGET diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 40890cc99e..6260abb2f4 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -95,6 +95,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource_types[] = { {WINED3D_RTYPE_BUFFER, 0, WINED3D_GL_RES_TYPE_BUFFER}, + {WINED3D_RTYPE_TEXTURE_1D, 0, WINED3D_GL_RES_TYPE_TEX_1D}, {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_TEX_2D}, {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_TEX_RECT}, {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_RB}, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b3003f1302..daf7e7cba6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4217,6 +4217,7 @@ const char *debug_d3dresourcetype(enum wined3d_resource_type resource_type) #define WINED3D_TO_STR(x) case x: return #x WINED3D_TO_STR(WINED3D_RTYPE_NONE); WINED3D_TO_STR(WINED3D_RTYPE_BUFFER); + WINED3D_TO_STR(WINED3D_RTYPE_TEXTURE_1D); WINED3D_TO_STR(WINED3D_RTYPE_TEXTURE_2D); WINED3D_TO_STR(WINED3D_RTYPE_TEXTURE_3D); #undef WINED3D_TO_STR diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a519e94bb3..af89a7465f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -672,8 +672,9 @@ enum wined3d_resource_type { WINED3D_RTYPE_NONE = 0, WINED3D_RTYPE_BUFFER = 1, - WINED3D_RTYPE_TEXTURE_2D = 2, - WINED3D_RTYPE_TEXTURE_3D = 3, + WINED3D_RTYPE_TEXTURE_1D = 2, + WINED3D_RTYPE_TEXTURE_2D = 3, + WINED3D_RTYPE_TEXTURE_3D = 4, }; enum wined3d_pool -- 2.15.1

3 15

[PATCH v2] webservices/tests: Fix resource leak.
by Andrey Gusev Jan. 4, 2018

Jan. 4, 2018

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/webservices/tests/channel.c | 4 ++++ dlls/webservices/tests/proxy.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index 32820fed1f..17a0b58ac8 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -976,6 +976,7 @@ START_TEST(channel) thread = start_listener( &info ); test_message_read_write( &info ); WaitForSingleObject( thread, 3000 ); + CloseHandle(thread); info.type = WS_CHANNEL_TYPE_DUPLEX_SESSION; info.binding = WS_TCP_CHANNEL_BINDING; @@ -984,6 +985,7 @@ START_TEST(channel) thread = start_listener( &info ); test_duplex_session( &info ); WaitForSingleObject( thread, 3000 ); + CloseHandle(thread); info.type = WS_CHANNEL_TYPE_DUPLEX; info.binding = WS_UDP_CHANNEL_BINDING; @@ -992,6 +994,7 @@ START_TEST(channel) thread = start_listener( &info ); test_WsAcceptChannel( &info ); WaitForSingleObject( thread, 3000 ); + CloseHandle(thread); info.type = WS_CHANNEL_TYPE_DUPLEX_SESSION; info.binding = WS_TCP_CHANNEL_BINDING; @@ -999,6 +1002,7 @@ START_TEST(channel) thread = start_listener( &info ); test_WsAcceptChannel( &info ); WaitForSingleObject( thread, 3000 ); + CloseHandle(thread); if (firewall_enabled) set_firewall( APP_REMOVE ); } diff --git a/dlls/webservices/tests/proxy.c b/dlls/webservices/tests/proxy.c index bc7ef81db7..95f980a2ff 100644 --- a/dlls/webservices/tests/proxy.c +++ b/dlls/webservices/tests/proxy.c @@ -732,7 +732,11 @@ START_TEST(proxy) ret = WaitForSingleObject( info.event, 3000 ); ok(ret == WAIT_OBJECT_0, "failed to start test server %u\n", GetLastError()); - if (ret != WAIT_OBJECT_0) return; + if (ret != WAIT_OBJECT_0) + { + CloseHandle(thread); + return; + } test_WsSendMessage( info.port, &test1 ); test_WsReceiveMessage( info.port ); @@ -741,4 +745,5 @@ START_TEST(proxy) test_WsSendMessage( info.port, &quit ); WaitForSingleObject( thread, 3000 ); + CloseHandle(thread); } -- 2.13.6

2 1

Re: [PATCH] gdiplus/tests: Add a trailing '\n' to ok() calls.
by Vincent Povirk Jan. 4, 2018

Jan. 4, 2018

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com>

1 0