December 2016 - Wine-Commits

Alexandre Julliard : ntdll: Check for invalid WINEARCH values.
by Alexandre Julliard Dec. 16, 2016

Dec. 16, 2016

Module: wine Branch: master Commit: df3b7958a731378d2a156d363bd9af36b34a9ac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df3b7958a731378d2a156d363… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 15:20:18 2016 +0100 ntdll: Check for invalid WINEARCH values. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 59b9ab9..ec517fc 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1375,7 +1375,15 @@ void server_init_process(void) fatal_perror( "Bad server socket %d", fd_socket ); unsetenv( "WINESERVERSOCKET" ); } - else fd_socket = server_connect(); + else + { + const char *arch = getenv( "WINEARCH" ); + + if (arch && strcmp( arch, "win32" ) && strcmp( arch, "win64" )) + fatal_error( "WINEARCH set to invalid value '%s', it must be either win32 or win64.\n", arch ); + + fd_socket = server_connect(); + } /* setup the signal mask */ sigemptyset( &server_block_set );

1 0

Józef Kucia : d3d11/tests: Improve trace() message about compute shader support via SM4.
by Alexandre Julliard Dec. 16, 2016

Dec. 16, 2016

Module: wine Branch: master Commit: c67a728c919cf956f2503df5ba49159e2e06c2f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c67a728c919cf956f2503df5b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 15 13:45:09 2016 +0100 d3d11/tests: Improve trace() message about compute shader support via SM4. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0edb5dc..98aaa4a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10054,7 +10054,7 @@ static void test_check_feature_support(void) hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS, &hwopts, sizeof(hwopts)); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - trace("Shader support %#x.\n", hwopts.ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x); + trace("Compute shader support via SM4 %#x.\n", hwopts.ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x); refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Józef Kucia : wined3d: Remove depth/ stencil format flags from typeless formats.
by Alexandre Julliard Dec. 16, 2016

Dec. 16, 2016

Module: wine Branch: master Commit: f752c09791170f33acfa3929a716f1c6ec7f0d38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f752c09791170f33acfa3929a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 15 13:45:05 2016 +0100 wined3d: Remove depth/stencil format flags from typeless formats. We have separate formats for depth/stencil typeless formats. This fixes blits for R32_TYPELESS and R16_TYPELESS formats. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 623a462..0c79f90 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3443,7 +3443,10 @@ static BOOL init_typeless_formats(struct wined3d_gl_info *gl_info) typeless_ds_format->id = typeless_depth_stencil_formats[i].typeless_id; copy_format(typeless_ds_format, ds_format); for (j = 0; j < ARRAY_SIZE(typeless_ds_format->flags); ++j) + { typeless_ds_format->flags[j] = typeless_format->flags[j]; + typeless_format->flags[j] &= ~(WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); + } if ((format_id = typeless_depth_stencil_formats[i].depth_view_id)) {

1 0

Józef Kucia : d3d11/tests: Use single typeless RT with multiple RTVs in test_uav_load().
by Alexandre Julliard Dec. 16, 2016

Dec. 16, 2016

Module: wine Branch: master Commit: 5d9711da77a96b4eabb570e979b2a1473e8de71c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d9711da77a96b4eabb570e97… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 15 13:45:06 2016 +0100 d3d11/tests: Use single typeless RT with multiple RTVs in test_uav_load(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a55c074..0edb5dc 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11754,18 +11754,17 @@ static void test_uav_load(void) D3D11_SUBRESOURCE_DATA data[3]; }; - /* FIXME: Use a single R32_TYPELESS RT with multiple RTVs. */ ID3D11RenderTargetView *rtv_float, *rtv_uint, *rtv_sint; - ID3D11Texture2D *rt_float, *rt_uint, *rt_sint; D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc; + D3D11_RENDER_TARGET_VIEW_DESC rtv_desc; struct d3d11_test_context test_context; const struct texture *current_texture; + ID3D11Texture2D *texture, *rt_texture; D3D11_TEXTURE2D_DESC texture_desc; const struct shader *current_ps; ID3D11UnorderedAccessView *uav; ID3D11DeviceContext *context; struct resource_readback rb; - ID3D11Texture2D *texture; ID3D11PixelShader *ps; ID3D11Device *device; unsigned int i, x, y; @@ -11973,29 +11972,29 @@ static void test_uav_load(void) texture_desc.Height = 480; texture_desc.MipLevels = 1; texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R32_TYPELESS; texture_desc.SampleDesc.Count = 1; texture_desc.SampleDesc.Quality = 0; texture_desc.Usage = D3D11_USAGE_DEFAULT; texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET; texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; - - texture_desc.Format = DXGI_FORMAT_R32_FLOAT; - hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &rt_float); + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &rt_texture); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)rt_float, NULL, &rtv_float); + + rtv_desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D; + U(rtv_desc).Texture2D.MipSlice = 0; + + rtv_desc.Format = DXGI_FORMAT_R32_FLOAT; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)rt_texture, &rtv_desc, &rtv_float); ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); - texture_desc.Format = DXGI_FORMAT_R32_UINT; - hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &rt_uint); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)rt_uint, NULL, &rtv_uint); + rtv_desc.Format = DXGI_FORMAT_R32_UINT; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)rt_texture, &rtv_desc, &rtv_uint); ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); - texture_desc.Format = DXGI_FORMAT_R32_SINT; - hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &rt_sint); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)rt_sint, NULL, &rtv_sint); + rtv_desc.Format = DXGI_FORMAT_R32_SINT; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)rt_texture, &rtv_desc, &rtv_sint); ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); texture_desc.BindFlags = D3D11_BIND_UNORDERED_ACCESS; @@ -12012,7 +12011,6 @@ static void test_uav_load(void) { const struct test *test = &tests[i]; ID3D11RenderTargetView *current_rtv; - ID3D11Texture2D *current_rt; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &test->constant, 0, 0); @@ -12058,20 +12056,16 @@ static void test_uav_load(void) { case DXGI_FORMAT_R32_FLOAT: current_rtv = rtv_float; - current_rt = rt_float; break; case DXGI_FORMAT_R32_UINT: current_rtv = rtv_uint; - current_rt = rt_uint; break; case DXGI_FORMAT_R32_SINT: current_rtv = rtv_sint; - current_rt = rt_sint; break; default: trace("Unhandled format %#x.\n", uav_desc.Format); current_rtv = NULL; - current_rt = NULL; break; } @@ -12082,7 +12076,7 @@ static void test_uav_load(void) draw_quad(&test_context); - get_texture_readback(current_rt, 0, &rb); + get_texture_readback(rt_texture, 0, &rb); for (y = 0; y < 4; ++y) { for (x = 0; x < 4; ++x) @@ -12104,9 +12098,7 @@ static void test_uav_load(void) ID3D11RenderTargetView_Release(rtv_float); ID3D11RenderTargetView_Release(rtv_sint); ID3D11RenderTargetView_Release(rtv_uint); - ID3D11Texture2D_Release(rt_float); - ID3D11Texture2D_Release(rt_sint); - ID3D11Texture2D_Release(rt_uint); + ID3D11Texture2D_Release(rt_texture); release_test_context(&test_context); }

1 0

Jacek Caban : wininet: Get rid of no longer needed INTERNET_INVALID_PORT_NUMBER in get_server.
by Alexandre Julliard Dec. 15, 2016

Dec. 15, 2016

Module: wine Branch: master Commit: 725b55ded212c48670e9991cd76cbb85470262fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=725b55ded212c48670e9991cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 15 18:36:04 2016 +0100 wininet: Get rid of no longer needed INTERNET_INVALID_PORT_NUMBER in get_server. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1dffbaa..635b7d6 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -270,9 +270,6 @@ server_t *get_server(substr_t name, INTERNET_PORT port, BOOL is_https, BOOL do_c { server_t *iter, *server = NULL; - if(port == INTERNET_INVALID_PORT_NUMBER) - port = INTERNET_DEFAULT_HTTP_PORT; - EnterCriticalSection(&connection_pool_cs); LIST_FOR_EACH_ENTRY(iter, &connection_pool, server_t, entry) {

1 0

Nikolay Sivov : dwrite/tests: Run GetPanose() tests on all system fonts.
by Alexandre Julliard Dec. 15, 2016

Dec. 15, 2016

Module: wine Branch: master Commit: a7845c312eedb5889a38384e47601fc22a61da8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7845c312eedb5889a38384e4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 15 06:48:58 2016 +0300 dwrite/tests: Run GetPanose() tests on all system fonts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 124 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 89 insertions(+), 35 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index d5126ff..eb47a05 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -5078,11 +5078,38 @@ static void test_GetGdiCompatibleMetrics(void) IDWriteFactory_Release(factory); } +static void get_expected_panose(IDWriteFont1 *font, DWRITE_PANOSE *panose) +{ + IDWriteFontFace *fontface; + const TT_OS2_V2 *tt_os2; + void *os2_context; + UINT32 size; + BOOL exists; + HRESULT hr; + + memset(panose, 0, sizeof(*panose)); + + hr = IDWriteFont1_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + + if (tt_os2) { + memcpy(panose, &tt_os2->panose, sizeof(*panose)); + IDWriteFontFace_ReleaseFontTable(fontface, os2_context); + } + + IDWriteFontFace_Release(fontface); +} + static void test_GetPanose(void) { + IDWriteFontCollection *syscollection; IDWriteFactory *factory; IDWriteFont1 *font1; IDWriteFont *font; + UINT count, i; HRESULT hr; factory = create_factory(); @@ -5090,56 +5117,83 @@ static void test_GetPanose(void) hr = IDWriteFont_QueryInterface(font, &IID_IDWriteFont1, (void**)&font1); IDWriteFont_Release(font); - if (hr == S_OK) { + + if (FAILED(hr)) { + IDWriteFactory_Release(factory); + win_skip("GetPanose() is not supported.\n"); + return; + } + + hr = IDWriteFactory_GetSystemFontCollection(factory, &syscollection, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + count = IDWriteFontCollection_GetFontFamilyCount(syscollection); + + for (i = 0; i < count; i++) { + DWRITE_PANOSE panose, expected_panose; + IDWriteLocalizedStrings *names; IDWriteFontFace3 *fontface3; IDWriteFontFace *fontface; - DWRITE_PANOSE panose; + IDWriteFontFamily *family; + IDWriteFont1 *font1; + IDWriteFont *font; + WCHAR nameW[256]; - if (0) /* crashes on native */ - IDWriteFont1_GetPanose(font1, NULL); + hr = IDWriteFontCollection_GetFontFamily(syscollection, i, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); - memset(&panose, 0, sizeof(panose)); - IDWriteFont1_GetPanose(font1, &panose); - ok(panose.familyKind == DWRITE_PANOSE_FAMILY_TEXT_DISPLAY, - "got %u\n", panose.familyKind); - ok(panose.text.serifStyle == DWRITE_PANOSE_SERIF_STYLE_NORMAL_SANS, - "got %u\n", panose.text.serifStyle); - ok(panose.text.weight == DWRITE_PANOSE_WEIGHT_MEDIUM, - "got %u\n", panose.text.weight); - ok(panose.text.proportion == DWRITE_PANOSE_PROPORTION_EVEN_WIDTH, - "got %u\n", panose.text.proportion); - ok(panose.text.contrast == DWRITE_PANOSE_CONTRAST_VERY_LOW, - "got %u\n", panose.text.contrast); - ok(panose.text.strokeVariation == DWRITE_PANOSE_STROKE_VARIATION_GRADUAL_VERTICAL, - "got %u\n", panose.text.strokeVariation); - ok(panose.text.armStyle == DWRITE_PANOSE_ARM_STYLE_STRAIGHT_ARMS_VERTICAL, - "got %u\n", panose.text.armStyle); - ok(panose.text.letterform == DWRITE_PANOSE_LETTERFORM_NORMAL_BOXED, - "got %u\n", panose.text.letterform); - ok(panose.text.midline == DWRITE_PANOSE_MIDLINE_STANDARD_TRIMMED, - "got %u\n", panose.text.midline); - ok(panose.text.xHeight == DWRITE_PANOSE_XHEIGHT_CONSTANT_LARGE, - "got %u\n", panose.text.xHeight); + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STRETCH_NORMAL, + DWRITE_FONT_STYLE_NORMAL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFont1_CreateFontFace(font1, &fontface); + hr = IDWriteFont_QueryInterface(font, &IID_IDWriteFont1, (void **)&font1); ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); - hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace3, (void**)&fontface3); - IDWriteFontFace_Release(fontface); - if (hr == S_OK) { - DWRITE_PANOSE panose2; + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "got 0x%08x\n", hr); + + get_enus_string(names, nameW, sizeof(nameW)/sizeof(nameW[0])); + + IDWriteLocalizedStrings_Release(names); - IDWriteFontFace3_GetPanose(fontface3, &panose2); - ok(!memcmp(&panose, &panose2, sizeof(panose)), "wrong panose data\n"); + IDWriteFont1_GetPanose(font1, &panose); + get_expected_panose(font1, &expected_panose); + + ok(panose.values[0] == expected_panose.values[0], "%s: values[0] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + panose.values[0], expected_panose.values[0]); + ok(panose.values[1] == expected_panose.values[1], "%s: values[1] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + panose.values[1], expected_panose.values[1]); + ok(panose.values[2] == expected_panose.values[2], "%s: values[2] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + panose.values[2], expected_panose.values[2]); + ok(panose.values[3] == expected_panose.values[3], "%s: values[3] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + panose.values[3], expected_panose.values[3]); + ok(panose.values[4] == expected_panose.values[4], "%s: values[4] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + panose.values[4], expected_panose.values[4]); + ok(panose.values[5] == expected_panose.values[5], "%s: values[5] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + panose.values[5], expected_panose.values[5]); + ok(panose.values[6] == expected_panose.values[6], "%s: values[6] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + panose.values[6], expected_panose.values[6]); + ok(panose.values[7] == expected_panose.values[7], "%s: values[7] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + panose.values[7], expected_panose.values[7]); + ok(panose.values[8] == expected_panose.values[8], "%s: values[8] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + panose.values[8], expected_panose.values[8]); + ok(panose.values[9] == expected_panose.values[9], "%s: values[9] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + panose.values[9], expected_panose.values[9]); + hr = IDWriteFont1_CreateFontFace(font1, &fontface); + ok(hr == S_OK, "Failed to create a font face, %#x.\n", hr); + if (IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace3, (void **)&fontface3) == S_OK) { + ok(!memcmp(&panose, &expected_panose, sizeof(panose)), "%s: Unexpected panose from font face.\n", + wine_dbgstr_w(nameW)); IDWriteFontFace3_Release(fontface3); } + IDWriteFontFace_Release(fontface); IDWriteFont1_Release(font1); + IDWriteFontFamily_Release(family); } - else - win_skip("GetPanose() is not supported.\n"); + IDWriteFontCollection_Release(syscollection); IDWriteFactory_Release(factory); }

1 0

Michael Müller : wininet: Handle INTERNET_INVALID_PORT_NUMBER in HttpOpenRequest.
by Alexandre Julliard Dec. 15, 2016

Dec. 15, 2016

Module: wine Branch: master Commit: 0d22e43f8c12fb6df92af2e05ac35cbdf1c3fe3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d22e43f8c12fb6df92af2e05… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Dec 15 18:35:53 2016 +0100 wininet: Handle INTERNET_INVALID_PORT_NUMBER in HttpOpenRequest. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 9 +++++++-- dlls/wininet/tests/http.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 658342b..1dffbaa 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3359,7 +3359,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, { appinfo_t *hIC = session->appInfo; http_request_t *request; - DWORD len; + DWORD port, len; TRACE("-->\n"); @@ -3388,7 +3388,12 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, request->session = session; list_add_head( &session->hdr.children, &request->hdr.entry ); - request->server = get_server(substrz(session->hostName), session->hostPort, (dwFlags & INTERNET_FLAG_SECURE) != 0, TRUE); + port = session->hostPort; + if (port == INTERNET_INVALID_PORT_NUMBER) + port = (session->hdr.dwFlags & INTERNET_FLAG_SECURE) ? + INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT; + + request->server = get_server(substrz(session->hostName), port, (dwFlags & INTERNET_FLAG_SECURE) != 0, TRUE); if(!request->server) { WININET_Release(&request->hdr); return ERROR_OUTOFMEMORY; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 9cda9c5..fb64e3c 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6212,13 +6212,13 @@ static void test_default_service_port(void) ok(request != NULL, "HttpOpenRequest failed\n"); ret = HttpSendRequestA(request, NULL, 0, NULL, 0); - todo_wine ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); size = sizeof(buffer); memset(buffer, 0, sizeof(buffer)); ret = HttpQueryInfoA(request, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); ok(ret, "HttpQueryInfo failed with error %u\n", GetLastError()); - todo_wine ok(!strcmp(buffer, "test.winehq.org"), "Expected test.winehg.org, got '%s'\n", buffer); + ok(!strcmp(buffer, "test.winehq.org"), "Expected test.winehg.org, got '%s'\n", buffer); InternetCloseHandle(request); InternetCloseHandle(connect); @@ -6237,7 +6237,7 @@ static void test_default_service_port(void) memset(buffer, 0, sizeof(buffer)); ret = HttpQueryInfoA(request, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); ok(ret, "HttpQueryInfo failed with error %u\n", GetLastError()); - todo_wine ok(!strcmp(buffer, "test.winehq.org:443"), "Expected test.winehg.org:443, got '%s'\n", buffer); + ok(!strcmp(buffer, "test.winehq.org:443"), "Expected test.winehg.org:443, got '%s'\n", buffer); InternetCloseHandle(request); InternetCloseHandle(connect);

1 0

Fabian Maurer : shlwapi: Changed UrlEscapeW error paths and add tests.
by Alexandre Julliard Dec. 14, 2016

Dec. 14, 2016

Module: wine Branch: master Commit: 101edb1f6dd96849de92f98297d450064b3cc0c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=101edb1f6dd96849de92f9829… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Dec 14 16:47:51 2016 +0100 shlwapi: Changed UrlEscapeW error paths and add tests. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/url.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/shlwapi/url.c | 2 +- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index f9fc79a..f1c0965 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -930,12 +930,14 @@ static void test_UrlEscapeA(void) static void test_UrlEscapeW(void) { + static const WCHAR path_test[] = {'/','t','e','s','t',0}; static const WCHAR naW[] = {'f','t','p',31,255,250,0x2122,'e','n','d','/',0}; static const WCHAR naescapedW[] = {'f','t','p','%','1','F','%','F','F','%','F','A',0x2122,'e','n','d','/',0}; static const WCHAR out[] = {'f','o','o','%','2','0','b','a','r',0}; WCHAR overwrite[] = {'f','o','o',' ','b','a','r',0,0,0}; WCHAR ret_urlW[INTERNET_MAX_URL_LENGTH]; - DWORD size = 0; + WCHAR empty_string[] = {0}; + DWORD size; HRESULT ret; WCHAR wc; int i; @@ -945,6 +947,42 @@ static void test_UrlEscapeW(void) return; } + /* Check error paths */ + + ret = UrlEscapeW(path_test, NULL, NULL, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); + + size = 0; + ret = UrlEscapeW(path_test, NULL, &size, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); + ok(size == 0, "got %d, expected %d\n", size, 0); + + ret = UrlEscapeW(path_test, empty_string, NULL, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); + + size = 0; + ret = UrlEscapeW(path_test, empty_string, &size, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); + ok(size == 0, "got %d, expected %d\n", size, 0); + + ret = UrlEscapeW(path_test, NULL, NULL, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); + + size = 1; + ret = UrlEscapeW(path_test, NULL, &size, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); + ok(size == 1, "got %d, expected %d\n", size, 1); + + ret = UrlEscapeW(path_test, empty_string, NULL, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); + + size = 1; + ret = UrlEscapeW(path_test, empty_string, &size, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_POINTER, "got %x, expected %x\n", ret, E_POINTER); + ok(size == 6, "got %d, expected %d\n", size, 6); + + /* Check actual escaping */ + size = sizeof(overwrite)/sizeof(WCHAR); ret = pUrlEscapeW(overwrite, overwrite, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == S_OK, "got %x, expected S_OK\n", ret); diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 2caf998..89d5a5d 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -1089,7 +1089,7 @@ HRESULT WINAPI UrlEscapeW( TRACE("(%p(%s) %p %p 0x%08x)\n", pszUrl, debugstr_w(pszUrl), pszEscaped, pcchEscaped, dwFlags); - if(!pszUrl || !pcchEscaped) + if(!pszUrl || !pcchEscaped || !pszEscaped || *pcchEscaped == 0) return E_INVALIDARG; if(dwFlags & ~(URL_ESCAPE_SPACES_ONLY |

1 0

Aric Stewart : ime: Do not send WM_IME_ENDCOMPOSITION on CPS_COMPLETE if there is no composition.
by Alexandre Julliard Dec. 14, 2016

Dec. 14, 2016

Module: wine Branch: master Commit: 333c5bd9dd314b1ce68a1518e85ceb80a3e9abd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=333c5bd9dd314b1ce68a1518e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 14 12:30:23 2016 -0600 ime: Do not send WM_IME_ENDCOMPOSITION on CPS_COMPLETE if there is no composition. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/ime.c | 7 +++++-- dlls/winex11.drv/ime.c | 8 +++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 7681e8e..846f9bd 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -839,6 +839,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) cpstr = (LPWSTR)&cdata[cs->dwCompStrOffset]; ImmUnlockIMCC(lpIMC->hCompStr); } + myPrivate = ImmLockIMCC(lpIMC->hPrivate); if (cplen > 0) { WCHAR param = cpstr[0]; @@ -855,11 +856,13 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) GenerateIMEMessage(hIMC, WM_IME_COMPOSITION, param, GCS_RESULTSTR | GCS_RESULTCLAUSE); + + GenerateIMEMessage(hIMC, WM_IME_ENDCOMPOSITION, 0, 0); } + else if (myPrivate->bInComposition) + GenerateIMEMessage(hIMC, WM_IME_ENDCOMPOSITION, 0, 0); - GenerateIMEMessage(hIMC, WM_IME_ENDCOMPOSITION, 0, 0); - myPrivate = ImmLockIMCC(lpIMC->hPrivate); myPrivate->bInComposition = FALSE; ImmUnlockIMCC(lpIMC->hPrivate); diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 06576dd..0f4d2b2 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -763,6 +763,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) cpstr = (LPWSTR)&(cdata[cs->dwCompStrOffset]); ImmUnlockIMCC(lpIMC->hCompStr); } + myPrivate = ImmLockIMCC(lpIMC->hPrivate); if (cplen > 0) { WCHAR param = cpstr[0]; @@ -779,11 +780,12 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) GenerateIMEMessage(hIMC, WM_IME_COMPOSITION, param, GCS_RESULTSTR|GCS_RESULTCLAUSE); - } - GenerateIMEMessage(hIMC,WM_IME_ENDCOMPOSITION, 0, 0); + GenerateIMEMessage(hIMC,WM_IME_ENDCOMPOSITION, 0, 0); + } + else if (myPrivate->bInComposition) + GenerateIMEMessage(hIMC,WM_IME_ENDCOMPOSITION, 0, 0); - myPrivate = ImmLockIMCC(lpIMC->hPrivate); myPrivate->bInComposition = FALSE; ImmUnlockIMCC(lpIMC->hPrivate);

1 0

Bruno Jesus : xinput1_3/tests: Add interactive tests.
by Alexandre Julliard Dec. 14, 2016

Dec. 14, 2016

Module: wine Branch: master Commit: 6b88529b3c414fa62763f3240fa967ada82f103b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b88529b3c414fa62763f3240… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Dec 13 23:21:59 2016 -0200 xinput1_3/tests: Add interactive tests. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index 0deab26..87f9929 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -96,8 +96,7 @@ static void test_get_state(void) XINPUT_STATE state; XINPUT_STATE_EX state_ex; } xinput; - DWORD controllerNum, i; - DWORD result; + DWORD controllerNum, i, result, good = XUSER_MAX_COUNT; for (i = 0; i < (pXInputGetStateEx ? 2 : 1); i++) { @@ -120,7 +119,10 @@ static void test_get_state(void) trace("-- Results for controller %d --\n", controllerNum); if (i == 0) + { + good = controllerNum; trace("XInputGetState: %d\n", result); + } else trace("XInputGetStateEx: %d\n", result); trace("State->dwPacketNumber: %d\n", xinput.state.dwPacketNumber); @@ -141,6 +143,28 @@ static void test_get_state(void) result = pXInputGetStateEx(XUSER_MAX_COUNT+1, &xinput.state_ex); ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); } + + if (winetest_interactive && good < XUSER_MAX_COUNT) + { + DWORD now = GetTickCount(), packet = 0; + XINPUT_GAMEPAD *game = &xinput.state.Gamepad; + + trace("You have 20 seconds to test the joystick freely\n"); + do + { + Sleep(100); + pXInputGetState(good, &xinput.state); + if (xinput.state.dwPacketNumber == packet) + continue; + + packet = xinput.state.dwPacketNumber; + trace("Buttons 0x%04X Triggers %3d/%3d LT %6d/%6d RT %6d/%6d\n", + game->wButtons, game->bLeftTrigger, game->bRightTrigger, + game->sThumbLX, game->sThumbLY, game->sThumbRX, game->sThumbRY); + } + while(GetTickCount() - now < 20000); + trace("Test over...\n"); + } } static void test_get_keystroke(void)

1 0