May 2018 - Wine-commits - list.winehq.org

Zebediah Figura : odbccp32: Avoid using RegQueryInfoKey() in SQLGetInstalledDrivers().
by Alexandre Julliard 23 May '18

23 May '18

Module: wine Branch: master Commit: 5eb8894e93499638edb46b3b43557bd6f44adfe1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5eb8894e93499638edb46b3b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 22 16:27:57 2018 -0500 odbccp32: Avoid using RegQueryInfoKey() in SQLGetInstalledDrivers(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 8788330..862237c 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -510,15 +510,20 @@ BOOL WINAPI SQLGetInstalledDriversW(WCHAR *buf, WORD size, WORD *sizeout) return FALSE; } - RegQueryInfoKeyW(drivers, 0, 0, 0, 0, 0, 0, 0, &valuelen, 0, 0, 0); - value = heap_alloc(++valuelen * sizeof(WCHAR)); + valuelen = 256; + value = heap_alloc(valuelen * sizeof(WCHAR)); size--; while (1) { len = valuelen; - res = RegEnumValueW(drivers, index++, value, &len, NULL, NULL, NULL, NULL); + res = RegEnumValueW(drivers, index, value, &len, NULL, NULL, NULL, NULL); + while (res == ERROR_MORE_DATA) + { + value = heap_realloc(value, ++len * sizeof(WCHAR)); + res = RegEnumValueW(drivers, index, value, &len, NULL, NULL, NULL, NULL); + } if (res == ERROR_SUCCESS) { lstrcpynW(buf + written, value, size - written); @@ -532,6 +537,7 @@ BOOL WINAPI SQLGetInstalledDriversW(WCHAR *buf, WORD size, WORD *sizeout) ret = FALSE; break; } + index++; } buf[written++] = 0;

1 0

Dmitry Timoshkov : mstask: Avoid an infinite loop in ITask::GetNextRunTime () if weekly trigger runs every week.
by Alexandre Julliard 23 May '18

23 May '18

Module: wine Branch: master Commit: aad4302998e7ed4fa906e7d66c6b6f8fa2ad6172 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aad4302998e7ed4fa906e7d6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 23 15:47:55 2018 +0800 mstask: Avoid an infinite loop in ITask::GetNextRunTime() if weekly trigger runs every week. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 14705022..7a110b3 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -572,7 +572,7 @@ static HRESULT WINAPI MSTASK_ITask_GetNextRunTime(ITask *iface, SYSTEMTIME *rt) } } - if (st.wDayOfWeek == 0) /* Sunday, goto next week */ + if (st.wDayOfWeek == 0 && This->trigger[i].Type.Weekly.WeeksInterval > 1) /* Sunday, goto next week */ filetime_add_weeks(&current_ft, This->trigger[i].Type.Weekly.WeeksInterval - 1); else /* check next weekday */ filetime_add_days(&current_ft, 1);

1 0

Jactry Zeng : riched20/tests: Free retext after use.
by Alexandre Julliard 23 May '18

23 May '18

Module: wine Branch: master Commit: 42b325b855f52014fd08def1a552842aeb85485d URL: https://source.winehq.org/git/wine.git/?a=commit;h=42b325b855f52014fd08def1… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue May 22 16:31:18 2018 +0800 riched20/tests: Free retext after use. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/txtsrv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 73ca7cd..88b5adf 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -654,6 +654,7 @@ static void test_TxGetText(void) hres = ITextServices_TxGetText(txtserv, &rettext); ok(hres == S_OK, "ITextServices_TxGetText failed (result = %x)\n", hres); + SysFreeString(rettext); ITextServices_Release(txtserv); ITextHost_Release(host);

1 0

Pablo Martin : wined3d: Add unimplemented flags parameter to wined3d_device_update_sub_resource.
by Alexandre Julliard 23 May '18

23 May '18

Module: wine Branch: master Commit: b7d21a669dde9fef8a0bfd30fbe14cc55334c702 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7d21a669dde9fef8a0bfd30… Author: Pablo Martin <pmart-wine(a)riseup.net> Date: Tue May 22 14:37:49 2018 +0200 wined3d: Add unimplemented flags parameter to wined3d_device_update_sub_resource. Signed-off-by: Pablo Martin <pmart-wine(a)riseup.net> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 +- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/device.c | 10 +++++++--- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 68d6cf0..4ca4f46 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1054,7 +1054,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource(ID3D11De wined3d_resource = wined3d_resource_from_d3d11_resource(resource); wined3d_mutex_lock(); wined3d_device_update_sub_resource(device->wined3d_device, wined3d_resource, - subresource_idx, box ? &wined3d_box : NULL, data, row_pitch, depth_pitch); + subresource_idx, box ? &wined3d_box : NULL, data, row_pitch, depth_pitch, 0); wined3d_mutex_unlock(); } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 3f4552f..e06d156 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1407,7 +1407,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device if (data) wined3d_device_update_sub_resource(device, &buffer->resource, - 0, NULL, data->data, data->row_pitch, data->slice_pitch); + 0, NULL, data->data, data->row_pitch, data->slice_pitch, 0); return WINED3D_OK; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9906f74..0f590c4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4299,13 +4299,17 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, - unsigned int depth_pitch) + unsigned int depth_pitch, unsigned int flags) { unsigned int width, height, depth; struct wined3d_box b; - TRACE("device %p, resource %p, sub_resource_idx %u, box %s, data %p, row_pitch %u, depth_pitch %u.\n", - device, resource, sub_resource_idx, debug_box(box), data, row_pitch, depth_pitch); + TRACE("device %p, resource %p, sub_resource_idx %u, box %s, data %p, row_pitch %u, depth_pitch %u, " + "flags %#x.\n", + device, resource, sub_resource_idx, debug_box(box), data, row_pitch, depth_pitch, flags); + + if (flags) + FIXME("Ignoring flags %#x.\n", flags); if (resource->type == WINED3D_RTYPE_BUFFER) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0b05453..91c703c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3392,7 +3392,7 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct for (i = 0; i < sub_count; ++i) { wined3d_device_update_sub_resource(device, &object->resource, - i, NULL, data[i].data, data[i].row_pitch, data[i].slice_pitch); + i, NULL, data[i].data, data[i].row_pitch, data[i].slice_pitch, 0); } } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 7a8cf20..db50a44 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -200,7 +200,7 @@ @ cdecl wined3d_device_show_cursor(ptr long) @ cdecl wined3d_device_uninit_3d(ptr) @ cdecl wined3d_device_uninit_gdi(ptr) -@ cdecl wined3d_device_update_sub_resource(ptr ptr long ptr ptr long long) +@ cdecl wined3d_device_update_sub_resource(ptr ptr long ptr ptr long long long) @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bb4ad48..e15269f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2466,7 +2466,7 @@ HRESULT __cdecl wined3d_device_uninit_3d(struct wined3d_device *device); HRESULT __cdecl wined3d_device_uninit_gdi(struct wined3d_device *device); void __cdecl wined3d_device_update_sub_resource(struct wined3d_device *device, struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, - unsigned int depth_pitch); + unsigned int depth_pitch, unsigned int flags); HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture); HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes);

1 0

Pablo Martin : d3d11: Make UpdateSubresource1 call wined3d_device_update_sub_resource directly.
by Alexandre Julliard 23 May '18

23 May '18

Module: wine Branch: master Commit: 04a9e3330f6db1dea6fb87aae451f69a954fea94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04a9e3330f6db1dea6fb87aa… Author: Pablo Martin <pmart-wine(a)riseup.net> Date: Tue May 22 14:37:50 2018 +0200 d3d11: Make UpdateSubresource1 call wined3d_device_update_sub_resource directly. Signed-off-by: Pablo Martin <pmart-wine(a)riseup.net> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4ca4f46..36ed44b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2631,13 +2631,22 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource1(ID3D11D ID3D11Resource *resource, UINT subresource_idx, const D3D11_BOX *box, const void *data, UINT row_pitch, UINT depth_pitch, UINT flags) { + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct wined3d_resource *wined3d_resource; + struct wined3d_box wined3d_box; + TRACE("iface %p, resource %p, subresource_idx %u, box %p, data %p, row_pitch %u, depth_pitch %u, flags %#x.\n", iface, resource, subresource_idx, box, data, row_pitch, depth_pitch, flags); - if (flags) - FIXME("Ignoring flags %#x.\n", flags); + if (box) + wined3d_box_set(&wined3d_box, box->left, box->top, box->right, box->bottom, + box->front, box->back); - d3d11_immediate_context_UpdateSubresource(iface, resource, subresource_idx, box, data, row_pitch, depth_pitch); + wined3d_resource = wined3d_resource_from_d3d11_resource(resource); + wined3d_mutex_lock(); + wined3d_device_update_sub_resource(device->wined3d_device, wined3d_resource, subresource_idx, + box ? &wined3d_box : NULL, data, row_pitch, depth_pitch, flags); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_DiscardResource(ID3D11DeviceContext1 *iface,

1 0

Józef Kucia : wined3d: Remove redundant entries from "formats" table.
by Alexandre Julliard 23 May '18

23 May '18

Module: wine Branch: master Commit: 638037bb28d07b55e016f7f0fad35d028c555e25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=638037bb28d07b55e016f7f0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 22 15:53:55 2018 +0200 wined3d: Remove redundant entries from "formats" table. Those formats are initialized based on the "typed_formats" table. 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 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7cecd8c..937c1bc 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -122,7 +122,6 @@ static const struct wined3d_format_channels formats[] = /* Bump mapping stuff */ {WINED3DFMT_R5G5_SNORM_L6_UNORM, 5, 5, 0, 0, 0, 5, 0, 0, 2, 0, 0}, {WINED3DFMT_R8G8_SNORM_L8X8_UNORM, 8, 8, 0, 0, 0, 8, 0, 0, 4, 0, 0}, - {WINED3DFMT_R8G8B8A8_SNORM, 8, 8, 8, 8, 0, 8, 16, 24, 4, 0, 0}, {WINED3DFMT_R10G11B11_SNORM, 10, 11, 11, 0, 0, 10, 21, 0, 4, 0, 0}, {WINED3DFMT_R10G10B10X2_UINT, 10, 10, 10, 0, 0, 10, 20, 0, 4, 0, 0}, {WINED3DFMT_R10G10B10X2_SNORM, 10, 10, 10, 0, 0, 10, 20, 0, 4, 0, 0}, @@ -133,8 +132,6 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_S1_UINT_D15_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 2, 15, 1}, {WINED3DFMT_X8D24_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 0}, {WINED3DFMT_S4X4_UINT_D24_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 4}, - {WINED3DFMT_D16_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 2, 16, 0}, - {WINED3DFMT_D32_FLOAT, 0, 0, 0, 0, 0, 0, 0, 0, 4, 32, 0}, {WINED3DFMT_S8_UINT_D24_FLOAT, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 8}, /* Vendor-specific formats */ {WINED3DFMT_ATI1N, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0},

1 0

Nikolay Sivov : d2d1: Add ID2D1Bitmap1 stub.
by Alexandre Julliard 23 May '18

23 May '18

Module: wine Branch: master Commit: b75660989418636a952b7eb585abc94c1d1f4b5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b75660989418636a952b7eb5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 23 16:32:12 2018 +0430 d2d1: Add ID2D1Bitmap1 stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 94 ++++++++++++++++++++++++++++++++++-------------- dlls/d2d1/brush.c | 8 ++--- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/device.c | 6 ++-- include/d2d1_1.idl | 47 ++++++++++++++++++++++++ 5 files changed, 122 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b75660989418636a952b…

1 0

Henri Verbeet : wined3d: Default to OpenGL 4.4 contexts.
by Alexandre Julliard 23 May '18

23 May '18

Module: wine Branch: master Commit: 0db4d1c251d293333e2721a78d6156008a90ff6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0db4d1c251d293333e2721a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 23 16:32:13 2018 +0430 wined3d: Default to OpenGL 4.4 contexts. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 6 +++--- dlls/wined3d/wined3d_main.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a4e4a0c..3ca389e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -6581,16 +6581,16 @@ static DWORD get_max_gl_version(const struct wined3d_gl_info *gl_info, DWORD fla { const char *gl_vendor, *gl_renderer; - if (wined3d_settings.explicit_gl_version || (flags & WINED3D_PIXEL_CENTER_INTEGER)) + if (wined3d_settings.explicit_gl_version) return wined3d_settings.max_gl_version; gl_vendor = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_VENDOR); gl_renderer = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_RENDERER); if (!gl_vendor || !gl_renderer || wined3d_guess_card_vendor(gl_vendor, gl_renderer) == HW_VENDOR_NVIDIA) - return wined3d_settings.max_gl_version; + return MAKEDWORD_VERSION(1, 0); - return MAKEDWORD_VERSION(4, 4); + return wined3d_settings.max_gl_version; } static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, DWORD wined3d_creation_flags) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 56fae6b..e322b4d 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -74,7 +74,7 @@ struct wined3d_settings wined3d_settings = { TRUE, /* Multithreaded CS by default. */ FALSE, /* explicit_gl_version */ - MAKEDWORD_VERSION(1, 0), /* Default to legacy OpenGL */ + MAKEDWORD_VERSION(4, 4), /* Default to OpenGL 4.4 */ TRUE, /* Use of GLSL enabled by default */ ORM_FBO, /* Use FBOs to do offscreen rendering */ PCI_VENDOR_NONE,/* PCI Vendor ID */

1 0

Hugh McMaster : regedit: Do not directly include resource.h anymore.
by Alexandre Julliard 23 May '18

23 May '18

Module: wine Branch: master Commit: 5bc81188fed88e79f7fb4730427614f937219187 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bc81188fed88e79f7fb4730… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 23 13:29:28 2018 +0000 regedit: Do not directly include resource.h anymore. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 03bfdbd..1459624 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -31,7 +31,6 @@ #include "wine/heap.h" #include "wine/unicode.h" #include "main.h" -#include "resource.h" static const WCHAR* editValueName; static WCHAR* stringValueData;

1 0

Hans Leidekker : winhttp: Ignore empty proxy strings read from the environment.
by Alexandre Julliard 23 May '18

23 May '18

Module: wine Branch: master Commit: 2752da05db370a9b438ea8c28d4c77550befd6b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2752da05db370a9b438ea8c2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 23 11:36:44 2018 +0200 winhttp: Ignore empty proxy strings read from the environment. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index c878d68..e2b91fa 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1597,29 +1597,21 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) } if (!got_from_reg && (envproxy = getenv( "http_proxy" ))) { - char *colon, *http_proxy; + char *colon, *http_proxy = NULL; - if ((colon = strchr( envproxy, ':' ))) + if (!(colon = strchr( envproxy, ':' ))) http_proxy = envproxy; + else { if (*(colon + 1) == '/' && *(colon + 2) == '/') { - static const char http[] = "http://"; - /* It's a scheme, check that it's http */ - if (!strncmp( envproxy, http, strlen( http ) )) - http_proxy = envproxy + strlen( http ); - else - { - WARN("unsupported scheme in $http_proxy: %s\n", envproxy); - http_proxy = NULL; - } + if (!strncmp( envproxy, "http://", 7 )) http_proxy = envproxy + 7; + else WARN("unsupported scheme in $http_proxy: %s\n", envproxy); } - else - http_proxy = envproxy; + else http_proxy = envproxy; } - else - http_proxy = envproxy; - if (http_proxy) + + if (http_proxy && http_proxy[0]) { WCHAR *http_proxyW; int len; @@ -1632,8 +1624,7 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) info->dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; info->lpszProxy = http_proxyW; info->lpszProxyBypass = NULL; - TRACE("http proxy (from environment) = %s\n", - debugstr_w(info->lpszProxy)); + TRACE("http proxy (from environment) = %s\n", debugstr_w(info->lpszProxy)); } } }

1 0