July 2022 - Wine-Commits - list.winehq.org

Zebediah Figura : ws2_32/tests: Add some tests for connecting a UDP socket.
by Alexandre Julliard July 19, 2022

July 19, 2022

Module: wine Branch: master Commit: 6a59b1a521e3f9201e35143e4d7b7afed804110c URL: https://gitlab.winehq.org/wine/wine/-/commit/6a59b1a521e3f9201e35143e4d7b7a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 29 13:10:13 2022 -0500 ws2_32/tests: Add some tests for connecting a UDP socket. --- dlls/ws2_32/tests/sock.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 685a2348666..184285927b5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -13049,6 +13049,91 @@ static void test_connect_time(void) closesocket(client); } +static void test_connect_udp(void) +{ + const struct sockaddr_in bind_addr = {.sin_family = AF_INET, .sin_addr.s_addr = htonl(INADDR_LOOPBACK)}; + struct sockaddr_in addr, ret_addr; + SOCKET client, server; + char buffer[5]; + int ret, len; + + client = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + server = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + set_blocking(client, FALSE); + set_blocking(server, FALSE); + + SetLastError(0xdeadbeef); + ret = send(client, "data", 4, 0); + ok(ret == -1, "got %d\n", ret); + todo_wine ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = recv(server, buffer, sizeof(buffer), 0); + ok(ret == -1, "got %d\n", ret); + todo_wine ok(GetLastError() == WSAEINVAL, "got error %lu\n", GetLastError()); + + ret = bind(server, (const struct sockaddr *)&bind_addr, sizeof(bind_addr)); + ok(!ret, "got error %lu\n", GetLastError()); + len = sizeof(addr); + ret = getsockname(server, (struct sockaddr *)&addr, &len); + ok(!ret, "got error %lu\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = recv(server, buffer, sizeof(buffer), 0); + ok(ret == -1, "got %d\n", ret); + ok(GetLastError() == WSAEWOULDBLOCK, "got error %lu\n", GetLastError()); + + ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "got error %lu\n", GetLastError()); + ret = getpeername(client, (struct sockaddr *)&ret_addr, &len); + ok(!ret, "got error %lu\n", GetLastError()); + ok(!memcmp(&ret_addr, &addr, sizeof(addr)), "addresses didn't match\n"); + + ret = getsockname(client, (struct sockaddr *)&ret_addr, &len); + ok(!ret, "got error %lu\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = getpeername(server, (struct sockaddr *)&ret_addr, &len); + ok(ret == -1, "got %d\n", ret); + ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError()); + + ret = send(client, "data", 4, 0); + ok(ret == 4, "got %d\n", ret); + + memset(buffer, 0xcc, sizeof(buffer)); + ret = recv(server, buffer, sizeof(buffer), 0); + ok(ret == 4, "got %d\n", ret); + ok(!memcmp(buffer, "data", 4), "got %s\n", debugstr_an(buffer, ret)); + + SetLastError(0xdeadbeef); + ret = recv(server, buffer, sizeof(buffer), 0); + ok(ret == -1, "got %d\n", ret); + ok(GetLastError() == WSAEWOULDBLOCK, "got error %lu\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = send(server, "data", 4, 0); + ok(ret == -1, "got %d\n", ret); + todo_wine ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError()); + + ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); + todo_wine ok(!ret, "got error %lu\n", GetLastError()); + ++addr.sin_port; + ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); + todo_wine ok(!ret, "got error %lu\n", GetLastError()); + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_UNSPEC; + ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); + todo_wine ok(!ret, "got error %lu\n", GetLastError()); + + ret = getpeername(client, (struct sockaddr *)&ret_addr, &len); + todo_wine ok(ret == -1, "got %d\n", ret); + todo_wine ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError()); + + closesocket(server); + closesocket(client); +} + START_TEST( sock ) { int i; @@ -13127,6 +13212,7 @@ START_TEST( sock ) test_timeout(); test_tcp_reset(); test_icmp(); + test_connect_udp(); /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send();

1 0

Connor McAdams : uiautomationcore: Implement UiaLookupId for AutomationIdentifierType_Property GUIDs.
by Alexandre Julliard July 19, 2022

July 19, 2022

Module: wine Branch: master Commit: 3fc9493f42a0fca6138fe3778af6cc47e89cc308 URL: https://gitlab.winehq.org/wine/wine/-/commit/3fc9493f42a0fca6138fe3778af6cc… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Jun 1 11:36:18 2022 -0400 uiautomationcore: Implement UiaLookupId for AutomationIdentifierType_Property GUIDs. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/Makefile.in | 1 + dlls/uiautomationcore/tests/uiautomation.c | 206 ++++++++++++++++++++++ dlls/uiautomationcore/uia_ids.c | 270 +++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_main.c | 9 - 4 files changed, 477 insertions(+), 9 deletions(-)

1 0

Connor McAdams : uiautomationcore: Implement UiaNodeFromProvider.
by Alexandre Julliard July 19, 2022

July 19, 2022

Module: wine Branch: master Commit: ab4a0017e624367d7d0826872290b76bb8f9535a URL: https://gitlab.winehq.org/wine/wine/-/commit/ab4a0017e624367d7d0826872290b7… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jun 13 16:37:11 2022 -0400 uiautomationcore: Implement UiaNodeFromProvider. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/Makefile.in | 4 + dlls/uiautomationcore/tests/uiautomation.c | 886 ++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_classes.idl | 30 + dlls/uiautomationcore/uia_client.c | 126 ++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 1 + 6 files changed, 1048 insertions(+), 1 deletion(-)

1 0

Connor McAdams : uiautomationcore: Add stub UiaGetPropertyValue implementation.
by Alexandre Julliard July 19, 2022

July 19, 2022

Module: wine Branch: master Commit: 7840615361c781b9e70f870226fefcc78eb4e424 URL: https://gitlab.winehq.org/wine/wine/-/commit/7840615361c781b9e70f870226fefc… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Jul 8 12:46:10 2022 -0400 uiautomationcore: Add stub UiaGetPropertyValue implementation. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_main.c | 9 +++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 63e1079582a..c74d3edbf07 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -359,3 +359,12 @@ HRESULT WINAPI UiaDisconnectProvider(IRawElementProviderSimple *provider) FIXME("(%p): stub\n", provider); return E_NOTIMPL; } + +/*********************************************************************** + * UiaGetPropertyValue (uiautomationcore.@) + */ +HRESULT WINAPI UiaGetPropertyValue(HUIANODE huianode, PROPERTYID prop_id, VARIANT *out_val) +{ + FIXME("(%p, %d, %p): stub\n", huianode, prop_id, out_val); + return E_NOTIMPL; +} diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 70d78d52085..ed3453a2f68 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -62,7 +62,7 @@ @ stub UiaFind @ stub UiaGetErrorDescription @ stub UiaGetPatternProvider -@ stub UiaGetPropertyValue +@ stdcall UiaGetPropertyValue(ptr long ptr) @ stdcall UiaGetReservedMixedAttributeValue(ptr) @ stdcall UiaGetReservedNotSupportedValue(ptr) @ stub UiaGetRootNode diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index c68419caaa1..6cb5b5c37f5 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -255,6 +255,7 @@ LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lPar BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj); HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **elprov); HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, long child_id, DWORD flags, IRawElementProviderSimple **elprov); +HRESULT WINAPI UiaGetPropertyValue(HUIANODE huianode, PROPERTYID prop_id, VARIANT *out_val); #ifdef __cplusplus }

1 0

Connor McAdams : include: Define UI Automation Property GUIDs.
by Alexandre Julliard July 19, 2022

July 19, 2022

Module: wine Branch: master Commit: 4d12d83d4789b270f6d0ed996e59074eb4ccba6b URL: https://gitlab.winehq.org/wine/wine/-/commit/4d12d83d4789b270f6d0ed996e5907… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Nov 8 12:43:28 2021 -0500 include: Define UI Automation Property GUIDs. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- include/uiautomationcoreapi.h | 180 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 180 insertions(+)

1 0

Connor McAdams : uiautomationcore: Implement UiaNodeRelease.
by Alexandre Julliard July 19, 2022

July 19, 2022

Module: wine Branch: master Commit: bc584afad9e27159214948b5a283d809832d436c URL: https://gitlab.winehq.org/wine/wine/-/commit/bc584afad9e27159214948b5a283d8… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Jun 14 12:49:20 2022 -0400 uiautomationcore: Implement UiaNodeRelease. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 13 ++++++------- dlls/uiautomationcore/uia_client.c | 24 ++++++++++++++++++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 1 + 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 35b7e738bd4..677933765a9 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -3597,8 +3597,7 @@ static void test_UiaNodeFromProvider(void) ref = IUnknown_AddRef((IUnknown *)node); ok(ref == 3, "Unexpected refcnt %ld\n", ref); - ref = IUnknown_Release((IUnknown *)node); - ok(ref == 2, "Unexpected refcnt %ld\n", ref); + ok(UiaNodeRelease(node), "UiaNodeRelease returned FALSE\n"); ref = IUnknown_Release((IUnknown *)node); ok(ref == 1, "Unexpected refcnt %ld\n", ref); @@ -3626,7 +3625,7 @@ static void test_UiaNodeFromProvider(void) } ok_method_sequence(node_from_prov3, "node_from_prov3"); - IUnknown_Release((IUnknown *)node); + ok(UiaNodeRelease(node), "UiaNodeRelease returned FALSE\n"); ok(Provider_child.ref == 1, "Unexpected refcnt %ld\n", Provider_child.ref); /* HWND exposed, but Provider2 not returned from WM_GETOBJECT. */ @@ -3668,7 +3667,7 @@ static void test_UiaNodeFromProvider(void) ok_method_sequence(node_from_prov4, "node_from_prov4"); ok(!!node, "node == NULL\n"); - IUnknown_Release((IUnknown *)node); + ok(UiaNodeRelease(node), "UiaNodeRelease returned FALSE\n"); ok(Provider.ref == 1, "Unexpected refcnt %ld\n", Provider.ref); /* Return Provider2 in response to WM_GETOBJECT. */ @@ -3713,7 +3712,7 @@ static void test_UiaNodeFromProvider(void) ok_method_sequence(node_from_prov5, "node_from_prov5"); - IUnknown_Release((IUnknown *)node); + ok(UiaNodeRelease(node), "UiaNodeRelease returned FALSE\n"); ok(Provider.ref == 1, "Unexpected refcnt %ld\n", Provider.ref); ok(Provider2.ref == 1, "Unexpected refcnt %ld\n", Provider2.ref); @@ -3749,7 +3748,7 @@ static void test_UiaNodeFromProvider(void) ok(Provider.ref == 2, "Unexpected refcnt %ld\n", Provider.ref); ok(!!node, "node == NULL\n"); - IUnknown_Release((IUnknown *)node); + ok(UiaNodeRelease(node), "UiaNodeRelease returned FALSE\n"); ok(Provider.ref == 1, "Unexpected refcnt %ld\n", Provider.ref); ok(Provider2.ref == 1, "Unexpected refcnt %ld\n", Provider2.ref); @@ -3783,7 +3782,7 @@ static void test_UiaNodeFromProvider(void) ok(Provider_child.ref == 2, "Unexpected refcnt %ld\n", Provider.ref); ok(!!node, "node == NULL\n"); - IUnknown_Release((IUnknown *)node); + ok(UiaNodeRelease(node), "UiaNodeRelease returned FALSE\n"); ok(Provider_child.ref == 1, "Unexpected refcnt %ld\n", Provider.ref); ok(Provider2.ref == 1, "Unexpected refcnt %ld\n", Provider2.ref); diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index c82064fbe34..58b9bc07a79 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -84,6 +84,14 @@ static const IWineUiaNodeVtbl uia_node_vtbl = { uia_node_Release, }; +static struct uia_node *unsafe_impl_from_IWineUiaNode(IWineUiaNode *iface) +{ + if (!iface || (iface->lpVtbl != &uia_node_vtbl)) + return NULL; + + return CONTAINING_RECORD(iface, struct uia_node, IWineUiaNode_iface); +} + /*********************************************************************** * UiaNodeFromProvider (uiautomationcore.@) */ @@ -124,3 +132,19 @@ HRESULT WINAPI UiaNodeFromProvider(IRawElementProviderSimple *elprov, HUIANODE * return hr; } + +/*********************************************************************** + * UiaNodeRelease (uiautomationcore.@) + */ +BOOL WINAPI UiaNodeRelease(HUIANODE huianode) +{ + struct uia_node *node = unsafe_impl_from_IWineUiaNode((IWineUiaNode *)huianode); + + TRACE("(%p)\n", huianode); + + if (!node) + return FALSE; + + IWineUiaNode_Release(&node->IWineUiaNode_iface); + return TRUE; +} diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 887741fa43b..4315abf7433 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -80,7 +80,7 @@ @ stub UiaNodeFromHandle @ stub UiaNodeFromPoint @ stdcall UiaNodeFromProvider(ptr ptr) -@ stub UiaNodeRelease +@ stdcall UiaNodeRelease(ptr) @ stub UiaPatternRelease #@ stub UiaProviderForNonClient @ stdcall UiaProviderFromIAccessible(ptr long long ptr) diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 353547c4ad6..e74271007fe 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -257,6 +257,7 @@ HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **el HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, long child_id, DWORD flags, IRawElementProviderSimple **elprov); HRESULT WINAPI UiaGetPropertyValue(HUIANODE huianode, PROPERTYID prop_id, VARIANT *out_val); HRESULT WINAPI UiaNodeFromProvider(IRawElementProviderSimple *elprov, HUIANODE *huianode); +BOOL WINAPI UiaNodeRelease(HUIANODE huianode); #ifdef __cplusplus }

1 0

Jeremy White : gitlab: Add RUNNER_INTERVAL and RUNNER_COMMAND settings.
by Alexandre Julliard July 19, 2022

July 19, 2022

Module: tools Branch: master Commit: 0b7251ba3119e1cf324eee4bab1fd72fa356331b URL: https://gitlab.winehq.org/winehq/tools/-/commit/0b7251ba3119e1cf324eee4bab1… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Jul 19 08:53:55 2022 -0500 gitlab: Add RUNNER_INTERVAL and RUNNER_COMMAND settings. --- gitlab/gitlab-to-mail/example.cfg | 4 ++++ gitlab/gitlab-to-mail/util.py | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gitlab/gitlab-to-mail/example.cfg b/gitlab/gitlab-to-mail/example.cfg index a0fc59d1..a4e4f238 100644 --- a/gitlab/gitlab-to-mail/example.cfg +++ b/gitlab/gitlab-to-mail/example.cfg @@ -37,3 +37,7 @@ INITIAL_BACKLOG_DAYS = 5 # How many patches to allow MAXIMUM_PATCHES = 50 + +# Configure runner.py behavior. A minimum delay of 30 seconds is enforced. +RUNNER_COMMAND = ./gitlabtomail.py +RUNNER_INTERVAL = 300 diff --git a/gitlab/gitlab-to-mail/util.py b/gitlab/gitlab-to-mail/util.py index 629b20c0..231e8e21 100644 --- a/gitlab/gitlab-to-mail/util.py +++ b/gitlab/gitlab-to-mail/util.py @@ -31,7 +31,7 @@ class Settings: for s in ['DATABASE', 'GITLAB_TOKEN', 'GITLAB_URL', 'GITLAB_PROJECT_NAME', 'BRIDGE_FROM_EMAIL', 'BRIDGE_TO_EMAIL', 'BRIDGE_TAG', - 'SMTP_DOMAIN', 'SMTP_USER', 'SMTP_PASSWORD']: + 'SMTP_DOMAIN', 'SMTP_USER', 'SMTP_PASSWORD', 'RUNNER_COMMAND']: if s in self.cp['settings']: self.__dict__[s] = self.cp['settings'][s].strip('"') else: @@ -43,7 +43,8 @@ class Settings: else: self.__dict__[s] = None - for s in ['GITLAB_PROJECT_ID', 'SMTP_PORT', 'INITIAL_BACKLOG_DAYS', 'MAXIMUM_PATCHES']: + for s in ['GITLAB_PROJECT_ID', 'SMTP_PORT', 'INITIAL_BACKLOG_DAYS', + 'MAXIMUM_PATCHES', 'RUNNER_INTERVAL']: if s in self.cp['settings']: self.__dict__[s] = self.cp['settings'].getint(s) else:

1 0

Jeremy White : gitlab: Drop the webhook from the runner.
by Alexandre Julliard July 19, 2022

July 19, 2022

Module: tools Branch: master Commit: bed715a52443603d3425474489bb9f5d00849cd9 URL: https://gitlab.winehq.org/winehq/tools/-/commit/bed715a52443603d3425474489b… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Jul 19 08:54:14 2022 -0500 gitlab: Drop the webhook from the runner. Let's just run at periodic intervals. This avoids some issues when multiple requests would come in together and we would try to process too frequently. --- gitlab/gitlab-to-mail/runner.py | 57 +++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/gitlab/gitlab-to-mail/runner.py b/gitlab/gitlab-to-mail/runner.py index 40acb36b..6e62c586 100755 --- a/gitlab/gitlab-to-mail/runner.py +++ b/gitlab/gitlab-to-mail/runner.py @@ -1,46 +1,47 @@ #!/usr/bin/env python3 -# runner: run gitlabtomail.py periodically, or on request +# runner: run gitlabtomail.py periodically +# Historically, we would do this on request, when we had a change +# However, when Alexandre would do a bunch of merges, that process +# could bog down. We choose to instead invoke this with a configurable poll. -from http.server import BaseHTTPRequestHandler, HTTPServer import subprocess import sys import os +import datetime +import time +from util import Settings -NAME = '' -PORT = 8000 -CMD = "./gitlabtomail.py" -ARGV1 = sys.argv[1] -TIMEOUT = 600 # 10 minutes +def usage(): + print(f"Usage:") + print(f" {sys.argv[0]} name-of-cfg-file") + print(f"Will periodically run configured command at configured interval.") -class my_handler(BaseHTTPRequestHandler): - def do_GET(self): - self.send_response(200) - self.send_header("Content-type", "text/html") - self.end_headers() - print("Request: " + self.path) - self.wfile.write(bytes("<html><body></body></html>", "utf-8")) - subprocess.call([ CMD, ARGV1 ]) +if __name__ == "__main__": + if len(sys.argv) != 2: + print("Error: you must supply only the name of a .cfg file.") + usage() + sys.exit(-1) - def do_POST(self): - self.do_GET() - - -if __name__ == "__main__": os.chdir(os.path.dirname(sys.argv[0])) - webServer = HTTPServer((NAME, PORT), my_handler) - webServer.timeout = TIMEOUT - webServer.request_queue_size = 4 - webServer.allow_reuse_address = True - print("Server started http://%s:%s" % (NAME, PORT)) + settings = Settings(sys.argv[1]) + + if not settings.RUNNER_INTERVAL or not settings.RUNNER_COMMAND: + print(f"Error: you must supply RUNNER_INTERVAL and RUNNER_COMMAND in {sys.argv[1]}") + sys.exit(-1) while True: + nextrun = time.time() + settings.RUNNER_INTERVAL + print("{}running {}".format(datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S - '), settings.RUNNER_COMMAND)) + subprocess.call([ settings.RUNNER_COMMAND, sys.argv[1]]) try: - webServer.handle_request() + # Delay a minimum of 30 seconds + delay = nextrun - time.time() + if delay < 30: + delay = 30 + time.sleep(delay) except KeyboardInterrupt: break - subprocess.call([ CMD, ARGV1 ]) - webServer.server_close() print("Server stopped.")

1 0

Jeremy White : gitlab: Catch a common exception while parsing settings.
by Alexandre Julliard July 19, 2022

July 19, 2022

Module: tools Branch: master Commit: e2e5c22854e7ee6fbaaa2e6c321c95f0008a4bef URL: https://gitlab.winehq.org/winehq/tools/-/commit/e2e5c22854e7ee6fbaaa2e6c321… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Jul 19 08:53:33 2022 -0500 gitlab: Catch a common exception while parsing settings. --- gitlab/gitlab-to-mail/util.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gitlab/gitlab-to-mail/util.py b/gitlab/gitlab-to-mail/util.py index aef43c6d..629b20c0 100644 --- a/gitlab/gitlab-to-mail/util.py +++ b/gitlab/gitlab-to-mail/util.py @@ -20,9 +20,15 @@ def fetch_all(url, settings): class Settings: def __init__(self, fname): self.cp = configparser.ConfigParser() - if len(self.cp.read(fname)) == 0: - print(f"Error: invalid configuration in {fname}.", file=sys.stderr) + try: + if len(self.cp.read(fname)) == 0: + print(f"Error: invalid or missing configuration in {fname}.", file=sys.stderr) + sys.exit(1) + except configparser.MissingSectionHeaderError as e: + print(f"Error: missing section header parsing {fname}") + print(e) sys.exit(1) + for s in ['DATABASE', 'GITLAB_TOKEN', 'GITLAB_URL', 'GITLAB_PROJECT_NAME', 'BRIDGE_FROM_EMAIL', 'BRIDGE_TO_EMAIL', 'BRIDGE_TAG', 'SMTP_DOMAIN', 'SMTP_USER', 'SMTP_PASSWORD']:

1 0

Jeremy White : gitlab: Include the content-type header.
by Alexandre Julliard July 19, 2022

July 19, 2022

Module: tools Branch: master Commit: 44e8afd5a74ed722bbd0782c647ec1a9e9d60760 URL: https://gitlab.winehq.org/winehq/tools/-/commit/44e8afd5a74ed722bbd0782c647… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Jul 18 16:52:56 2022 -0500 gitlab: Include the content-type header. Hopefully this will prevent winetestbot from being confused. --- gitlab/gitlab-to-mail/gitlabtomail.py | 1 + 1 file changed, 1 insertion(+) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index 67909567..fca8466c 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -47,6 +47,7 @@ def send_email(message): message['Reply-To'] = settings.BRIDGE_FROM_EMAIL message['To'] = settings.BRIDGE_TO_EMAIL + message['Content-Type'] = 'text/plain; charset=utf-8' encoded_message = message.as_string().encode('utf-8') if settings.DEBUG:

1 0