- Wine-Devel - list.winehq.org

[PATCH] widl: Make decl_needs_parens static
by Martin Storsjo June 12, 2020

June 12, 2020

This function lacks a declaration in header.h and isn't used outside of this source file. This fixes warnings about missing a prototype, when built as part of mingw-w64-tools (where it is built with -Wmissing-prototypes). Signed-off-by: Martin Storsjo <martin(a)martin.st> --- tools/widl/header.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index c00a3e1bb3e..a319f2425e3 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -283,7 +283,7 @@ int needs_space_after(type_t *t) (!is_ptr(t) && (!is_array(t) || !type_array_is_decl_as_ptr(t) || t->name))); } -int decl_needs_parens(const type_t *t) +static int decl_needs_parens(const type_t *t) { if (type_is_alias(t)) return FALSE; -- 2.17.1

2 1

[PATCH 1/4] d3dx9: Use BitScanReverse in make_pow2.
by Jacek Caban June 12, 2020

June 12, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I left behaviour for num == 1 unchanged, but according to the comment it should be 0. We don't seem to have a test for that. dlls/d3dx9_36/d3dx9_private.h | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)

3 3

[PATCH] dwrite: Keep current lookup feature mask in context.
by Nikolay Sivov June 12, 2020

June 12, 2020

Lookups referenced from context-based lookups need to have access to original feature mask, set it once instead of propagating it on every recursive call. It's used for input matching and parametrized cases like alternate substitutions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/opentype.c | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 661e01123c9..be3f4b719e8 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -585,6 +585,7 @@ struct scriptshaping_context unsigned int range_count; } user_features; unsigned int global_mask; + unsigned int lookup_mask; /* Currently processed feature mask, set in main loop. */ struct shaping_glyph_info *glyph_infos; unsigned int cur; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index cb79a68d59e..22159e29885 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4802,6 +4802,8 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, const struct lookup *lookup = &lookups.lookups[i]; context->cur = 0; + context->lookup_mask = lookup->mask; + while (context->cur < context->glyph_count) { ret = FALSE; @@ -5037,8 +5039,8 @@ static BOOL opentype_layout_apply_gsub_alt_substitution(struct scriptshaping_con if (!count) return FALSE; - BitScanForward(&shift, lookup->mask); - alt_index = (lookup->mask & context->glyph_infos[idx].mask) >> shift; + BitScanForward(&shift, context->lookup_mask); + alt_index = (context->lookup_mask & context->glyph_infos[idx].mask) >> shift; if (alt_index > count || !alt_index) return FALSE; @@ -5071,7 +5073,7 @@ static BOOL opentype_layout_context_match_input(const struct match_context *mc, match_positions[0] = context->cur; glyph_iterator_init(context, mc->lookup->flags, context->cur, count - 1, &iter); - iter.mask = mc->lookup->mask; + iter.mask = context->lookup_mask; iter.match_func = mc->match_func; iter.match_data = &match_data; iter.glyph_data = input; @@ -5933,6 +5935,8 @@ void opentype_layout_apply_gsub_features(struct scriptshaping_context *context, { const struct lookup *lookup = &lookups.lookups[i]; + context->lookup_mask = lookup->mask; + if (!opentype_is_gsub_lookup_reversed(context, lookup)) { context->cur = 0; -- 2.27.0

1 0

[PATCH] msvcrt: Reset buffer in fflush on error.
by Piotr Caban June 12, 2020

June 12, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 11 ++++++----- dlls/msvcrt/tests/file.c | 18 +++++++++++++++++- 2 files changed, 23 insertions(+), 6 deletions(-)

1 0

[PATCH 1/2] oleaut32: Add guid to SLTG_Header
by Vijay Kiran Kamuju June 12, 2020

June 12, 2020

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 2

[PATCH 1/2] ntdll: Create class section for proxy-stub interface entries.
by Nikolay Sivov June 12, 2020

June 12, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/actctx.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 1fb337ea333..1fa97ac0379 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1778,12 +1778,40 @@ static BOOL parse_nummethods(const xmlstr_t *str, struct entity *entity) return TRUE; } +static void parse_add_interface_class( xmlbuf_t *xmlbuf, struct entity_array *entities, + struct actctx_loader *acl, WCHAR *clsid ) +{ + struct entity *entity; + WCHAR *str; + + if (!clsid) return; + + if (!(str = strdupW(clsid))) + { + set_error( xmlbuf ); + return; + } + + if (!(entity = add_entity(entities, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION))) + { + RtlFreeHeap(GetProcessHeap(), 0, str); + set_error( xmlbuf ); + return; + } + + entity->u.comclass.clsid = str; + entity->u.comclass.model = ThreadingModel_Both; + + acl->actctx->sections |= SERVERREDIRECT_SECTION; +} + static void parse_cominterface_proxy_stub_elem( xmlbuf_t *xmlbuf, struct dll_redirect *dll, struct actctx_loader *acl, const struct xml_elem *parent ) { + WCHAR *psclsid = NULL; + struct entity *entity; struct xml_attr attr; BOOL end = FALSE; - struct entity* entity; if (!(entity = add_entity(&dll->entities, ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION))) { @@ -1815,8 +1843,12 @@ static void parse_cominterface_proxy_stub_elem( xmlbuf_t *xmlbuf, struct dll_red { if (!(entity->u.ifaceps.tlib = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } + else if (xml_attr_cmp(&attr, proxyStubClsid32W)) + { + if (!(psclsid = xmlstrdupW(&attr.value))) set_error( xmlbuf ); + } /* not used */ - else if (xml_attr_cmp(&attr, proxyStubClsid32W) || xml_attr_cmp(&attr, threadingmodelW)) + else if (xml_attr_cmp(&attr, threadingmodelW)) { } else if (!is_xmlns_attr( &attr )) @@ -1827,6 +1859,10 @@ static void parse_cominterface_proxy_stub_elem( xmlbuf_t *xmlbuf, struct dll_red acl->actctx->sections |= IFACEREDIRECT_SECTION; if (!end) parse_expect_end_elem(xmlbuf, parent); + + parse_add_interface_class(xmlbuf, &dll->entities, acl, psclsid ? psclsid : entity->u.ifaceps.iid); + + RtlFreeHeap(GetProcessHeap(), 0, psclsid); } static BOOL parse_typelib_flags(const xmlstr_t *value, struct entity *entity) -- 2.27.0

2 3

[PATCH v2 2/2] oleaut32: Include the leading '\1' in the CompObj stream name.
by Huw Davies June 12, 2020

June 12, 2020

From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/oleaut32/typelib.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 521d176bfe1..515d4b557e6 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -326,12 +326,11 @@ typedef struct { /* These then get followed by this magic */ typedef struct { -/*00*/ BYTE res00; /* always 0x01 */ -/*01*/ CHAR CompObj_magic[8]; /* always "CompObj" */ +/*00*/ CHAR CompObj_magic[9]; /* always "\1CompObj" */ /*09*/ CHAR dir_magic[4]; /* always "dir" */ } SLTG_Magic; -#define SLTG_COMPOBJ_MAGIC "CompObj" +#define SLTG_COMPOBJ_MAGIC "\1CompObj" #define SLTG_DIR_MAGIC "dir" /* Next we have SLTG_Header.nrOfFileBlks - 2 of Index strings. These -- 2.23.0

1 0

[PATCH v2 1/2] oleaut32: Merge four DWORDs into a GUID.
by Huw Davies June 12, 2020

June 12, 2020

From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/oleaut32/typelib.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 9c700b11a76..521d176bfe1 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -309,10 +309,7 @@ typedef struct { /*08*/ WORD res08; /* some kind of len/offset ?? */ /*0a*/ WORD first_blk; /* 1 based index into blk entries that corresponds to first block in file */ -/*0c*/ DWORD res0c; /* always 0x000204ff */ -/*10*/ DWORD res10; /* always 0x00000000 */ -/*14*/ DWORD res14; /* always 0x000000c0 */ -/*18*/ DWORD res18; /* always 0x46000000 */ +/*0c*/ GUID guid; /* always 000204ff-0000-0000-c000-000000000046 */ /*1c*/ DWORD res1c; /* always 0x00000044 */ /*20*/ DWORD res20; /* always 0xffff0000 */ } SLTG_Header; -- 2.23.0

1 0

[PATCH] winhttp: Support WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET option
by Alistair Leslie-Hughes June 12, 2020

June 12, 2020

Example used https://github.com/microsoft/Windows-classic-samples/tree/master/Samples/Wi… When this option is used, it adds the following headers Connection, Upgrade, Sec-WebSocket-Key, Sec-WebSocket-Version Using wireshark shows, Without Option GET /index.html HTTP/1.1 Connection: Keep-Alive User-Agent: WebSocket sample Host: XXXXX With Option GET /index.html HTTP/1.1 Connection: Upgrade Upgrade: websocket User-Agent: WebSocket sample Sec-WebSocket-Key: FbVt3BszLghHUJlUAGA+kw== Sec-WebSocket-Version: 13 Host: XXXXX Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winhttp/session.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 24455d858a6..105e292b15d 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1042,6 +1042,38 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b FIXME("WINHTTP_OPTION_CONNECT_RETRIES\n"); return TRUE; + case WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET: + { + BYTE buf[16]; + WCHAR str[64]; + DWORD length = 64; + int i; + + add_request_headers(request, L"Connection: Upgrade", -1, + WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE); + add_request_headers(request, L"Upgrade: websocket", -1, + WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE); + add_request_headers(request, L"Sec-WebSocket-Version: 13", -1, + WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE); + + for(i = 0; i < sizeof(buf); i++) + buf[i] = rand() % 256; + + /* + * As per rfc6455, Sec-WebSocket-Key is a base64-encoded 16 BYTE array value. + */ + if (CryptBinaryToStringW(buf, sizeof(buf), CRYPT_STRING_BASE64, str, &length)) + { + WCHAR websocketkey[64]; + + swprintf(websocketkey, ARRAY_SIZE(websocketkey), L"Sec-WebSocket-Key: %s", str); + + add_request_headers(request, websocketkey, -1, + WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE); + } + return TRUE; + } + default: FIXME("unimplemented option %u\n", option); SetLastError( ERROR_WINHTTP_INVALID_OPTION ); -- 2.26.2

2 2

[PATCH 1/3] user32/tests: Test changing to a 1Hz display mode.
by Zhiyi Zhang June 12, 2020

June 12, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 205df1c2935..482e2f1301f 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -257,6 +257,7 @@ struct vid_mode static const struct vid_mode vid_modes_test[] = { {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY, 0}, {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY, 1}, + {1024, 768, 0, 1, DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY, 1}, {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL , 0}, {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT , 1}, {1024, 768, 0, 0, DM_BITSPERPEL , 0}, @@ -447,6 +448,7 @@ static void test_ChangeDisplaySettingsEx(void) dm.dmDisplayFrequency = vid_modes_test[i].freq; dm.dmFields = vid_modes_test[i].fields; res = ChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); + todo_wine_if(i == 2) ok(vid_modes_test[i].must_succeed ? (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_RESTART) : (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_RESTART || -- 2.25.1

2 1