November 2018 - Wine-Commits

Henri Verbeet : wined3d: Update the swapchain flags on wined3d_device_reset().
by Alexandre Julliard Nov. 7, 2018

Nov. 7, 2018

Module: wine Branch: master Commit: 04b675223dd2439afe1130339fd04dbff9c321a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04b675223dd2439afe113033… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 7 11:49:16 2018 +0330 wined3d: Update the swapchain flags on wined3d_device_reset(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3efae4b..3697b8f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4752,6 +4752,16 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) } } +static void update_swapchain_flags(struct wined3d_texture *texture) +{ + unsigned int flags = texture->swapchain->desc.flags; + + if (flags & WINED3D_SWAPCHAIN_GDI_COMPATIBLE) + texture->flags |= WINED3D_TEXTURE_GET_DC; + else + texture->flags &= ~WINED3D_TEXTURE_GET_DC; +} + HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback, BOOL reset_state) @@ -4835,7 +4845,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, swapchain->desc.swap_effect = swapchain_desc->swap_effect; swapchain->desc.enable_auto_depth_stencil = swapchain_desc->enable_auto_depth_stencil; swapchain->desc.auto_depth_stencil_format = swapchain_desc->auto_depth_stencil_format; - swapchain->desc.flags = swapchain_desc->flags; swapchain->desc.refresh_rate = swapchain_desc->refresh_rate; swapchain->desc.auto_restore_display_mode = swapchain_desc->auto_restore_display_mode; @@ -4881,6 +4890,17 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, swapchain_desc->multisample_type, swapchain_desc->multisample_quality))) return hr; + if (swapchain_desc->flags != swapchain->desc.flags) + { + swapchain->desc.flags = swapchain_desc->flags; + + update_swapchain_flags(swapchain->front_buffer); + for (i = 0; i < swapchain->desc.backbuffer_count; ++i) + { + update_swapchain_flags(swapchain->back_buffers[i]); + } + } + if (device->auto_depth_stencil_view) { wined3d_rendertarget_view_decref(device->auto_depth_stencil_view);

1 0

Nikolay Sivov : comctl32/tests: Fix Listbox test failures on some configurations.
by Alexandre Julliard Nov. 7, 2018

Nov. 7, 2018

Module: wine Branch: master Commit: 480731aec3b7dbc4cbb354517afbd732db7cc1ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=480731aec3b7dbc4cbb35451… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 7 14:52:34 2018 +0300 comctl32/tests: Fix Listbox test failures on some configurations. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listbox.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index c9d13a8..d4bb2cc 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -793,6 +793,7 @@ static void test_listbox_item_data(void) static void test_listbox_LB_DIR(void) { + char path[MAX_PATH], curdir[MAX_PATH]; HWND hList; int res, itemCount; int itemCount_justFiles; @@ -805,6 +806,16 @@ static void test_listbox_LB_DIR(void) char driveletter; const char *wildcard = "*"; HANDLE file; + BOOL ret; + + GetCurrentDirectoryA(ARRAY_SIZE(curdir), curdir); + + GetTempPathA(ARRAY_SIZE(path), path); + ret = SetCurrentDirectoryA(path); + ok(ret, "Failed to set current directory.\n"); + + ret = CreateDirectoryA("lb_dir_test", NULL); + ok(ret, "Failed to create test directory.\n"); file = CreateFileA( "wtest1.tmp.c", GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL ); ok(file != INVALID_HANDLE_VALUE, "Error creating the test file: %d\n", GetLastError()); @@ -1135,11 +1146,11 @@ static void test_listbox_LB_DIR(void) itemCount, itemCount_allDirs); ok(res + 1 == itemCount, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) returned incorrect index!\n"); - if (itemCount && GetCurrentDirectoryA( MAX_PATH, pathBuffer ) > 3) /* there's no [..] in drive root */ + if (itemCount) { memset(pathBuffer, 0, MAX_PATH); SendMessageA(hList, LB_GETTEXT, 0, (LPARAM)pathBuffer); - ok( !strcmp(pathBuffer, "[..]"), "First element is not [..]\n"); + ok( !strcmp(pathBuffer, "[..]"), "First element is %s, not [..]\n", pathBuffer); } /* This tests behavior when no files match the wildcard */ @@ -1224,6 +1235,9 @@ static void test_listbox_LB_DIR(void) DestroyWindow(hList); DeleteFileA( "wtest1.tmp.c" ); + RemoveDirectoryA("lb_dir_test"); + + SetCurrentDirectoryA(curdir); } static HWND g_listBox;

1 0

Henri Verbeet : d3d9: Set WINED3D_SWAPCHAIN_GDI_COMPATIBLE on the swapchain when required.
by Alexandre Julliard Nov. 7, 2018

Nov. 7, 2018

Module: wine Branch: master Commit: 282bdd33d5c7ed4ad5e22f47c5841784959ff2af URL: https://source.winehq.org/git/wine.git/?a=commit;h=282bdd33d5c7ed4ad5e22f47… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 7 11:49:17 2018 +0330 d3d9: Set WINED3D_SWAPCHAIN_GDI_COMPATIBLE on the swapchain when required. Instead of injecting WINED3D_TEXTURE_CREATE_GET_DC during device_parent_create_swapchain_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 840a786..eaf162c 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -346,6 +346,11 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch = wined3dformat_from_d3dformat(present_parameters->AutoDepthStencilFormat); swapchain_desc->flags = (present_parameters->Flags & D3DPRESENTFLAGS_MASK) | WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH; + if (is_gdi_compat_wined3dformat(swapchain_desc->backbuffer_format) + /* WINED3DFMT_UNKNOWN creates the swapchain with the current + * display format, which is always GDI-compatible. */ + || swapchain_desc->backbuffer_format == WINED3DFMT_UNKNOWN) + swapchain_desc->flags |= WINED3D_SWAPCHAIN_GDI_COMPATIBLE; swapchain_desc->refresh_rate = present_parameters->FullScreen_RefreshRateInHz; swapchain_desc->auto_restore_display_mode = TRUE; @@ -4177,9 +4182,6 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic if (container_parent == device_parent) container_parent = &device->IDirect3DDevice9Ex_iface; - if (is_gdi_compat_wined3dformat(desc->format)) - texture_flags |= WINED3D_TEXTURE_CREATE_GET_DC; - if (FAILED(hr = wined3d_texture_create(device->wined3d_device, desc, 1, 1, texture_flags | WINED3D_TEXTURE_CREATE_MAPPABLE, NULL, container_parent, &d3d9_null_wined3d_parent_ops, texture)))

1 0

Henri Verbeet : ddraw: Do not set WINED3D_TEXTURE_CREATE_MAPPABLE for swapchain textures.
by Alexandre Julliard Nov. 7, 2018

Nov. 7, 2018

Module: wine Branch: master Commit: ffe90dd5268a09edadae2aa107e261b97e4ab6de URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffe90dd5268a09edadae2aa1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 7 11:49:14 2018 +0330 ddraw: Do not set WINED3D_TEXTURE_CREATE_MAPPABLE for swapchain textures. These aren't visible to the application, and we never map them ourselves. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 9a40bc9..5043994 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4943,7 +4943,7 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic parent_ops = &ddraw_null_wined3d_parent_ops; if (FAILED(hr = wined3d_texture_create(ddraw->wined3d_device, desc, 1, 1, - texture_flags | WINED3D_TEXTURE_CREATE_MAPPABLE, NULL, ddraw, parent_ops, texture))) + texture_flags, NULL, ddraw, parent_ops, texture))) { WARN("Failed to create texture, hr %#x.\n", hr); return hr;

1 0

Henri Verbeet : d3d9/tests: Test the pool and usage of surfaces created through CreateOffscreenPlainSurface ().
by Alexandre Julliard Nov. 7, 2018

Nov. 7, 2018

Module: wine Branch: master Commit: a4f047da106d3b9cc1d14a27a95dd34252ec61e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4f047da106d3b9cc1d14a27… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 7 11:49:13 2018 +0330 d3d9/tests: Test the pool and usage of surfaces created through CreateOffscreenPlainSurface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 3 --- dlls/d3d9/tests/device.c | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1e7c0ea..840a786 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1813,9 +1813,6 @@ static HRESULT WINAPI d3d9_device_CreateOffscreenPlainSurface(IDirect3DDevice9Ex } } - /* FIXME: Offscreen surfaces are supposed to be always lockable, - * regardless of the pool they're created in. Should we set dynamic usage - * here? */ return d3d9_device_create_surface(device, width, height, format, WINED3D_TEXTURE_CREATE_MAPPABLE, surface, 0, pool, D3DMULTISAMPLE_NONE, 0, user_mem); } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 52a3ee7..e789107 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -8673,6 +8673,7 @@ static void test_surface_double_unlock(void) }; IDirect3DSurface9 *surface; IDirect3DDevice9 *device; + D3DSURFACE_DESC desc; D3DLOCKED_RECT lr; IDirect3D9 *d3d; unsigned int i; @@ -8697,6 +8698,11 @@ static void test_surface_double_unlock(void) D3DFMT_X8R8G8B8, pools[i], &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface in pool %#x, hr %#x.\n", pools[i], hr); + hr = IDirect3DSurface9_GetDesc(surface, &desc); + ok(hr == D3D_OK, "Pool %#x: Got unexpected hr %#x.\n", pools[i], hr); + ok(!desc.Usage, "Pool %#x: Got unexpected usage %#x.\n", pools[i], desc.Usage); + ok(desc.Pool == pools[i], "Pool %#x: Got unexpected pool %#x.\n", pools[i], desc.Pool); + hr = IDirect3DSurface9_UnlockRect(surface); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x, for surface in pool %#x.\n", hr, pools[i]); hr = IDirect3DSurface9_LockRect(surface, &lr, NULL, 0);

1 0

Henri Verbeet : wined3d: Do not set WINED3D_TEXTURE_CREATE_GET_DC on the implicit depth/ stencil texture.
by Alexandre Julliard Nov. 7, 2018

Nov. 7, 2018

Module: wine Branch: master Commit: ca87bd95c2dab89ee6c5e02e56586e7ecd0372aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca87bd95c2dab89ee6c5e02e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 7 11:49:15 2018 +0330 wined3d: Do not set WINED3D_TEXTURE_CREATE_GET_DC on the implicit depth/stencil texture. It doesn't make a lot of sense for depth formats. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 6 +----- dlls/wined3d/swapchain.c | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 893ce55..3efae4b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4890,7 +4890,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, { struct wined3d_resource_desc texture_desc; struct wined3d_texture *texture; - DWORD flags = 0; TRACE("Creating the depth stencil buffer.\n"); @@ -4906,11 +4905,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, texture_desc.depth = 1; texture_desc.size = 0; - if (swapchain_desc->flags & WINED3D_SWAPCHAIN_GDI_COMPATIBLE) - flags |= WINED3D_TEXTURE_CREATE_GET_DC; - if (FAILED(hr = device->device_parent->ops->create_swapchain_texture(device->device_parent, - device->device_parent, &texture_desc, flags, &texture))) + device->device_parent, &texture_desc, 0, &texture))) { ERR("Failed to create the auto depth/stencil surface, hr %#x.\n", hr); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f6963c4..499e163 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -949,7 +949,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 texture_desc.bind_flags = WINED3D_BIND_DEPTH_STENCIL; if (FAILED(hr = device->device_parent->ops->create_swapchain_texture(device->device_parent, - device->device_parent, &texture_desc, texture_flags, &ds))) + device->device_parent, &texture_desc, 0, &ds))) { WARN("Failed to create the auto depth/stencil surface, hr %#x.\n", hr); goto err;

1 0

Francois Gouget : testbot/WineSendLog: Don' t report non-existent build errors.
by Alexandre Julliard Nov. 7, 2018

Nov. 7, 2018

Module: tools Branch: master Commit: d2eb71983a56e0827a1c52c1865ae83ce44f3edf URL: https://source.winehq.org/git/tools.git/?a=commit;h=d2eb71983a56e0827a1c52c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 7 12:37:54 2018 +0100 testbot/WineSendLog: Don't report non-existent build errors. Make sure there are errors to report even when there is no reference log which is typical of build logs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index bb6dab5..a651c09 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -296,7 +296,7 @@ EOF $NewGroups = $LogErrors->{Groups}; $NewErrors = $LogErrors->{Errors}; } - elsif (!@$NewGroups) + if (!$NewGroups or !@$NewGroups) { # There is no new error next;

1 0

Hans Leidekker : winhttp: Get rid of header_t.
by Alexandre Julliard Nov. 6, 2018

Nov. 6, 2018

Module: wine Branch: master Commit: b603c5e05c152776ec4479ff331f8bdafea73fef URL: https://source.winehq.org/git/wine.git/?a=commit;h=b603c5e05c152776ec4479ff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 6 16:09:01 2018 +0100 winhttp: Get rid of header_t. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 33 +++++++++++++++++---------------- dlls/winhttp/winhttp_private.h | 10 +++++----- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 7ce3def..2475a5e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -265,7 +265,7 @@ static BOOL queue_task( struct task_header *task ) return TRUE; } -static void free_header( header_t *header ) +static void free_header( struct header *header ) { heap_free( header->field ); heap_free( header->value ); @@ -293,10 +293,10 @@ static BOOL valid_token_char( WCHAR c ) } } -static header_t *parse_header( LPCWSTR string ) +static struct header *parse_header( const WCHAR *string ) { const WCHAR *p, *q; - header_t *header; + struct header *header; int len; p = string; @@ -320,7 +320,7 @@ static header_t *parse_header( LPCWSTR string ) p++; } len = q - string; - if (!(header = heap_alloc_zero( sizeof(header_t) ))) return NULL; + if (!(header = heap_alloc_zero( sizeof(struct header) ))) return NULL; if (!(header->field = heap_alloc( (len + 1) * sizeof(WCHAR) ))) { heap_free( header ); @@ -364,15 +364,15 @@ static int get_header_index( request_t *request, LPCWSTR field, int requested_in return index; } -static BOOL insert_header( request_t *request, header_t *header ) +static BOOL insert_header( request_t *request, struct header *header ) { DWORD count = request->num_headers + 1; - header_t *hdrs; + struct header *hdrs; if (request->headers) - hdrs = heap_realloc_zero( request->headers, sizeof(header_t) * count ); + hdrs = heap_realloc_zero( request->headers, sizeof(struct header) * count ); else - hdrs = heap_alloc_zero( sizeof(header_t) ); + hdrs = heap_alloc_zero( sizeof(struct header) ); if (!hdrs) return FALSE; request->headers = hdrs; @@ -392,15 +392,16 @@ static BOOL delete_header( request_t *request, DWORD index ) heap_free( request->headers[index].field ); heap_free( request->headers[index].value ); - memmove( &request->headers[index], &request->headers[index + 1], (request->num_headers - index) * sizeof(header_t) ); - memset( &request->headers[request->num_headers], 0, sizeof(header_t) ); + memmove( &request->headers[index], &request->headers[index + 1], + (request->num_headers - index) * sizeof(struct header) ); + memset( &request->headers[request->num_headers], 0, sizeof(struct header) ); return TRUE; } static BOOL process_header( request_t *request, LPCWSTR field, LPCWSTR value, DWORD flags, BOOL request_only ) { int index; - header_t hdr; + struct header hdr; TRACE("%s: %s 0x%08x\n", debugstr_w(field), debugstr_w(value), flags); @@ -435,7 +436,7 @@ static BOOL process_header( request_t *request, LPCWSTR field, LPCWSTR value, DW { WCHAR *tmp; int len, len_orig, len_value; - header_t *header = &request->headers[index]; + struct header *header = &request->headers[index]; len_orig = strlenW( header->value ); len_value = strlenW( value ); @@ -466,7 +467,7 @@ BOOL add_request_headers( request_t *request, LPCWSTR headers, DWORD len, DWORD { BOOL ret = FALSE; WCHAR *buffer, *p, *q; - header_t *header; + struct header *header; if (len == ~0u) len = strlenW( headers ); if (!len) return TRUE; @@ -639,7 +640,7 @@ out: static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID buffer, LPDWORD buflen, LPDWORD index ) { - header_t *header = NULL; + struct header *header = NULL; BOOL request_only, ret = FALSE; int requested_index, header_index = -1; DWORD attr, len; @@ -2458,7 +2459,7 @@ static BOOL read_reply( request_t *request ) offset = buflen + crlf_len - 1; for (;;) { - header_t *header; + struct header *header; buflen = MAX_REPLY_LEN; if (!read_line( request, buffer, &buflen )) return TRUE; @@ -2499,7 +2500,7 @@ static void record_cookies( request_t *request ) for (i = 0; i < request->num_headers; i++) { - header_t *set_cookie = &request->headers[i]; + struct header *set_cookie = &request->headers[i]; if (!strcmpiW( set_cookie->field, attr_set_cookie ) && !set_cookie->is_request) { set_cookies( request, set_cookie->value ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 1fce4a9..ec6464a 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -129,12 +129,12 @@ typedef struct size_t peek_len; } netconn_t; -typedef struct +struct header { - LPWSTR field; - LPWSTR value; + WCHAR *field; + WCHAR *value; BOOL is_request; /* part of request headers? */ -} header_t; +}; enum auth_target { @@ -196,7 +196,7 @@ typedef struct DWORD read_pos; /* current read position in read_buf */ DWORD read_size; /* valid data size in read_buf */ char read_buf[8192]; /* buffer for already read but not returned data */ - header_t *headers; + struct header *headers; DWORD num_headers; WCHAR **accept_types; DWORD num_accept_types;

1 0

Hans Leidekker : winhttp: Simplify build_request_string.
by Alexandre Julliard Nov. 6, 2018

Nov. 6, 2018

Module: wine Branch: master Commit: b9e19685c528b02472b2c46749dc710a8b2e144d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9e19685c528b02472b2c467… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 6 16:09:03 2018 +0100 winhttp: Simplify build_request_string. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 120 +++++++++++++++++++++---------------------------- 1 file changed, 50 insertions(+), 70 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index e3cc394..0409c3c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -541,98 +541,78 @@ BOOL WINAPI WinHttpAddRequestHeaders( HINTERNET hrequest, LPCWSTR headers, DWORD return ret; } -static WCHAR *build_request_path( request_t *request ) +static WCHAR *build_absolute_request_path( request_t *request ) { + static const WCHAR http[] = {'h','t','t','p',0}; + static const WCHAR https[] = {'h','t','t','p','s',0}; + static const WCHAR fmt[] = {'%','s',':','/','/','%','s',0}; + const WCHAR *scheme; WCHAR *ret; + int len; - if (strcmpiW( request->connect->hostname, request->connect->servername )) - { - static const WCHAR http[] = { 'h','t','t','p',0 }; - static const WCHAR https[] = { 'h','t','t','p','s',0 }; - static const WCHAR fmt[] = { '%','s',':','/','/','%','s',0 }; - LPCWSTR scheme = (request->netconn ? request->netconn->secure : (request->hdr.flags & WINHTTP_FLAG_SECURE)) ? https : http; - int len; + scheme = (request->netconn ? request->netconn->secure : (request->hdr.flags & WINHTTP_FLAG_SECURE)) ? https : http; - len = strlenW( scheme ) + strlenW( request->connect->hostname ); - /* 3 characters for '://', 1 for NUL. */ - len += 4; + len = strlenW( scheme ) + strlenW( request->connect->hostname ) + 4; /* '://' + nul */ + if (request->connect->hostport) len += 6; /* ':' between host and port, up to 5 for port */ + + if (request->path) len += strlenW( request->path ); + if ((ret = heap_alloc( len * sizeof(WCHAR) ))) + { + len = sprintfW( ret, fmt, scheme, request->connect->hostname ); if (request->connect->hostport) { - /* 1 for ':' between host and port, up to 5 for port */ - len += 6; - } - if (request->path) - len += strlenW( request->path ); - if ((ret = heap_alloc( len * sizeof(WCHAR) ))) - { - sprintfW( ret, fmt, scheme, request->connect->hostname ); - if (request->connect->hostport) - { - static const WCHAR colonFmt[] = { ':','%','u',0 }; - - sprintfW( ret + strlenW( ret ), colonFmt, - request->connect->hostport ); - } - if (request->path) - strcatW( ret, request->path ); + static const WCHAR port_fmt[] = {':','%','u',0}; + sprintfW( ret + len, port_fmt, request->connect->hostport ); } + if (request->path) strcatW( ret, request->path ); } - else - ret = request->path; + return ret; } static WCHAR *build_request_string( request_t *request ) { - static const WCHAR space[] = {' ',0}; - static const WCHAR crlf[] = {'\r','\n',0}; - static const WCHAR colon[] = {':',' ',0}; - static const WCHAR twocrlf[] = {'\r','\n','\r','\n',0}; - + static const WCHAR spaceW[] = {' ',0}, crlfW[] = {'\r','\n',0}, colonW[] = {':',' ',0}; + static const WCHAR twocrlfW[] = {'\r','\n','\r','\n',0}; WCHAR *path, *ret; - const WCHAR **headers, **p; - unsigned int len, i = 0, j; + unsigned int i, len; - /* allocate space for an array of all the string pointers to be added */ - len = request->num_headers * 4 + 7; - if (!(headers = heap_alloc( len * sizeof(LPCWSTR) ))) return NULL; + if (!strcmpiW( request->connect->hostname, request->connect->servername )) path = request->path; + else if (!(path = build_absolute_request_path( request ))) return NULL; - path = build_request_path( request ); - headers[i++] = request->verb; - headers[i++] = space; - headers[i++] = path; - headers[i++] = space; - headers[i++] = request->version; + len = strlenW( request->verb ) + 1 /* ' ' */; + len += strlenW( path ) + 1 /* ' ' */; + len += strlenW( request->version ); - for (j = 0; j < request->num_headers; j++) + for (i = 0; i < request->num_headers; i++) { - if (request->headers[j].is_request) - { - headers[i++] = crlf; - headers[i++] = request->headers[j].field; - headers[i++] = colon; - headers[i++] = request->headers[j].value; - - TRACE("adding header %s (%s)\n", debugstr_w(request->headers[j].field), - debugstr_w(request->headers[j].value)); - } + if (request->headers[i].is_request) + len += strlenW( request->headers[i].field ) + strlenW( request->headers[i].value ) + 4; /* '\r\n: ' */ } - headers[i++] = twocrlf; - headers[i] = NULL; + len += 4; /* '\r\n\r\n' */ - len = 0; - for (p = headers; *p; p++) len += strlenW( *p ); - len++; + if ((ret = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + { + strcpyW( ret, request->verb ); + strcatW( ret, spaceW ); + strcatW( ret, path ); + strcatW( ret, spaceW ); + strcatW( ret, request->version ); - if (!(ret = heap_alloc( len * sizeof(WCHAR) ))) - goto out; - *ret = 0; - for (p = headers; *p; p++) strcatW( ret, *p ); + for (i = 0; i < request->num_headers; i++) + { + if (request->headers[i].is_request) + { + strcatW( ret, crlfW ); + strcatW( ret, request->headers[i].field ); + strcatW( ret, colonW ); + strcatW( ret, request->headers[i].value ); + } + } + strcatW( ret, twocrlfW ); + } -out: - if (path != request->path) - heap_free( path ); - heap_free( headers ); + if (path != request->path) heap_free( path ); return ret; }

1 0

Hans Leidekker : winhttp: Get rid of send_request_t.
by Alexandre Julliard Nov. 6, 2018

Nov. 6, 2018

Module: wine Branch: master Commit: 85b6c2b9c818d69ae94f9bd606c02730e21d2430 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85b6c2b9c818d69ae94f9bd6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 6 16:09:02 2018 +0100 winhttp: Get rid of send_request_t. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 6 +++--- dlls/winhttp/winhttp_private.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2475a5e..e3cc394 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2166,7 +2166,7 @@ end: static void task_send_request( struct task_header *task ) { - send_request_t *s = (send_request_t *)task; + struct send_request *s = (struct send_request *)task; send_request( s->hdr.request, s->headers, s->headers_len, s->optional, s->optional_len, s->total_len, s->context, TRUE ); heap_free( s->headers ); } @@ -2199,9 +2199,9 @@ BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, LPCWSTR headers, DWORD heade if (request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) { - send_request_t *s; + struct send_request *s; - if (!(s = heap_alloc( sizeof(send_request_t) ))) return FALSE; + if (!(s = heap_alloc( sizeof(struct send_request) ))) return FALSE; s->hdr.request = request; s->hdr.proc = task_send_request; s->headers = strdupW( headers ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index ec6464a..e50e5fa 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -221,16 +221,16 @@ struct task_header void (*proc)( struct task_header * ); }; -typedef struct +struct send_request { struct task_header hdr; - LPWSTR headers; + WCHAR *headers; DWORD headers_len; - LPVOID optional; + void *optional; DWORD optional_len; DWORD total_len; DWORD_PTR context; -} send_request_t; +}; typedef struct {

1 0