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

[PATCH v3 1/2] ntoskrnl.exe: Implement IoRegisterDeviceInterface
by Aric Stewart Oct. 4, 2018

Oct. 4, 2018

ver 3: More comments from Zebediah Figura Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/ntoskrnl.exe/Makefile.in | 2 +- dlls/ntoskrnl.exe/ntoskrnl.c | 133 ++++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 4 files changed, 136 insertions(+), 2 deletions(-)

2 2

[PATCH v3 2/2] hidclass.sys: use IoRegisterDeviceInterface
by Aric Stewart Oct. 4, 2018

Oct. 4, 2018

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 60 ++++++++++++++++------------------------------ dlls/hidclass.sys/hid.h | 2 +- dlls/hidclass.sys/pnp.c | 4 +--- 3 files changed, 22 insertions(+), 44 deletions(-)

1 0

[PATCH] rpcrt4: Handle absense of RPC flags in call_stubless_func() thunk.
by Zebediah Figura Oct. 4, 2018

Oct. 4, 2018

If Oi_HAS_RPCFLAGS is not set, then the stack size is at offset 4, not 8. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/rpcrt4/cproxy.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 2f49bb5..39dd34e 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -64,7 +64,13 @@ __ASM_GLOBAL_FUNC(call_stubless_func, "movl 8(%ecx),%edx\n\t" /* info->FormatStringOffset */ "movzwl (%edx,%eax,2),%edx\n\t" /* FormatStringOffset[index] */ "addl 4(%ecx),%edx\n\t" /* info->ProcFormatString + offset */ + "testb $0x08,1(%edx)\n\t" /* Oi_HAS_RPCFLAGS */ + "jz 1f\n\t" "movzwl 8(%edx),%eax\n\t" /* arguments size */ + "jmp 2f\n\t" + "1:\n\t" + "movzwl 4(%edx),%eax\n\t" + "2:\n\t" "pushl %eax\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "leal 8(%esp),%eax\n\t" /* &This */ -- 2.7.4

2 3

[PATCH 1/3] d2d1: Use correct interpolation mode enum type member.
by Nikolay Sivov Oct. 4, 2018

Oct. 4, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/brush.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 9c73ae1d88..dd3da32610 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -1113,7 +1113,7 @@ HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap, { (*brush)->u.bitmap.extend_mode_x = D2D1_EXTEND_MODE_CLAMP; (*brush)->u.bitmap.extend_mode_y = D2D1_EXTEND_MODE_CLAMP; - (*brush)->u.bitmap.interpolation_mode = D2D1_BITMAP_INTERPOLATION_MODE_LINEAR; + (*brush)->u.bitmap.interpolation_mode = D2D1_INTERPOLATION_MODE_LINEAR; } TRACE("Created brush %p.\n", *brush); -- 2.19.0

3 6

[PATCH v2] wined3d: Add fast-path for texture download blit.
by Andrew Wesie Oct. 4, 2018

Oct. 4, 2018

Signed-off-by: Andrew Wesie <awesie(a)gmail.com> --- dlls/wined3d/surface.c | 28 +++++++++++++++++++++++++--- dlls/wined3d/texture.c | 22 ++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4942177..71693ad 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3257,6 +3257,29 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ return WINED3D_OK; } } + else if (!(src_sub_resource->locations & surface_simple_locations) + && (dst_sub_resource->locations & dst_texture->resource.map_binding)) + { + /* Download */ + if (scale) + TRACE("Not doing download because of scaling.\n"); + else if (convert) + TRACE("Not doing download because of format conversion.\n"); + else if (src_texture->resource.format->conv_byte_count) + TRACE("Not doing download because the source format needs conversion.\n"); + else if (is_multisample_location(src_texture, WINED3D_LOCATION_TEXTURE_RGB)) + TRACE("Not doing download because of multisample source.\n"); + else if (!texture2d_is_full_rect(src_texture, src_sub_resource_idx % src_texture->level_count, &src_rect)) + TRACE("Not doing download because of partial download (src).\n"); + else if (!texture2d_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, &dst_rect)) + TRACE("Not doing download because of partial download (dst).\n"); + else + { + wined3d_texture_download_from_texture(dst_texture, dst_sub_resource_idx, src_texture, + src_sub_resource_idx); + return WINED3D_OK; + } + } else if (dst_swapchain && dst_swapchain->back_buffers && dst_texture == dst_swapchain->front_buffer && src_texture == dst_swapchain->back_buffers[0]) @@ -3280,10 +3303,9 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ return WINED3D_OK; } - else if ((flags & WINED3D_BLT_RAW) || (!scale && !convert && !resolve)) - { + + if ((flags & WINED3D_BLT_RAW) || (blit_op == WINED3D_BLIT_OP_COLOR_BLIT && !scale && !convert && !resolve)) blit_op = WINED3D_BLIT_OP_RAW_BLIT; - } if (dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU) dst_location = dst_texture->resource.draw_binding; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6711e83..78e9364 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3802,3 +3802,25 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); } + +/* Partial downloads are not supported. */ +void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, + struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx) +{ + struct wined3d_context *context; + struct wined3d_bo_address data; + DWORD dst_location = dst_texture->resource.map_binding; + + context = context_acquire(src_texture->resource.device, NULL, 0); + + wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); + wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &data, dst_location); + wined3d_texture_bind_and_dirtify(src_texture, context, + !(src_texture->sub_resources[src_sub_resource_idx].locations & WINED3D_LOCATION_TEXTURE_RGB)); + wined3d_texture_download_data(src_texture, src_sub_resource_idx, context, &data); + + context_release(context); + + wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, dst_location); + wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~dst_location); +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a2dcbb0..4812fa5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3352,6 +3352,8 @@ HRESULT wined3d_texture_check_box_dimensions(const struct wined3d_texture *textu unsigned int level, const struct wined3d_box *box) DECLSPEC_HIDDEN; void wined3d_texture_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, const struct wined3d_bo_address *data) DECLSPEC_HIDDEN; +void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, + struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx) DECLSPEC_HIDDEN; GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_bo_address *data, DWORD locations) DECLSPEC_HIDDEN; -- 2.7.4

2 1

[PATCH 1/2] gdi32: Support the subpixel rendering for FreeType >= 2.8.1 .
by Byeongsik Jeon Oct. 4, 2018

Oct. 4, 2018

FreeType >= 2.8.1 support LCD-optimized rendering without LCD filters. It works regardless of FT_Err_Unimplemented_Feature check. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- dlls/gdi32/freetype.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b7e2413753..468c1951b6 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -993,18 +993,22 @@ static BOOL is_hinting_enabled(void) static BOOL is_subpixel_rendering_enabled( void ) { -#ifdef FT_LCD_FILTER_H static int enabled = -1; if (enabled == -1) { - enabled = (pFT_Library_SetLcdFilter && - pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature); + /* FreeType >= 2.8.1 offers LCD-optimezed rendering without lcd filters. */ + if ( FT_SimpleVersion >= ((2 << 16) | (8 << 8) | (1 << 0))) + enabled = TRUE; +#ifdef FT_LCD_FILTER_H + else if ( pFT_Library_SetLcdFilter && + pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature ) + enabled = TRUE; +#endif + else enabled = FALSE; + TRACE("subpixel rendering is %senabled\n", enabled ? "" : "NOT "); } return enabled; -#else - return FALSE; -#endif } @@ -7274,7 +7278,6 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, case WINE_GGO_HBGR_BITMAP: case WINE_GGO_VRGB_BITMAP: case WINE_GGO_VBGR_BITMAP: -#ifdef FT_LCD_FILTER_H { switch (ft_face->glyph->format) { @@ -7360,8 +7363,11 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if ( needsTransform ) pFT_Outline_Transform (&ft_face->glyph->outline, &transMatTategaki); - if ( pFT_Library_SetLcdFilter ) +#ifdef FT_LCD_FILTER_H + if ( FT_SimpleVersion < ((2 << 16) | (8 << 8) | (1 << 0)) && + pFT_Library_SetLcdFilter ) pFT_Library_SetLcdFilter( library, FT_LCD_FILTER_DEFAULT ); +#endif pFT_Render_Glyph (ft_face->glyph, render_mode); src = ft_face->glyph->bitmap.buffer; @@ -7442,9 +7448,6 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, break; } -#else - return GDI_ERROR; -#endif case GGO_NATIVE: { -- 2.19.0

1 1

[PATCH] winhttp: Implement the WINHTTP_FLAG_ESCAPE_* flags.
by Hans Leidekker Oct. 4, 2018

Oct. 4, 2018

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42677 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 12 ++-- dlls/winhttp/session.c | 67 +++++++++++++++------- dlls/winhttp/tests/url.c | 29 +++++++++- dlls/winhttp/tests/winhttp.c | 60 +++++++++++++++----- dlls/winhttp/url.c | 122 +++++++++++++++++------------------------ dlls/winhttp/winhttp_private.h | 10 +++- 6 files changed, 188 insertions(+), 112 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a365cdba48..960c755f8a 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2535,18 +2535,18 @@ static BOOL handle_redirect( request_t *request, DWORD status ) if (location[0] == '/') { - len = escape_string( NULL, location, len_loc ); + len = escape_string( NULL, location, len_loc, 0 ); if (!(path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; - escape_string( path, location, len_loc ); + escape_string( path, location, len_loc, 0 ); } else { if ((p = strrchrW( request->path, '/' ))) *p = 0; - len = strlenW( request->path ) + 1 + escape_string( NULL, location, len_loc ); + len = strlenW( request->path ) + 1 + escape_string( NULL, location, len_loc, 0 ); if (!(path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; strcpyW( path, request->path ); strcatW( path, slashW ); - escape_string( path + strlenW(path), location, len_loc ); + escape_string( path + strlenW(path), location, len_loc, 0 ); } heap_free( request->path ); request->path = path; @@ -2597,9 +2597,9 @@ static BOOL handle_redirect( request_t *request, DWORD status ) request->path = NULL; if (uc.dwUrlPathLength) { - len = escape_string( NULL, uc.lpszUrlPath, uc.dwUrlPathLength + uc.dwExtraInfoLength ); + len = escape_string( NULL, uc.lpszUrlPath, uc.dwUrlPathLength + uc.dwExtraInfoLength, 0 ); if (!(request->path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; - escape_string( request->path, uc.lpszUrlPath, uc.dwUrlPathLength + uc.dwExtraInfoLength ); + escape_string( request->path, uc.lpszUrlPath, uc.dwUrlPathLength + uc.dwExtraInfoLength, 0 ); } else request->path = strdupW( slashW ); } diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 959cafa209..061091547a 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1090,6 +1090,50 @@ static BOOL store_accept_types( request_t *request, const WCHAR **accept_types ) return TRUE; } +static WCHAR *get_request_path( const WCHAR *object, DWORD flags ) +{ + DWORD len, path_len = 0, query_len = 0; + const WCHAR *p = object, *q = NULL; + enum escape_flags path_flags, query_flags; + WCHAR *ret; + + if (flags & WINHTTP_FLAG_ESCAPE_DISABLE) path_flags = ESCAPE_FLAG_SPACE_ONLY|ESCAPE_FLAG_REMOVE_CRLF; + else if (flags & WINHTTP_FLAG_ESCAPE_PERCENT) path_flags = ESCAPE_FLAG_PERCENT; + else path_flags = 0; + + if (flags & WINHTTP_FLAG_ESCAPE_DISABLE_QUERY) query_flags = ESCAPE_FLAG_SPACE_ONLY|ESCAPE_FLAG_REMOVE_CRLF; + else query_flags = path_flags; + + if (object) + { + path_len = strlenW( object ); + if (object[0] == '/') + { + path_len--; + p++; + } + if ((q = strchrW( p, '?' ))) + { + q++; + query_len = path_len - (q - p); + path_len -= query_len + 1; + } + } + + len = escape_string( NULL, p, path_len, path_flags ); + len += escape_string( NULL, q, query_len, query_flags ); + if (!(ret = heap_alloc( (len + 3) * sizeof(WCHAR) ))) return NULL; + + ret[0] = '/'; + len = escape_string( ret + 1, p, path_len, path_flags ) + 1; + if (q) + { + ret[len] = '?'; + escape_string( ret + 1 + len, q, query_len, query_flags ); + } + return ret; +} + /*********************************************************************** * WinHttpOpenRequest (winhttp.@) */ @@ -1103,12 +1147,11 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o TRACE("%p, %s, %s, %s, %s, %p, 0x%08x\n", hconnect, debugstr_w(verb), debugstr_w(object), debugstr_w(version), debugstr_w(referrer), types, flags); - if(types && TRACE_ON(winhttp)) { + if (types && TRACE_ON(winhttp)) + { const WCHAR **iter; - TRACE("accept types:\n"); - for(iter = types; *iter; iter++) - TRACE(" %s\n", debugstr_w(*iter)); + for (iter = types; *iter; iter++) TRACE(" %s\n", debugstr_w(*iter)); } if (!(connect = (connect_t *)grab_object( hconnect ))) @@ -1150,21 +1193,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o if (!verb || !verb[0]) verb = getW; if (!(request->verb = strdupW( verb ))) goto end; - - if (object) - { - WCHAR *path, *p; - unsigned int len, len_object = strlenW(object); - - len = escape_string( NULL, object, len_object ); - if (object[0] != '/') len++; - if (!(p = path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; - - if (object[0] != '/') *p++ = '/'; - escape_string( p, object, len_object ); - request->path = path; - } - else if (!(request->path = strdupW( slashW ))) goto end; + if (!(request->path = get_request_path( object, flags ))) goto end; if (!version || !version[0]) version = http1_1; if (!(request->version = strdupW( version ))) goto end; diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index 214b7f34cf..1980ad4da2 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -34,6 +34,7 @@ static WCHAR password[] = {'p','a','s','s','w','o','r','d',0}; static WCHAR about[] = {'/','s','i','t','e','/','a','b','o','u','t',0}; static WCHAR query[] = {'?','q','u','e','r','y',0}; static WCHAR escape[] = {' ','!','"','#','$','%','&','\'','(',')','*','+',',','-','.','/',':',';','<','=','>','?','@','[','\\',']','^','_','`','{','|','}','~',0}; +static WCHAR escape2[] = {'\r',0x1f,' ','\n',0x7f,'\r','\n',0}; static const WCHAR url1[] = {'h','t','t','p',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', @@ -72,6 +73,8 @@ static const WCHAR url14[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i static const WCHAR url15[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',':','6','5','5','3','6',0}; static const WCHAR url16[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',':','0',0}; static const WCHAR url17[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',':',0}; +static const WCHAR url18[] = + {'h','t','t','p',':','/','/','%','0','D','%','1','F','%','2','0','%','0','A','%','7','F','%','0','D','%','0','A',0}; static const WCHAR url_k1[] = {'h','t','t','p',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', @@ -301,7 +304,31 @@ static void WinHttpCreateUrl_test( void ) ret = WinHttpCreateUrl( &uc, ICU_ESCAPE, url, &len ); ok( ret, "expected success\n" ); ok( len == 113, "expected len 113 got %u\n", len ); - ok( !lstrcmpW( url, url7 ), "url doesn't match\n" ); + ok( !lstrcmpW( url, url7 ), "url doesn't match %s\n", wine_dbgstr_w(url) ); + + /* escape extra info */ + memset( &uc, 0, sizeof(uc) ); + uc.dwStructSize = sizeof(uc); + uc.lpszExtraInfo = escape2; + uc.dwExtraInfoLength = lstrlenW( uc.lpszExtraInfo ); + url[0] = 0; + len = 256; + ret = WinHttpCreateUrl( &uc, ICU_ESCAPE, url, &len ); + ok( ret, "expected success\n" ); + ok( len == lstrlenW(url18), "expected len %u got %u\n", lstrlenW(url18), len ); + ok( !lstrcmpW( url, url18 ), "url doesn't match\n" ); + + /* escape path */ + memset( &uc, 0, sizeof(uc) ); + uc.dwStructSize = sizeof(uc); + uc.lpszUrlPath = escape2; + uc.dwUrlPathLength = lstrlenW( uc.lpszUrlPath ); + url[0] = 0; + len = 256; + ret = WinHttpCreateUrl( &uc, ICU_ESCAPE, url, &len ); + ok( ret, "expected success\n" ); + ok( len == lstrlenW(url18), "expected len %u got %u\n", lstrlenW(url18), len ); + ok( !lstrcmpW( url, url18 ), "url doesn't match\n" ); /* NULL lpszScheme, 0 nScheme and nPort */ fill_url_components( &uc ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 9138d6ad98..e13f95057b 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2362,7 +2362,15 @@ static DWORD CALLBACK server_thread(LPVOID param) } else if (strstr(buffer, "GET /escape")) { - if (strstr(buffer, "GET /escape?one%20two%0D%0A HTTP/1.1")) send(c, okmsg, sizeof(okmsg) - 1, 0); + static const char res[] = "%0D%0A%1F%7F%3C%20%one?%1F%7F%20!%22%23$%&'()*+,-./:;%3C=%3E?@%5B%5C%5D" + "%5E_%60%7B%7C%7D~%0D%0A "; + static const char res2[] = "%0D%0A%1F%7F%3C%20%25two?%1F%7F%20!%22%23$%25&'()*+,-./:;%3C=%3E?@%5B%5C%5D" + "%5E_%60%7B%7C%7D~%0D%0A "; + static const char res3[] = "\x1f\x7f<%20%three?\x1f\x7f%20!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~ "; + static const char res4[] = "%0D%0A%1F%7F%3C%20%four?\x1f\x7f%20!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~ "; + + if (strstr(buffer + 11, res) || strstr(buffer + 11, res2) || strstr(buffer + 11, res3) || + strstr(buffer + 11, res4 )) send(c, okmsg, sizeof(okmsg) - 1, 0); else send(c, notokmsg, sizeof(notokmsg) - 1, 0); } if (strstr(buffer, "GET /quit")) @@ -3340,21 +3348,13 @@ static void test_cookies( int port ) WinHttpCloseHandle( ses ); } -static void test_request_path_escapes( int port ) +static void do_request( HINTERNET con, const WCHAR *obj, DWORD flags ) { - static const WCHAR objW[] = - {'/','e','s','c','a','p','e','?','o','n','e',' ','t','w','o','\r','\n',0}; - HINTERNET ses, con, req; + HINTERNET req; DWORD status, size; BOOL ret; - ses = WinHttpOpen( test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); - ok( ses != NULL, "failed to open session %u\n", GetLastError() ); - - con = WinHttpConnect( ses, localhostW, port, 0 ); - ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); - - req = WinHttpOpenRequest( con, NULL, objW, NULL, NULL, NULL, 0 ); + req = WinHttpOpenRequest( con, NULL, obj, NULL, NULL, NULL, flags ); ok( req != NULL, "failed to open a request %u\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); @@ -3367,9 +3367,41 @@ static void test_request_path_escapes( int port ) size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); ok( ret, "failed to query status code %u\n", GetLastError() ); - ok( status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status ); - + ok( status == HTTP_STATUS_OK, "request %s with flags %08x failed %u\n", wine_dbgstr_w(obj), flags, status ); WinHttpCloseHandle( req ); +} + +static void test_request_path_escapes( int port ) +{ + static const WCHAR objW[] = + {'/','e','s','c','a','p','e','\r','\n',0x1f,0x7f,'<',' ','%','o','n','e','?',0x1f,0x7f,' ','!','"','#', + '$','%','&','\'','(',')','*','+',',','-','.','/',':',';','<','=','>','?','@','[','\\',']','^','_','`', + '{','|','}','~','\r','\n',0}; + static const WCHAR obj2W[] = + {'/','e','s','c','a','p','e','\r','\n',0x1f,0x7f,'<',' ','%','t','w','o','?',0x1f,0x7f,' ','!','"','#', + '$','%','&','\'','(',')','*','+',',','-','.','/',':',';','<','=','>','?','@','[','\\',']','^','_','`', + '{','|','}','~','\r','\n',0}; + static const WCHAR obj3W[] = + {'/','e','s','c','a','p','e','\r','\n',0x1f,0x7f,'<',' ','%','t','h','r','e','e','?',0x1f,0x7f,' ','!', + '"','#','$','%','&','\'','(',')','*','+',',','-','.','/',':',';','<','=','>','?','@','[','\\',']','^', + '_','`','{','|','}','~','\r','\n',0}; + static const WCHAR obj4W[] = + {'/','e','s','c','a','p','e','\r','\n',0x1f,0x7f,'<',' ','%','f','o','u','r','?',0x1f,0x7f,' ','!','"', + '#','$','%','&','\'','(',')','*','+',',','-','.','/',':',';','<','=','>','?','@','[','\\',']','^','_', + '`','{','|','}','~','\r','\n',0}; + HINTERNET ses, con; + + ses = WinHttpOpen( test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); + ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + + con = WinHttpConnect( ses, localhostW, port, 0 ); + ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + + do_request( con, objW, 0 ); + do_request( con, obj2W, WINHTTP_FLAG_ESCAPE_PERCENT ); + do_request( con, obj3W, WINHTTP_FLAG_ESCAPE_DISABLE ); + do_request( con, obj4W, WINHTTP_FLAG_ESCAPE_DISABLE_QUERY ); + WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); } diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 1e481d7dec..2019305ab3 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -87,59 +87,52 @@ static WCHAR *decode_url( LPCWSTR url, DWORD *len ) return ret; } -static BOOL need_escape( WCHAR c ) + +static BOOL need_escape( WCHAR ch, enum escape_flags flags ) { - if (isalnumW( c )) return FALSE; + static const WCHAR escapes[] = {' ','"','#','<','>','[','\\',']','^','`','{','|','}',0}; + const WCHAR *p = escapes; - if (c <= 31 || c >= 127) return TRUE; - else + if (ch != ' ' && (flags & ESCAPE_FLAG_SPACE_ONLY)) return FALSE; + if (ch == '%' && (flags & ESCAPE_FLAG_PERCENT)) return TRUE; + if (ch == '~' && (flags & ESCAPE_FLAG_TILDE)) return TRUE; + + if (ch <= 31 || ch >= 127) return TRUE; + while (*p) { - switch (c) - { - case ' ': - case '"': - case '#': - case '%': - case '<': - case '>': - case ']': - case '\\': - case '[': - case '^': - case '`': - case '{': - case '|': - case '}': - case '~': - return TRUE; - default: - return FALSE; - } + if (ch == *p++) return TRUE; } + return FALSE; } -DWORD escape_string( WCHAR *dst, const WCHAR *src, DWORD len ) +DWORD escape_string( WCHAR *dst, const WCHAR *src, DWORD len, enum escape_flags flags ) { static const WCHAR hex[] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'}; DWORD ret = len; unsigned int i; WCHAR *p = dst; - for (i = 0; i < len; i++, p++) + for (i = 0; i < len; i++) { - if (need_escape( src[i] )) + if ((flags & ESCAPE_FLAG_REMOVE_CRLF) && (src[i] == '\r' || src[i] == '\n')) + { + ret--; + continue; + } + if (need_escape( src[i], flags )) { if (dst) { p[0] = '%'; p[1] = hex[(src[i] >> 4) & 0xf]; p[2] = hex[src[i] & 0xf]; - p += 2; + p += 3; } ret += 2; } - else if (dst) *p = src[i]; + else if (dst) *p++ = src[i]; } + if (dst) dst[ret] = 0; return ret; } @@ -153,7 +146,7 @@ static WCHAR *escape_url( const WCHAR *url, DWORD *len ) if ((p = strrchrW( url, '/' ))) { len_base = p - url; - len_path = escape_string( NULL, p, *len - len_base ); + len_path = escape_string( NULL, p, *len - len_base, ESCAPE_FLAG_PERCENT|ESCAPE_FLAG_TILDE ); } else { @@ -164,7 +157,7 @@ static WCHAR *escape_url( const WCHAR *url, DWORD *len ) if (!(ret = heap_alloc( (len_base + len_path + 1) * sizeof(WCHAR) ))) return NULL; memcpy( ret, url, len_base * sizeof(WCHAR) ); - if (p) escape_string( ret + len_base, p, *len - (p - url) ); + if (p) escape_string( ret + len_base, p, *len - (p - url), ESCAPE_FLAG_PERCENT|ESCAPE_FLAG_TILDE ); ret[len_base + len_path] = 0; *len = len_base + len_path; @@ -349,18 +342,18 @@ static BOOL uses_default_port( INTERNET_SCHEME scheme, INTERNET_PORT port ) return FALSE; } -static DWORD comp_length( DWORD len, DWORD flags, WCHAR *comp ) +static DWORD get_comp_length( DWORD len, DWORD flags, WCHAR *comp ) { DWORD ret; unsigned int i; ret = len ? len : strlenW( comp ); if (!(flags & ICU_ESCAPE)) return ret; - for (i = 0; i < len; i++) if (need_escape( comp[i] )) ret += 2; + for (i = 0; i < len; i++) if (need_escape( comp[i], ESCAPE_FLAG_PERCENT|ESCAPE_FLAG_TILDE )) ret += 2; return ret; } -static BOOL calc_length( URL_COMPONENTS *uc, DWORD flags, LPDWORD len ) +static BOOL get_url_length( URL_COMPONENTS *uc, DWORD flags, DWORD *len ) { static const WCHAR formatW[] = {'%','u',0}; INTERNET_SCHEME scheme; @@ -368,7 +361,7 @@ static BOOL calc_length( URL_COMPONENTS *uc, DWORD flags, LPDWORD len ) *len = 0; if (uc->lpszScheme) { - DWORD scheme_len = comp_length( uc->dwSchemeLength, 0, uc->lpszScheme ); + DWORD scheme_len = get_comp_length( uc->dwSchemeLength, 0, uc->lpszScheme ); *len += scheme_len; scheme = get_scheme( uc->lpszScheme, scheme_len ); } @@ -378,12 +371,11 @@ static BOOL calc_length( URL_COMPONENTS *uc, DWORD flags, LPDWORD len ) if (!scheme) scheme = INTERNET_SCHEME_HTTP; *len += strlenW( get_scheme_string( scheme ) ); } - *len += 1; /* ':' */ - if (uc->lpszHostName) *len += 2; /* "//" */ + *len += 3; /* "://" */ if (uc->lpszUserName) { - *len += comp_length( uc->dwUserNameLength, 0, uc->lpszUserName ); + *len += get_comp_length( uc->dwUserNameLength, 0, uc->lpszUserName ); *len += 1; /* "@" */ } else @@ -397,11 +389,11 @@ static BOOL calc_length( URL_COMPONENTS *uc, DWORD flags, LPDWORD len ) if (uc->lpszPassword) { *len += 1; /* ":" */ - *len += comp_length( uc->dwPasswordLength, 0, uc->lpszPassword ); + *len += get_comp_length( uc->dwPasswordLength, 0, uc->lpszPassword ); } if (uc->lpszHostName) { - *len += comp_length( uc->dwHostNameLength, 0, uc->lpszHostName ); + *len += get_comp_length( uc->dwHostNameLength, 0, uc->lpszHostName ); if (!uses_default_port( scheme, uc->nPort )) { @@ -412,8 +404,8 @@ static BOOL calc_length( URL_COMPONENTS *uc, DWORD flags, LPDWORD len ) } if (uc->lpszUrlPath && *uc->lpszUrlPath != '/') *len += 1; /* '/' */ } - if (uc->lpszUrlPath) *len += comp_length( uc->dwUrlPathLength, flags, uc->lpszUrlPath ); - if (uc->lpszExtraInfo) *len += comp_length( uc->dwExtraInfoLength, flags, uc->lpszExtraInfo ); + if (uc->lpszUrlPath) *len += get_comp_length( uc->dwUrlPathLength, flags, uc->lpszUrlPath ); + if (uc->lpszExtraInfo) *len += get_comp_length( uc->dwExtraInfoLength, flags, uc->lpszExtraInfo ); return TRUE; } @@ -423,7 +415,6 @@ static BOOL calc_length( URL_COMPONENTS *uc, DWORD flags, LPDWORD len ) BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDWORD required ) { static const WCHAR formatW[] = {'%','u',0}; - static const WCHAR twoslashW[] = {'/','/'}; DWORD len; INTERNET_SCHEME scheme; @@ -435,7 +426,7 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW return FALSE; } - if (!calc_length( uc, flags, &len )) return FALSE; + if (!get_url_length( uc, flags, &len )) return FALSE; if (*required < len) { @@ -453,7 +444,7 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW *required = len; if (uc->lpszScheme) { - len = comp_length( uc->dwSchemeLength, 0, uc->lpszScheme ); + len = get_comp_length( uc->dwSchemeLength, 0, uc->lpszScheme ); memcpy( url, uc->lpszScheme, len * sizeof(WCHAR) ); url += len; @@ -472,58 +463,47 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW url += len; } - /* all schemes are followed by at least a colon */ - *url = ':'; - url++; + *url++ = ':'; + *url++ = '/'; + *url++ = '/'; - if (uc->lpszHostName) - { - memcpy( url, twoslashW, sizeof(twoslashW) ); - url += ARRAY_SIZE( twoslashW ); - } if (uc->lpszUserName) { - len = comp_length( uc->dwUserNameLength, 0, uc->lpszUserName ); + len = get_comp_length( uc->dwUserNameLength, 0, uc->lpszUserName ); memcpy( url, uc->lpszUserName, len * sizeof(WCHAR) ); url += len; if (uc->lpszPassword) { - *url = ':'; - url++; - - len = comp_length( uc->dwPasswordLength, 0, uc->lpszPassword ); + *url++ = ':'; + len = get_comp_length( uc->dwPasswordLength, 0, uc->lpszPassword ); memcpy( url, uc->lpszPassword, len * sizeof(WCHAR) ); url += len; } - *url = '@'; - url++; + *url++ = '@'; } if (uc->lpszHostName) { - len = comp_length( uc->dwHostNameLength, 0, uc->lpszHostName ); + len = get_comp_length( uc->dwHostNameLength, 0, uc->lpszHostName ); memcpy( url, uc->lpszHostName, len * sizeof(WCHAR) ); url += len; if (!uses_default_port( scheme, uc->nPort )) { - *url = ':'; - url++; - + *url++ = ':'; url += sprintfW( url, formatW, uc->nPort ); } /* add slash between hostname and path if necessary */ if (uc->lpszUrlPath && *uc->lpszUrlPath != '/') { - *url = '/'; - url++; + *url++ = '/'; } } if (uc->lpszUrlPath) { - len = comp_length( uc->dwUrlPathLength, 0, uc->lpszUrlPath ); - if (flags & ICU_ESCAPE) url += escape_string( url, uc->lpszUrlPath, len ); + len = get_comp_length( uc->dwUrlPathLength, 0, uc->lpszUrlPath ); + if (flags & ICU_ESCAPE) url += escape_string( url, uc->lpszUrlPath, len, ESCAPE_FLAG_PERCENT|ESCAPE_FLAG_TILDE ); else { memcpy( url, uc->lpszUrlPath, len * sizeof(WCHAR) ); @@ -532,8 +512,8 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW } if (uc->lpszExtraInfo) { - len = comp_length( uc->dwExtraInfoLength, 0, uc->lpszExtraInfo ); - if (flags & ICU_ESCAPE) url += escape_string( url, uc->lpszExtraInfo, len ); + len = get_comp_length( uc->dwExtraInfoLength, 0, uc->lpszExtraInfo ); + if (flags & ICU_ESCAPE) url += escape_string( url, uc->lpszExtraInfo, len, ESCAPE_FLAG_PERCENT|ESCAPE_FLAG_TILDE ); else { memcpy( url, uc->lpszExtraInfo, len * sizeof(WCHAR) ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 6b4e3b0405..53b3c163df 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -307,7 +307,15 @@ BOOL set_server_for_hostname( connect_t *, LPCWSTR, INTERNET_PORT ) DECLSPEC_HID void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN; void release_host( hostdata_t *host ) DECLSPEC_HIDDEN; -DWORD escape_string( WCHAR *, const WCHAR *, DWORD ) DECLSPEC_HIDDEN; + +enum escape_flags +{ + ESCAPE_FLAG_REMOVE_CRLF = 0x01, + ESCAPE_FLAG_SPACE_ONLY = 0x02, + ESCAPE_FLAG_PERCENT = 0x04, + ESCAPE_FLAG_TILDE = 0x08, +}; +DWORD escape_string( WCHAR *, const WCHAR *, DWORD, enum escape_flags ) DECLSPEC_HIDDEN; extern HRESULT WinHttpRequest_create( void ** ) DECLSPEC_HIDDEN; void release_typelib( void ) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH] devenum: Zero-initialize REGFILTERPINS struct.
by Zebediah Figura Oct. 3, 2018

Oct. 3, 2018

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45923 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/createdevenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index e44e6ec..8a3160c 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -778,7 +778,7 @@ static void register_avicap_devices(void) WCHAR friendlyname[] = {'v','i','d','e','o','0',0}; IPropertyBag *prop_bag = NULL; WCHAR name[32], version[32]; - REGFILTERPINS2 rgpins; + REGFILTERPINS2 rgpins = {0}; REGPINTYPES rgtypes; REGFILTER2 rgf; VARIANT var; -- 2.7.4

1 0

[PATCH v2 1/2] ntoskrnl.exe: Implement IoRegisterDeviceInterface
by Aric Stewart Oct. 3, 2018

Oct. 3, 2018

v2: use setupapi functions as suggested by Zebediah Figura Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/ntoskrnl.exe/Makefile.in | 2 +- dlls/ntoskrnl.exe/ntoskrnl.c | 125 ++++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 4 files changed, 128 insertions(+), 2 deletions(-)

2 1

[PATCH v2] mshtml: Support retrieving command output in Exec(OLECMDID_OPTICAL_ZOOM).
by Piotr Caban Oct. 3, 2018

Oct. 3, 2018

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - fixed test failures on IE6 and output parameter assignment (spotted by Jacek) dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsembed.c | 23 +++++++++++++++++++++++ dlls/mshtml/olecmd.c | 9 +++++++-- dlls/mshtml/tests/htmldoc.c | 17 +++++++++++++++-- 4 files changed, 46 insertions(+), 4 deletions(-)

3 2