August 2019 - Wine-devel - list.winehq.org

[PATCH] hhctrl.ocx: expand environment vars in file name.
by Carlo Bramini 24 Aug '19

24 Aug '19

HHCTRL implementation for WINE does not seem to support command lines including environment strings. Attached patch fixes one of the two issues described in bug#47379. Sincerely. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47379 Signed-off-by: Carlo Bramini <carlo_bramini(a)users.sourceforge.net>

1 0

[PATCH v2] httpapi: Add more entrypoints
by Esdras Tarsis 24 Aug '19

24 Aug '19

Signed-off-by: Esdras Tarsis <esdrastarsis(a)gmail.com> --- v2: Added stubs for HttpCreateUrlGroup and HttpCloseUrlGroup to avoid test failures dlls/httpapi/httpapi.spec | 17 +++++++++++++++++ dlls/httpapi/httpapi_main.c | 18 ++++++++++++++++++ include/http.h | 2 ++ 3 files changed, 37 insertions(+) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index 88bc32488a..7d887f8717 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -1,13 +1,19 @@ @ stub HttpAddFragmentToCache @ stdcall HttpAddUrl(ptr wstr ptr) @ stub HttpAddUrlToConfigGroup +@ stub HttpAddUrlToUrlGroup @ stub HttpCancelHttpRequest @ stub HttpCreateAppPool @ stub HttpCreateConfigGroup @ stub HttpCreateFilter @ stdcall HttpCreateHttpHandle(ptr long) +@ stub HttpCreateRequestQueue @ stdcall HttpCreateServerSession(long ptr long) +@ stdcall HttpCreateUrlGroup(int64 ptr long) +@ stub HttpCloseRequestQueue @ stdcall HttpCloseServerSession(int64) +@ stdcall HttpCloseUrlGroup(int64) +@ stub HttpDeclarePush @ stub HttpDeleteConfigGroup @ stdcall HttpDeleteServiceConfiguration(ptr long ptr long ptr) @ stub HttpFilterAccept @@ -25,11 +31,15 @@ @ stub HttpOpenAppPool @ stub HttpOpenControlChannel @ stub HttpOpenFilter +@ stub HttpPrepareUrl @ stub HttpQueryAppPoolInformation @ stub HttpQueryConfigGroupInformation @ stub HttpQueryControlChannelInformation +@ stub HttpQueryRequestQueueProperty @ stub HttpQueryServerContextInformation +@ stub HttpQueryServerSessionProperty @ stdcall HttpQueryServiceConfiguration(ptr long ptr long ptr long ptr ptr) +@ stub HttpQueryUrlGroupProperty @ stub HttpReadFragmentFromCache @ stub HttpReceiveClientCertificate @ stdcall HttpReceiveHttpRequest(ptr int64 long ptr long ptr ptr) @@ -38,6 +48,7 @@ @ stub HttpRemoveAllUrlsFromConfigGroup @ stdcall HttpRemoveUrl(ptr wstr) @ stub HttpRemoveUrlFromConfigGroup +@ stub HttpRemoveUrlFromUrlGroup @ stub HttpSendHttpRequest @ stdcall HttpSendHttpResponse(ptr int64 long ptr ptr ptr ptr long ptr ptr) @ stub HttpSendRequestEntityBody @@ -45,10 +56,16 @@ @ stub HttpSetAppPoolInformation @ stub HttpSetConfigGroupInformation @ stub HttpSetControlChannelInformation +@ stub HttpSetRequestQueueProperty @ stub HttpSetServerContextInformation +@ stub HttpSetServerSessionProperty @ stdcall HttpSetServiceConfiguration(ptr long ptr long ptr) +@ stub HttpSetUrlGroupProperty @ stub HttpShutdownAppPool @ stub HttpShutdownFilter +@ stub HttpShutdownRequestQueue @ stdcall HttpTerminate(long ptr) +@ stub HttpUpdateServiceConfiguration @ stub HttpWaitForDemandStart @ stub HttpWaitForDisconnect +@ stub HttpWaitForDisconnectEx diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 5f2a307934..ad8a015144 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -285,3 +285,21 @@ ULONG WINAPI HttpCloseServerSession( HTTP_SERVER_SESSION_ID id ) FIXME( "(%s): stub!\n", wine_dbgstr_longlong(id)); return ERROR_INVALID_PARAMETER; } + +/*********************************************************************** + * HttpCreateUrlGroup (HTTPAPI.@) + */ +ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID id, HTTP_URL_GROUP_ID *urlgroupid, ULONG reserved) +{ + FIXME( "(id %s, urlgroupid %p, reserved %d): stub!\n", wine_dbgstr_longlong(id), urlgroupid, reserved ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * HttpCloseUrlGroup (HTTPAPI.@) + */ +ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID urlgroupid) +{ + FIXME( "(urlgroupid %s): stub!\n", wine_dbgstr_longlong(urlgroupid)); + return ERROR_CALL_NOT_IMPLEMENTED; +} \ No newline at end of file diff --git a/include/http.h b/include/http.h index 84d3445b67..fbc353b8de 100644 --- a/include/http.h +++ b/include/http.h @@ -400,7 +400,9 @@ typedef struct _HTTP_LOG_DATA ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG); ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION,PHTTP_SERVER_SESSION_ID,ULONG); +ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID,PHTTP_URL_GROUP_ID,ULONG); ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID); +ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID); ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved); ULONG WINAPI HttpTerminate(ULONG flags, void *reserved); -- 2.23.0

3 2

[PATCH 2/2] comctl32/updown: Supress the NM_RELEASEDCAPTURE notification.
by Akihiro Sagawa 23 Aug '19

23 Aug '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47666 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/comctl32/tests/updown.c | 4 ++-- dlls/comctl32/updown.c | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-)

1 0

[PATCH 1/2] comctl32/tests: Add tests to show no NM_RELEASEDCAPTURE notifications in the updown control.
by Akihiro Sagawa 23 Aug '19

23 Aug '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/comctl32/tests/updown.c | 76 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-)

1 0

[PATCH] httpapi: Add more entrypoints
by Esdras Tarsis 23 Aug '19

23 Aug '19

Signed-off-by: Esdras Tarsis <esdrastarsis(a)gmail.com> --- dlls/httpapi/httpapi.spec | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index 88bc32488a..8bee7d4dd1 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -1,13 +1,19 @@ @ stub HttpAddFragmentToCache @ stdcall HttpAddUrl(ptr wstr ptr) @ stub HttpAddUrlToConfigGroup +@ stub HttpAddUrlToUrlGroup @ stub HttpCancelHttpRequest @ stub HttpCreateAppPool @ stub HttpCreateConfigGroup @ stub HttpCreateFilter @ stdcall HttpCreateHttpHandle(ptr long) +@ stub HttpCreateRequestQueue @ stdcall HttpCreateServerSession(long ptr long) +@ stub HttpCreateUrlGroup +@ stub HttpCloseRequestQueue @ stdcall HttpCloseServerSession(int64) +@ stub HttpCloseUrlGroup +@ stub HttpDeclarePush @ stub HttpDeleteConfigGroup @ stdcall HttpDeleteServiceConfiguration(ptr long ptr long ptr) @ stub HttpFilterAccept @@ -25,11 +31,15 @@ @ stub HttpOpenAppPool @ stub HttpOpenControlChannel @ stub HttpOpenFilter +@ stub HttpPrepareUrl @ stub HttpQueryAppPoolInformation @ stub HttpQueryConfigGroupInformation @ stub HttpQueryControlChannelInformation +@ stub HttpQueryRequestQueueProperty @ stub HttpQueryServerContextInformation +@ stub HttpQueryServerSessionProperty @ stdcall HttpQueryServiceConfiguration(ptr long ptr long ptr long ptr ptr) +@ stub HttpQueryUrlGroupProperty @ stub HttpReadFragmentFromCache @ stub HttpReceiveClientCertificate @ stdcall HttpReceiveHttpRequest(ptr int64 long ptr long ptr ptr) @@ -38,6 +48,7 @@ @ stub HttpRemoveAllUrlsFromConfigGroup @ stdcall HttpRemoveUrl(ptr wstr) @ stub HttpRemoveUrlFromConfigGroup +@ stub HttpRemoveUrlFromUrlGroup @ stub HttpSendHttpRequest @ stdcall HttpSendHttpResponse(ptr int64 long ptr ptr ptr ptr long ptr ptr) @ stub HttpSendRequestEntityBody @@ -45,10 +56,16 @@ @ stub HttpSetAppPoolInformation @ stub HttpSetConfigGroupInformation @ stub HttpSetControlChannelInformation +@ stub HttpSetRequestQueueProperty @ stub HttpSetServerContextInformation +@ stub HttpSetServerSessionProperty @ stdcall HttpSetServiceConfiguration(ptr long ptr long ptr) +@ stub HttpSetUrlGroupProperty @ stub HttpShutdownAppPool @ stub HttpShutdownFilter +@ stub HttpShutdownRequestQueue @ stdcall HttpTerminate(long ptr) +@ stub HttpUpdateServiceConfiguration @ stub HttpWaitForDemandStart @ stub HttpWaitForDisconnect +@ stub HttpWaitForDisconnectEx -- 2.23.0

2 1

[PATCH 1/5] http.sys: Parse salient data from request headers.
by Zebediah Figura 23 Aug '19

23 Aug '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/http.sys/http.c | 165 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 163 insertions(+), 2 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 5e29db0fa7..506aefccf1 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -52,6 +52,13 @@ struct connection char *buffer; unsigned int len, size; + + /* Things we already parsed out of the request header in parse_request(). */ + unsigned int req_len; + HTTP_VERB verb; + HTTP_VERSION version; + const char *url, *host; + ULONG unk_verb_len, url_len, content_len; }; static struct list connections = LIST_INIT(connections); @@ -99,19 +106,173 @@ static void accept_connection(int socket) static void close_connection(struct connection *conn) { + heap_free(conn->buffer); shutdown(conn->socket, SD_BOTH); closesocket(conn->socket); list_remove(&conn->entry); heap_free(conn); } +static HTTP_VERB parse_verb(const char *verb, int len) +{ + static const char *const verbs[] = + { + "OPTIONS", + "GET", + "HEAD", + "POST", + "PUT", + "DELETE", + "TRACE", + "CONNECT", + "TRACK", + "MOVE", + "COPY", + "PROPFIND", + "PROPPATCH", + "MKCOL", + "LOCK", + "UNLOCK", + "SEARCH", + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(verbs); ++i) + { + if (!strncmp(verb, verbs[i], len)) + return HttpVerbOPTIONS + i; + } + return HttpVerbUnknown; +} + +/* Return the length of a token, as defined in RFC 2616 section 2.2. */ +static int parse_token(const char *str, const char *end) +{ + const char *p; + for (p = str; !end || p < end; ++p) + { + if (!isgraph(*p) || strchr("()<>@,;:\\\"/[]?={}", *p)) + break; + } + return p - str; +} + +/* Return 1 if str matches expect, 0 if str is incomplete, -1 if they don't match. */ +static int compare_exact(const char *str, const char *expect, const char *end) +{ + while (*expect) + { + if (str >= end) return 0; + if (*str++ != *expect++) return -1; + } + return 1; +} + +static int parse_number(const char *str, const char **endptr, const char *end) +{ + int n = 0; + while (str < end && isdigit(*str)) + n = n * 10 + (*str++ - '0'); + *endptr = str; + return n; +} + /* Upon receiving a request, parse it to ensure that it is a valid HTTP request, * and mark down some information that we will use later. Returns 1 if we parsed * a complete request, 0 if incomplete, -1 if invalid. */ static int parse_request(struct connection *conn) { - FIXME("Not implemented.\n"); - return -1; + const char *const req = conn->buffer, *const end = conn->buffer + conn->len; + const char *p = req, *q; + int len, ret; + + if (!conn->len) return 0; + + TRACE("%s\n", wine_dbgstr_an(conn->buffer, conn->len)); + + len = parse_token(p, end); + if (p + len >= end) return 0; + if (!len || p[len] != ' ') return -1; + + /* verb */ + if ((conn->verb = parse_verb(p, len)) == HttpVerbUnknown) + conn->unk_verb_len = len; + p += len + 1; + + TRACE("Got verb %u (%s).\n", conn->verb, debugstr_an(req, len)); + + /* URL */ + conn->url = p; + while (p < end && isgraph(*p)) ++p; + conn->url_len = p - conn->url; + if (p >= end) return 0; + if (!conn->url_len) return -1; + + TRACE("Got URI %s.\n", debugstr_an(conn->url, conn->url_len)); + + /* version */ + if ((ret = compare_exact(p, " HTTP/", end)) <= 0) return ret; + p += 6; + conn->version.MajorVersion = parse_number(p, &q, end); + if (q >= end) return 0; + if (q == p || *q != '.') return -1; + p = q + 1; + if (p >= end) return 0; + conn->version.MinorVersion = parse_number(p, &q, end); + if (q >= end) return 0; + if (q == p) return -1; + p = q; + if ((ret = compare_exact(p, "\r\n", end)) <= 0) return ret; + p += 2; + + TRACE("Got version %hu.%hu.\n", conn->version.MajorVersion, conn->version.MinorVersion); + + /* headers */ + conn->host = NULL; + conn->content_len = 0; + for (;;) + { + const char *name = p; + + if (!(ret = compare_exact(p, "\r\n", end))) return 0; + else if (ret > 0) break; + + len = parse_token(p, end); + if (p + len >= end) return 0; + if (!len) return -1; + p += len; + while (p < end && (*p == ' ' || *p == '\t')) ++p; + if (p >= end) return 0; + if (*p != ':') return -1; + ++p; + while (p < end && (*p == ' ' || *p == '\t')) ++p; + + TRACE("Got %s header.\n", debugstr_an(name, len)); + + if (!strncmp(name, "Host", len)) + conn->host = p; + else if (!strncmp(name, "Content-Length", len)) + { + conn->content_len = parse_number(p, &q, end); + if (q >= end) return 0; + if (q == p) return -1; + } + else if (!strncmp(name, "Transfer-Encoding", len)) + FIXME("Unhandled Transfer-Encoding header.\n"); + while (p < end && (isprint(*p) || *p == '\t')) ++p; + if ((ret = compare_exact(p, "\r\n", end)) <= 0) return ret; + p += 2; + } + p += 2; + if (conn->url[0] == '/' && !conn->host) return -1; + + if (end - p < conn->content_len) return 0; + + conn->req_len = (p - req) + conn->content_len; + + TRACE("Received a full request, length %u bytes.\n", conn->req_len); + + return 1; } static void receive_data(struct connection *conn) -- 2.22.0

1 4

[PATCH resend 1/3] ntdll/tests: Add more tests for RtlIpv4StringToAddress
by Alex Henrie 23 Aug '19

23 Aug '19

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/tests/rtl.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 62662cb438..3e1d92c3d2 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1212,12 +1212,23 @@ static struct { "1", STATUS_SUCCESS, 1, { 0, 0, 0, 1 }, strict_diff_4, STATUS_INVALID_PARAMETER, 1, { -1 } }, { "-1", STATUS_INVALID_PARAMETER, 0, { -1 } }, + { "1.2", STATUS_SUCCESS, 3, { 1, 0, 0, 2 }, strict_diff_4, + STATUS_INVALID_PARAMETER, 3, { -1 } }, + { "1000.2000", STATUS_INVALID_PARAMETER, 9, { -1 } }, + { "1.2.", STATUS_INVALID_PARAMETER, 4, { -1 } }, + { "1..2", STATUS_INVALID_PARAMETER, 3, { -1 } }, + { "1...2", STATUS_INVALID_PARAMETER, 3, { -1 } }, + { "1.2.3", STATUS_SUCCESS, 5, { 1, 2, 0, 3 }, strict_diff_4, + STATUS_INVALID_PARAMETER, 5, { -1 } }, + { "1.2.3.", STATUS_INVALID_PARAMETER, 6, { -1 } }, { "203569230", STATUS_SUCCESS, 9, { 12, 34, 56, 78 }, strict_diff_4, STATUS_INVALID_PARAMETER, 9, { -1 } }, { "1.223756", STATUS_SUCCESS, 8, { 1, 3, 106, 12 }, strict_diff_4, STATUS_INVALID_PARAMETER, 8, { -1 } }, { "3.4.756", STATUS_SUCCESS, 7, { 3, 4, 2, 244 }, strict_diff_4, STATUS_INVALID_PARAMETER, 7, { -1 } }, + { "756.3.4", STATUS_INVALID_PARAMETER, 7, { -1 } }, + { "3.756.4", STATUS_INVALID_PARAMETER, 7, { -1 } }, { "3.4.756.1", STATUS_INVALID_PARAMETER, 9, { -1 } }, { "3.4.65536", STATUS_INVALID_PARAMETER, 9, { -1 } }, { "3.4.5.6.7", STATUS_INVALID_PARAMETER, 7, { -1 } }, @@ -1233,9 +1244,27 @@ static struct { ".1", STATUS_INVALID_PARAMETER, 1, { -1 } }, { ".1.", STATUS_INVALID_PARAMETER, 1, { -1 } }, { ".1.2.3", STATUS_INVALID_PARAMETER, 1, { -1 } }, + { ".1.2.3.4", STATUS_INVALID_PARAMETER, 1, { -1 } }, { "0.1.2.3", STATUS_SUCCESS, 7, { 0, 1, 2, 3 } }, { "0.1.2.3.", STATUS_INVALID_PARAMETER, 7, { -1 } }, { "[0.1.2.3]", STATUS_INVALID_PARAMETER, 0, { -1 } }, + { "0x00010203", STATUS_SUCCESS, 10, { 0, 1, 2, 3 }, strict_diff_4, + STATUS_INVALID_PARAMETER, 2, { -1 } }, + { "0X00010203", STATUS_SUCCESS, 10, { 0, 1, 2, 3 }, strict_diff_4, + STATUS_INVALID_PARAMETER, 2, { -1 } }, + { "0x1234", STATUS_SUCCESS, 6, { 0, 0, 18, 52 }, strict_diff_4, + STATUS_INVALID_PARAMETER, 2, { -1 } }, + { "0x123456789", STATUS_SUCCESS, 11, { 35, 69, 103, 137 }, strict_diff_4, + STATUS_INVALID_PARAMETER, 2, { -1 } }, + { "0x00010Q03", STATUS_SUCCESS, 7, { 0, 0, 0, 16 }, strict_diff_4 | ex_fail_4, + STATUS_INVALID_PARAMETER, 2, { -1 } }, + { "x00010203", STATUS_INVALID_PARAMETER, 0, { -1 } }, + { "1234BEEF", STATUS_SUCCESS, 4, { 0, 0, 4, 210 }, strict_diff_4 | ex_fail_4, + STATUS_INVALID_PARAMETER, 4, { -1 } }, + { "017700000001", STATUS_SUCCESS, 12, { 127, 0, 0, 1 }, strict_diff_4, + STATUS_INVALID_PARAMETER, 1, { -1 } }, + { "0777", STATUS_SUCCESS, 4, { 0, 0, 1, 255 }, strict_diff_4, + STATUS_INVALID_PARAMETER, 1, { -1 } }, { "::1", STATUS_INVALID_PARAMETER, 0, { -1 } }, { ":1", STATUS_INVALID_PARAMETER, 0, { -1 } }, }; -- 2.23.0

3 9

[PATCH] ucrtbase: Add _o__mbstrlen.
by Gijs Vermeulen 23 Aug '19

23 Aug '19

Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> --- Required by BeamNG.drive. .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 1d5e2f84c8..7e2717c44a 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -613,7 +613,7 @@ @ stub _o__mbstok_s_l @ stub _o__mbstowcs_l @ stub _o__mbstowcs_s_l -@ stub _o__mbstrlen +@ cdecl _o__mbstrlen(str) ucrtbase._o__mbstrlen @ stub _o__mbstrlen_l @ stub _o__mbstrnlen @ stub _o__mbstrnlen_l diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 070f0d607c..0d7616c45c 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1277,7 +1277,7 @@ @ stub _o__mbstok_s_l @ stub _o__mbstowcs_l @ stub _o__mbstowcs_s_l -@ stub _o__mbstrlen +@ cdecl _o__mbstrlen(str) _mbstrlen @ stub _o__mbstrlen_l @ stub _o__mbstrnlen @ stub _o__mbstrnlen_l -- 2.23.0

2 1

[PATCH] mscoree/tests: mark tests as todo_wine if mono is not available on the current platform
by Austin English 23 Aug '19

23 Aug '19

This allows the tests to pass for me both on arm64 and x86. Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/mscoree/tests/metahost.c | 14 ++++++++--- dlls/mscoree/tests/mscoree.c | 46 ++++++++++++++++++++--------------- 2 files changed, 37 insertions(+), 23 deletions(-) diff --git a/dlls/mscoree/tests/metahost.c b/dlls/mscoree/tests/metahost.c index fd97361a01..d3dce9e7c1 100644 --- a/dlls/mscoree/tests/metahost.c +++ b/dlls/mscoree/tests/metahost.c @@ -29,6 +29,12 @@ #include "metahost.h" #include "wine/test.h" +#if !defined(__i386__) && !defined(__x86_64__) +static int has_mono = 0; +#else +static int has_mono = 1; +#endif + static HMODULE hmscoree; static HRESULT (WINAPI *pCLRCreateInstance)(REFCLSID clsid, REFIID riid, LPVOID *ppInterface); @@ -210,10 +216,12 @@ static void test_notification_cb(void) expect_runtime_tid = GetCurrentThreadId(); hr = ICLRRuntimeInfo_GetInterface(info, &CLSID_CLRRuntimeHost, &IID_ICLRRuntimeHost, (void**)&host); - ok(hr == S_OK, "GetInterface returned %x\n", hr); - ok(expect_runtime_tid == 0, "notification_callback was not called\n"); - ICLRRuntimeHost_Release(host); + todo_wine_if(!has_mono) ok(hr == S_OK, "GetInterface returned %x\n", hr); + todo_wine if(!has_mono) ok(expect_runtime_tid == 0, "notification_callback was not called\n"); + + if(has_mono) + ICLRRuntimeHost_Release(host); ICLRRuntimeInfo_Release(info); } diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index bb2a17046b..3ec5f09511 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -28,6 +28,12 @@ #include "initguid.h" #include "wine/test.h" +#if !defined(__i386__) && !defined(__x86_64__) +static int has_mono = 0; +#else +static int has_mono = 1; +#endif + DEFINE_GUID(IID__AppDomain, 0x05f696dc,0x2b29,0x3663,0xad,0x8b,0xc4,0x38,0x9c,0xf2,0xa7,0x13); static const WCHAR v4_0[] = {'v','4','.','0','.','3','0','3','1','9',0}; @@ -106,7 +112,7 @@ static int check_runtime(void) hr = ICLRRuntimeInfo_GetInterface(runtimeinfo, &CLSID_CorRuntimeHost, &IID_ICorRuntimeHost, (void **)&runtimehost); - ok(SUCCEEDED(hr), "ICLRRuntimeInfo::GetInterface failed, hr=%#.8x\n", hr); + todo_wine_if(!has_mono) ok(SUCCEEDED(hr), "ICLRRuntimeInfo::GetInterface failed, hr=%#.8x\n", hr); if (FAILED(hr)) return 1; @@ -157,7 +163,7 @@ static BOOL runtime_is_usable(void) if (!ret || exitcode != 0) { - win_skip(".NET 4.0 runtime is not usable\n"); + todo_wine_if(!has_mono) win_skip(".NET 4.0 runtime is not usable\n"); return FALSE; } @@ -200,14 +206,14 @@ static void test_versioninfo(void) trace("latest installed .net runtime: %s\n", wine_dbgstr_w(version)); hr = pGetCORSystemDirectory(path, MAX_PATH , &size); - ok(hr == S_OK, "GetCORSystemDirectory returned %08x\n", hr); + todo_wine_if(!has_mono) ok(hr == S_OK, "GetCORSystemDirectory returned %08x\n", hr); /* size includes terminating null-character */ - ok(size == (lstrlenW(path) + 1),"size is %d instead of %d\n", size, (lstrlenW(path) + 1)); + todo_wine_if(!has_mono) ok(size == (lstrlenW(path) + 1),"size is %d instead of %d\n", size, (lstrlenW(path) + 1)); path_len = size; hr = pGetCORSystemDirectory(path, path_len-1 , &size); - ok(hr == E_NOT_SUFFICIENT_BUFFER, "GetCORSystemDirectory returned %08x\n", hr); + todo_wine_if(!has_mono) ok(hr == E_NOT_SUFFICIENT_BUFFER, "GetCORSystemDirectory returned %08x\n", hr); if (0) /* crashes on <= w2k3 */ { @@ -225,11 +231,11 @@ static void test_versioninfo(void) if(hr == CLR_E_SHIM_RUNTIME) return; /* skipping rest of tests on win2k as .net 2.0 not installed */ - ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); trace(" installed in directory %s is .net version %s\n", wine_dbgstr_w(path), wine_dbgstr_w(version)); hr = pGetRequestedRuntimeInfo( NULL, v1_1, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, &size); - ok(hr == S_OK || hr == CLR_E_SHIM_RUNTIME /*v1_1 not installed*/, "GetRequestedRuntimeInfo returned %08x\n", hr); + todo_wine_if(!has_mono) ok(hr == S_OK || hr == CLR_E_SHIM_RUNTIME /*v1_1 not installed*/, "GetRequestedRuntimeInfo returned %08x\n", hr); if(hr == S_OK) trace(" installed in directory %s is .net version %s\n", wine_dbgstr_w(path), wine_dbgstr_w(version)); /* version number NULL not allowed without RUNTIME_INFO_UPGRADE_VERSION flag */ @@ -237,31 +243,31 @@ static void test_versioninfo(void) ok(hr == CLR_E_SHIM_RUNTIME, "GetRequestedRuntimeInfo returned %08x\n", hr); /* with RUNTIME_INFO_UPGRADE_VERSION flag and version number NULL, latest installed version is returned */ hr = pGetRequestedRuntimeInfo( NULL, NULL, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, &size); - ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, path, 1, &path_len, version, MAX_PATH, &size); - ok(hr == E_NOT_SUFFICIENT_BUFFER, "GetRequestedRuntimeInfo returned %08x\n", hr); + todo_wine_if(!has_mono) ok(hr == E_NOT_SUFFICIENT_BUFFER, "GetRequestedRuntimeInfo returned %08x\n", hr); /* if one of the buffers is NULL, the other one is still happily filled */ memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, NULL, MAX_PATH, &path_len, version, MAX_PATH, &size); - ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); /* With NULL-pointer for bufferlength, the buffer itself still gets filled with correct string */ memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); - ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v2_0cap, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); - ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); ok(!winetest_strcmpW(version, v2_0cap), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0cap)); /* Invalid Version and RUNTIME_INFO_UPGRADE_VERSION flag*/ memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v1_1, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); - ok(hr == S_OK || hr == CLR_E_SHIM_RUNTIME , "GetRequestedRuntimeInfo returned %08x\n", hr); + todo_wine_if(!has_mono) ok(hr == S_OK || hr == CLR_E_SHIM_RUNTIME , "GetRequestedRuntimeInfo returned %08x\n", hr); if(hr == S_OK) { /* .NET 1.1 may not be installed. */ @@ -280,7 +286,7 @@ static void test_versioninfo(void) memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v1_1_0, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); - ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); memset(version, 0, sizeof(version)); @@ -289,7 +295,7 @@ static void test_versioninfo(void) memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v2_0_0, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); - ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); hr = pCorIsLatestSvc(NULL, NULL); @@ -325,7 +331,7 @@ static void test_loadlibraryshim(void) GetModuleFileNameA(hdll, dllpath, MAX_PATH); - ok(StrStrIA(dllpath, "v1.1.4322") != 0, "incorrect fusion.dll path %s\n", dllpath); + todo_wine_if(!has_mono) ok(StrStrIA(dllpath, "v1.1.4322") != 0, "incorrect fusion.dll path %s\n", dllpath); ok(StrStrIA(dllpath, "fusion.dll") != 0, "incorrect fusion.dll path %s\n", dllpath); FreeLibrary(hdll); @@ -339,7 +345,7 @@ static void test_loadlibraryshim(void) GetModuleFileNameA(hdll, dllpath, MAX_PATH); - ok(StrStrIA(dllpath, "v2.0.50727") != 0, "incorrect fusion.dll path %s\n", dllpath); + todo_wine_if(!has_mono) ok(StrStrIA(dllpath, "v2.0.50727") != 0, "incorrect fusion.dll path %s\n", dllpath); ok(StrStrIA(dllpath, "fusion.dll") != 0, "incorrect fusion.dll path %s\n", dllpath); FreeLibrary(hdll); @@ -355,7 +361,7 @@ static void test_loadlibraryshim(void) GetModuleFileNameA(hdll, dllpath, MAX_PATH); - ok(StrStrIA(dllpath, "v4.0.30319") != 0, "incorrect fusion.dll path %s\n", dllpath); + todo_wine_if(!has_mono) ok(StrStrIA(dllpath, "v4.0.30319") != 0, "incorrect fusion.dll path %s\n", dllpath); ok(StrStrIA(dllpath, "fusion.dll") != 0, "incorrect fusion.dll path %s\n", dllpath); FreeLibrary(hdll); @@ -375,7 +381,7 @@ static void test_loadlibraryshim(void) GetModuleFileNameA(hdll, dllpath, MAX_PATH); if (latest) - ok(StrStrIA(dllpath, latestA) != 0, "incorrect fusion.dll path %s\n", dllpath); + todo_wine_if(!has_mono) ok(StrStrIA(dllpath, latestA) != 0, "incorrect fusion.dll path %s\n", dllpath); ok(StrStrIA(dllpath, "fusion.dll") != 0, "incorrect fusion.dll path %s\n", dllpath); FreeLibrary(hdll); @@ -388,7 +394,7 @@ static void test_loadlibraryshim(void) GetModuleFileNameA(hdll, dllpath, MAX_PATH); if (latest) - ok(StrStrIA(dllpath, latestA) != 0, "incorrect fusion.dll path %s\n", dllpath); + todo_wine_if(!has_mono) ok(StrStrIA(dllpath, latestA) != 0, "incorrect fusion.dll path %s\n", dllpath); ok(StrStrIA(dllpath, "fusion.dll") != 0, "incorrect fusion.dll path %s\n", dllpath); FreeLibrary(hdll); -- 2.21.0

2 1

[PATCH v2] winex11.drv: Don't set the foreground for focus events that are older than the last SetFocus sent without an event.
by Gabriel Ivăncescu 23 Aug '19

23 Aug '19

When creating a visible window, the focus and the respective messages are immediately sent to the created window to match Windows behavior. However, the X11 server also sends either FocusIn events or the WM sends ClientMessages with the WM_TAKE_FOCUS atom (by default) if the windows are managed, since it received focus. If the application didn't have a message loop up to process these events, they will remain in the queue. If only one window is created, this is not a problem because the focus set manually and the focus set when processing the events will be the same and no message is sent. However, if 2 or more windows are created before the message loop, when these events are later processed by the app's message loop, they will change the focus and send the messages again, even though we've already done so earlier, which confuses some apps at this point. One example is Heroes of Might and Magic 5. See comment #11 on https://bugs.winehq.org/show_bug.cgi?id=39742#c11 -- `When "Full screen" active game starts and then shows desktop but it is not exited and after a few times switching game/desktop it shows game screen and it is playable` Related Proton bug: https://github.com/ValveSoftware/Proton/issues/2401 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Testing reveals that the bug in question is not affected by the changes with focus_out, so all seems to be good. Note that set_focus has to unconditionally (regardless of serial) set the focus with XSetInputFocus since it's handled in WM_TAKE_FOCUS. The X server will take care of old focus events and sort them out itself using the time. We just have to stop sending the respective focus messages (i.e. SetForegroundWindow) and keep the current foreground window because it was set by a "later" SetFocus. dlls/winex11.drv/event.c | 48 ++++++++++++++++++++++++++++++++------- dlls/winex11.drv/x11drv.h | 2 ++ 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index edeae7c..f3f158b 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -591,14 +591,22 @@ static void set_input_focus( struct x11drv_win_data *data ) /********************************************************************** * set_focus */ -static void set_focus( Display *display, HWND hwnd, Time time ) +static void set_focus( Display *display, HWND hwnd, Time time, unsigned long serial ) { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); HWND focus; Window win; GUITHREADINFO threadinfo; - TRACE( "setting foreground window to %p\n", hwnd ); - SetForegroundWindow( hwnd ); + if ((long)(thread_data->setfocus_serial - serial) > 0) + { + TRACE( "ignoring old serial %lu/%lu\n", serial, thread_data->setfocus_serial ); + } + else + { + TRACE( "setting foreground window to %p\n", hwnd ); + SetForegroundWindow( hwnd ); + } threadinfo.cbSize = sizeof(threadinfo); GetGUIThreadInfo(0, &threadinfo); @@ -706,7 +714,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) MAKELONG(HTCAPTION,WM_LBUTTONDOWN) ); if (ma != MA_NOACTIVATEANDEAT && ma != MA_NOACTIVATE) { - set_focus( event->display, hwnd, event_time ); + set_focus( event->display, hwnd, event_time, event->serial ); return; } } @@ -715,7 +723,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) hwnd = GetForegroundWindow(); if (!hwnd) hwnd = last_focus; if (!hwnd) hwnd = GetDesktopWindow(); - set_focus( event->display, hwnd, event_time ); + set_focus( event->display, hwnd, event_time, event->serial ); return; } /* try to find some other window to give the focus to */ @@ -723,7 +731,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) if (hwnd) hwnd = GetAncestor( hwnd, GA_ROOT ); if (!hwnd) hwnd = GetActiveWindow(); if (!hwnd) hwnd = last_focus; - if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, event_time ); + if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, event_time, event->serial ); } else if (protocol == x11drv_atom(_NET_WM_PING)) { @@ -785,9 +793,17 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) if (hwnd) hwnd = GetAncestor( hwnd, GA_ROOT ); if (!hwnd) hwnd = GetActiveWindow(); if (!hwnd) hwnd = x11drv_thread_data()->last_focus; - if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, CurrentTime ); + if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, CurrentTime, event->serial ); + } + else + { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + + if ((long)(thread_data->setfocus_serial - event->serial) > 0) + TRACE("ignoring old serial %lu/%lu\n", event->serial, thread_data->setfocus_serial); + else + SetForegroundWindow( hwnd ); } - else SetForegroundWindow( hwnd ); return TRUE; } @@ -1385,6 +1401,7 @@ void wait_for_withdrawn_state( HWND hwnd, BOOL set ) */ void CDECL X11DRV_SetFocus( HWND hwnd ) { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); struct x11drv_win_data *data; HWND parent; @@ -1400,6 +1417,21 @@ void CDECL X11DRV_SetFocus( HWND hwnd ) } if (!data->managed || data->embedder) set_input_focus( data ); release_win_data( data ); + + hwnd = GetAncestor(hwnd, GA_ROOT); + if (hwnd != thread_data->setfocus_hwnd) + { + thread_data->setfocus_hwnd = hwnd; + + /* If we are not processing an event, store the current serial after syncing + with the X server, so that we ignore all older focus-related events. This + prevents focus being reverted later when the app processes its messages. */ + if (!thread_data->current_event) + { + XSync(thread_data->display, False); + thread_data->setfocus_serial = LastKnownRequestProcessed(thread_data->display) + 1; + } + } } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 0d3695b..edb7292 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -330,6 +330,8 @@ struct x11drv_thread_data HWND last_xic_hwnd; /* last xic window */ XFontSet font_set; /* international text drawing font set */ Window selection_wnd; /* window used for selection interactions */ + HWND setfocus_hwnd; /* top-level window corresponding to the last SetFocus */ + unsigned long setfocus_serial; /* serial number when last SetFocus without an event happened */ unsigned long warp_serial; /* serial number of last pointer warp request */ Window clip_window; /* window used for cursor clipping */ HWND clip_hwnd; /* message window stored in desktop while clipping is active */ -- 2.21.0

2 1