September 2018 - Wine-commits

Józef Kucia : dxgi: Fix dxgi_output_QueryInterface().
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: b3d819a1d7a406176e343ebfc9ef74341a2f098b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3d819a1d7a406176e343ebf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 6 22:01:54 2018 +0200 dxgi: Fix dxgi_output_QueryInterface(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44655 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/dxgi/output.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 2b168fb..868a368 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -41,20 +41,24 @@ static inline struct dxgi_output *impl_from_IDXGIOutput4(IDXGIOutput4 *iface) /* IUnknown methods */ -static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput4 *iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput4 *iface, REFIID iid, void **object) { - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - - if (IsEqualGUID(riid, &IID_IDXGIOutput) - || IsEqualGUID(riid, &IID_IDXGIObject) - || IsEqualGUID(riid, &IID_IUnknown)) + TRACE("iface %p, iid %s, object %p.\n", iface, debugstr_guid(iid), object); + + if (IsEqualGUID(iid, &IID_IDXGIOutput4) + || IsEqualGUID(iid, &IID_IDXGIOutput3) + || IsEqualGUID(iid, &IID_IDXGIOutput2) + || IsEqualGUID(iid, &IID_IDXGIOutput1) + || IsEqualGUID(iid, &IID_IDXGIOutput) + || IsEqualGUID(iid, &IID_IDXGIObject) + || IsEqualGUID(iid, &IID_IUnknown)) { IUnknown_AddRef(iface); *object = iface; return S_OK; } - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); *object = NULL; return E_NOINTERFACE;

1 0

Józef Kucia : d3d11: Normalize D3D11_BLEND_DESC.
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: 66996c602d61f1c5ec1040a5a3526480a6b8744c URL: https://source.winehq.org/git/wine.git/?a=commit;h=66996c602d61f1c5ec1040a5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 6 22:01:55 2018 +0200 d3d11: Normalize D3D11_BLEND_DESC. 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/state.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index d4c3bef..9848690 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -328,12 +328,24 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC { j = desc->IndependentBlendEnable ? i : 0; tmp_desc.RenderTarget[i].BlendEnable = desc->RenderTarget[j].BlendEnable; - tmp_desc.RenderTarget[i].SrcBlend = desc->RenderTarget[j].SrcBlend; - tmp_desc.RenderTarget[i].DestBlend = desc->RenderTarget[j].DestBlend; - tmp_desc.RenderTarget[i].BlendOp = desc->RenderTarget[j].BlendOp; - tmp_desc.RenderTarget[i].SrcBlendAlpha = desc->RenderTarget[j].SrcBlendAlpha; - tmp_desc.RenderTarget[i].DestBlendAlpha = desc->RenderTarget[j].DestBlendAlpha; - tmp_desc.RenderTarget[i].BlendOpAlpha = desc->RenderTarget[j].BlendOpAlpha; + if (tmp_desc.RenderTarget[i].BlendEnable) + { + tmp_desc.RenderTarget[i].SrcBlend = desc->RenderTarget[j].SrcBlend; + tmp_desc.RenderTarget[i].DestBlend = desc->RenderTarget[j].DestBlend; + tmp_desc.RenderTarget[i].BlendOp = desc->RenderTarget[j].BlendOp; + tmp_desc.RenderTarget[i].SrcBlendAlpha = desc->RenderTarget[j].SrcBlendAlpha; + tmp_desc.RenderTarget[i].DestBlendAlpha = desc->RenderTarget[j].DestBlendAlpha; + tmp_desc.RenderTarget[i].BlendOpAlpha = desc->RenderTarget[j].BlendOpAlpha; + } + else + { + tmp_desc.RenderTarget[i].SrcBlend = D3D11_BLEND_ONE; + tmp_desc.RenderTarget[i].DestBlend = D3D11_BLEND_ZERO; + tmp_desc.RenderTarget[i].BlendOp = D3D11_BLEND_OP_ADD; + tmp_desc.RenderTarget[i].SrcBlendAlpha = D3D11_BLEND_ONE; + tmp_desc.RenderTarget[i].DestBlendAlpha = D3D11_BLEND_ZERO; + tmp_desc.RenderTarget[i].BlendOpAlpha = D3D11_BLEND_OP_ADD; + } tmp_desc.RenderTarget[i].RenderTargetWriteMask = desc->RenderTarget[j].RenderTargetWriteMask; if (i > 3 && tmp_desc.RenderTarget[i].RenderTargetWriteMask != D3D11_COLOR_WRITE_ENABLE_ALL)

1 0

Józef Kucia : d3d11: Pass normalized D3D11_DEPTH_STENCIL_DESC to wine_rb_put().
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: ffe182009edecc35f27edf48208fa8e941edd441 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffe182009edecc35f27edf48… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 6 22:01:56 2018 +0200 d3d11: Pass normalized D3D11_DEPTH_STENCIL_DESC to wine_rb_put(). 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/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 9848690..c36b87f 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -762,7 +762,7 @@ HRESULT d3d_depthstencil_state_create(struct d3d_device *device, const D3D11_DEP return hr; } - if (wine_rb_put(&device->depthstencil_states, desc, &object->entry) == -1) + if (wine_rb_put(&device->depthstencil_states, &tmp_desc, &object->entry) == -1) { ERR("Failed to insert depthstencil state entry.\n"); d3d_depthstencil_state_cleanup(object);

1 0

Józef Kucia : wined3d: Allow wined3d_device_update_sub_resource() only on GPU accessible resources.
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: 490c6d548abab55ea0a3913d55eecd26f01d1949 URL: https://source.winehq.org/git/wine.git/?a=commit;h=490c6d548abab55ea0a3913d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 6 22:01:57 2018 +0200 wined3d: Allow wined3d_device_update_sub_resource() only on GPU accessible resources. wined3d_device_update_sub_resource() should work only on D3D11_USAGE_DEFAULT resources. 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/device.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 96b8d3c..f6a0b39 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4229,6 +4229,12 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str if (flags) FIXME("Ignoring flags %#x.\n", flags); + if (!(resource->access & WINED3D_RESOURCE_ACCESS_GPU)) + { + WARN("Resource %p is not GPU accessible.\n", resource); + return; + } + if (resource->type == WINED3D_RTYPE_BUFFER) { if (sub_resource_idx > 0)

1 0

Józef Kucia : wined3d: Fix initial data for non-GPU buffers.
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: 3cd28caf17284af48a57538e06effbce26cefe0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cd28caf17284af48a57538e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 6 22:01:58 2018 +0200 wined3d: Fix initial data for non-GPU buffers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44655 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/buffer.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index a824d94..639a145 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1230,6 +1230,28 @@ void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_co wined3d_buffer_upload_ranges(buffer, context, data, range.offset, 1, &range); } +static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, + struct wined3d_device *device, const struct wined3d_sub_resource_data *data) +{ + struct wined3d_resource *resource = &buffer->resource; + struct wined3d_bo_address bo; + struct wined3d_box box; + + if (buffer->flags & WINED3D_BUFFER_USE_BO) + { + wined3d_box_set(&box, 0, 0, resource->size, 1, 0, 1); + wined3d_cs_emit_update_sub_resource(device->cs, resource, + 0, &box, data->data, data->row_pitch, data->slice_pitch); + } + else + { + wined3d_buffer_get_memory(buffer, &bo, WINED3D_LOCATION_SYSMEM); + memcpy(bo.addr, data->data, resource->size); + wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_SYSMEM); + wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_SYSMEM); + } +} + static ULONG buffer_resource_incref(struct wined3d_resource *resource) { return wined3d_buffer_incref(buffer_from_resource(resource)); @@ -1326,7 +1348,6 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device const struct wined3d_format *format = wined3d_get_format(device->adapter, format_id, usage); const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_resource *resource = &buffer->resource; - struct wined3d_box box; BOOL dynamic_buffer_ok; HRESULT hr; @@ -1408,11 +1429,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device buffer->maps_size = 1; if (data) - { - wined3d_box_set(&box, 0, 0, resource->size, 1, 0, 1); - wined3d_cs_emit_update_sub_resource(device->cs, resource, - 0, &box, data->data, data->row_pitch, data->slice_pitch); - } + wined3d_buffer_init_data(buffer, device, data); return WINED3D_OK; }

1 0

Józef Kucia : d3d11/tests: Add test for staging buffers.
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: 8abb76f4b159437bcb22f99bab13cdb07c559998 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8abb76f4b159437bcb22f99b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 6 22:01:59 2018 +0200 d3d11/tests: Add test for staging buffers. 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 | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index e43b2f3..c470e24 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28102,6 +28102,72 @@ static void test_depth_clip(void) release_test_context(&test_context); } +static void test_staging_buffers(void) +{ + struct d3d11_test_context test_context; + ID3D11Buffer *dst_buffer, *src_buffer; + D3D11_SUBRESOURCE_DATA resource_data; + D3D11_BUFFER_DESC buffer_desc; + ID3D11DeviceContext *context; + struct resource_readback rb; + float data[16], value; + ID3D11Device *device; + unsigned int i; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + buffer_desc.ByteWidth = sizeof(data); + buffer_desc.Usage = D3D11_USAGE_STAGING; + buffer_desc.BindFlags = 0; + buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; + buffer_desc.MiscFlags = 0; + buffer_desc.StructureByteStride = 0; + + for (i = 0; i < ARRAY_SIZE(data); ++i) + data[i] = i; + resource_data.pSysMem = data; + resource_data.SysMemPitch = 0; + resource_data.SysMemSlicePitch = 0; + + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, &resource_data, &src_buffer); + ok(hr == S_OK, "Failed to create buffer, hr %#x.\n", hr); + + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; + buffer_desc.CPUAccessFlags = 0; + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &dst_buffer); + ok(hr == S_OK, "Failed to create buffer, hr %#x.\n", hr); + + ID3D11DeviceContext_CopyResource(context, (ID3D11Resource *)dst_buffer, (ID3D11Resource *)src_buffer); + get_buffer_readback(dst_buffer, &rb); + for (i = 0; i < ARRAY_SIZE(data); ++i) + { + value = get_readback_float(&rb, i, 0); + ok(value == data[i], "Got unexpected value %.8e at %u.\n", value, i); + } + release_resource_readback(&rb); + + for (i = 0; i < ARRAY_SIZE(data); ++i) + data[i] = 2 * i; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)src_buffer, 0, NULL, data, 0, 0); + ID3D11DeviceContext_CopyResource(context, (ID3D11Resource *)dst_buffer, (ID3D11Resource *)src_buffer); + get_buffer_readback(dst_buffer, &rb); + for (i = 0; i < ARRAY_SIZE(data); ++i) + { + value = get_readback_float(&rb, i, 0); + ok(value == i, "Got unexpected value %.8e at %u.\n", value, i); + } + release_resource_readback(&rb); + + ID3D11Buffer_Release(dst_buffer); + ID3D11Buffer_Release(src_buffer); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -28249,6 +28315,7 @@ START_TEST(d3d11) queue_test(test_sample_shading); queue_test(test_sample_mask); queue_test(test_depth_clip); + queue_test(test_staging_buffers); run_queued_tests(); }

1 0

Józef Kucia : wined3d: Try to avoid allocating sysmem for GPU buffers with initial data.
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: eec2f1db5d1b209cf214ff0e7e70ce13a855e21c URL: https://source.winehq.org/git/wine.git/?a=commit;h=eec2f1db5d1b209cf214ff0e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 6 22:02:00 2018 +0200 wined3d: Try to avoid allocating sysmem for GPU buffers with initial data. 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/buffer.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 639a145..f381b2e 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1379,9 +1379,6 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device buffer->bind_flags = bind_flags; buffer->locations = data ? WINED3D_LOCATION_DISCARDED : WINED3D_LOCATION_SYSMEM; - if (!wined3d_resource_allocate_sysmem(&buffer->resource)) - return E_OUTOFMEMORY; - TRACE("buffer %p, size %#x, usage %#x, format %s, memory @ %p.\n", buffer, buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format->id), buffer->resource.heap_memory); @@ -1394,6 +1391,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device * the buffer to provide the same behavior to the application. */ TRACE("Pinning system memory.\n"); buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; + buffer->locations = WINED3D_LOCATION_SYSMEM; } /* Observations show that draw_primitive_immediate_mode() is faster on @@ -1418,6 +1416,12 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device buffer->flags |= WINED3D_BUFFER_USE_BO; } + if (buffer->locations & WINED3D_LOCATION_SYSMEM || !(buffer->flags & WINED3D_BUFFER_USE_BO)) + { + if (!wined3d_resource_allocate_sysmem(&buffer->resource)) + return E_OUTOFMEMORY; + } + if (!(buffer->maps = heap_alloc(sizeof(*buffer->maps)))) { ERR("Out of memory.\n");

1 0

Józef Kucia : wined3d: Add support for A8_UNORM render targets.
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: b457352f0c38a2c8d52fa84dcbcf1668ba4883bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b457352f0c38a2c8d52fa84d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 6 22:02:01 2018 +0200 wined3d: Add support for A8_UNORM render targets. Not supported in core contexts yet. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44655 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, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d75cbc1..6f13f91 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1531,7 +1531,8 @@ static const struct wined3d_format_texture_info format_texture_info[] = ARB_TEXTURE_RG, NULL}, {WINED3DFMT_A8_UNORM, GL_ALPHA8, GL_ALPHA8, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_RENDERTARGET, WINED3D_GL_LEGACY_CONTEXT, NULL}, {WINED3DFMT_B4G4R4X4_UNORM, GL_RGB4, GL_RGB4, 0, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV, 0,

1 0

Dmitry Timoshkov : wininet: Remove unused parameter from create_netconn().
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: 24f3d50cccfeabcc16282a1411cfe2040b682fda URL: https://source.winehq.org/git/wine.git/?a=commit;h=24f3d50cccfeabcc16282a14… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 5 11:36:38 2018 +0800 wininet: Remove unused parameter from create_netconn(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 3 +-- dlls/wininet/internet.h | 2 +- dlls/wininet/netconnection.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 75784da..b7be993 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4739,7 +4739,6 @@ static void http_process_keep_alive(http_request_t *req) static DWORD open_http_connection(http_request_t *request, BOOL *reusing) { - const BOOL is_https = (request->hdr.dwFlags & INTERNET_FLAG_SECURE) != 0; netconn_t *netconn = NULL; DWORD res; @@ -4794,7 +4793,7 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) request->server->addr_str, strlen(request->server->addr_str)+1); - res = create_netconn(is_https, request->proxy ? request->proxy : request->server, request->security_flags, + res = create_netconn(request->proxy ? request->proxy : request->server, request->security_flags, (request->hdr.ErrorMask & INTERNET_ERROR_MASK_COMBINED_SEC_CERT) != 0, request->connect_timeout, &netconn); if(res != ERROR_SUCCESS) { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 498a79b..8d4266a 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -428,7 +428,7 @@ VOID INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR dwContext, DWORD dwStatusInfoLength) DECLSPEC_HIDDEN; WCHAR *INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto) DECLSPEC_HIDDEN; -DWORD create_netconn(BOOL,server_t*,DWORD,BOOL,DWORD,netconn_t**) DECLSPEC_HIDDEN; +DWORD create_netconn(server_t*,DWORD,BOOL,DWORD,netconn_t**) DECLSPEC_HIDDEN; void free_netconn(netconn_t*) DECLSPEC_HIDDEN; void NETCON_unload(void) DECLSPEC_HIDDEN; DWORD NETCON_secure_connect(netconn_t*,server_t*) DECLSPEC_HIDDEN; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index bab046f..ccdb881 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -340,7 +340,7 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t return ERROR_SUCCESS; } -DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL mask_errors, DWORD timeout, netconn_t **ret) +DWORD create_netconn(server_t *server, DWORD security_flags, BOOL mask_errors, DWORD timeout, netconn_t **ret) { netconn_t *netconn; int result;

1 0

Michael Müller : wininet: Resize buffer when call to InternetCanonicalizeUrlW fails in InternetCrackUrlW.
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: bfe8510ec0c7bcef0be1f6990c56ad235d8bccd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfe8510ec0c7bcef0be1f699… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Aug 31 02:29:05 2018 +0000 wininet: Resize buffer when call to InternetCanonicalizeUrlW fails in InternetCrackUrlW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40598 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 21 ++++++++++++++++++--- dlls/wininet/tests/url.c | 6 +++--- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 6d0d35c..b407e85 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1664,7 +1664,7 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF if (dwFlags & ICU_DECODE) { - WCHAR *url_tmp; + WCHAR *url_tmp, *buffer; DWORD len = dwUrlLength + 1; BOOL ret; @@ -1673,9 +1673,24 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF SetLastError(ERROR_OUTOFMEMORY); return FALSE; } - ret = InternetCanonicalizeUrlW(url_tmp, url_tmp, &len, ICU_DECODE | ICU_NO_ENCODE); + + buffer = url_tmp; + ret = InternetCanonicalizeUrlW(url_tmp, buffer, &len, ICU_DECODE | ICU_NO_ENCODE); + if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + buffer = heap_alloc(len * sizeof(WCHAR)); + if (!buffer) + { + SetLastError(ERROR_OUTOFMEMORY); + heap_free(url_tmp); + return FALSE; + } + ret = InternetCanonicalizeUrlW(url_tmp, buffer, &len, ICU_DECODE | ICU_NO_ENCODE); + } if (ret) - ret = InternetCrackUrlW(url_tmp, len, dwFlags & ~ICU_DECODE, lpUC); + ret = InternetCrackUrlW(buffer, len, dwFlags & ~ICU_DECODE, lpUC); + + if (buffer != url_tmp) heap_free(buffer); heap_free(url_tmp); return ret; } diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 18c77b6..19ae7c3 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -816,9 +816,9 @@ static void InternetCrackUrlW_test(void) comp.lpszUrlPath = urlpart; comp.dwUrlPathLength = ARRAY_SIZE(urlpart); r = InternetCrackUrlW(url3, 0, ICU_DECODE, &comp); - todo_wine ok(r, "InternetCrackUrlW failed unexpectedly\n"); - todo_wine ok(!strcmp_wa(host, "x.org"), "host is %s, should be x.org\n", wine_dbgstr_w(host)); - ok(urlpart[0] == 0, "urlpart should be empty\n"); + ok(r, "InternetCrackUrlW failed unexpectedly\n"); + ok(!strcmp_wa(host, "x.org"), "host is %s, should be x.org\n", wine_dbgstr_w(host)); + todo_wine ok(urlpart[0] == 0, "urlpart should be empty\n"); } static void fill_url_components(URL_COMPONENTSA *lpUrlComponents)

1 0