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

Piotr Caban : msi: Fix component Action for shared components in CostFinalize.
by Alexandre Julliard Aug. 27, 2019

Aug. 27, 2019

Module: wine Branch: master Commit: d95bffdadbf18b91c1bb15cc7132ae3b9f505f98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d95bffdadbf18b91c1bb15cc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 12 16:24:26 2019 +0200 msi: Fix component Action for shared components in CostFinalize. Fixes regression in wow .NET4.6.2 installation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 14 +++++++++++--- dlls/msi/tests/install.c | 27 +++++++++++++++++++++++++-- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e89ac31..55f978c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1972,13 +1972,21 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) component->ActionRequest = INSTALLSTATE_UNKNOWN; } - TRACE("component %s (installed %d request %d action %d)\n", - debugstr_w(component->Component), component->Installed, component->ActionRequest, component->Action); - if (component->Action == INSTALLSTATE_LOCAL || component->Action == INSTALLSTATE_SOURCE) component->num_clients++; else if (component->Action == INSTALLSTATE_ABSENT) + { component->num_clients--; + + if (component->num_clients > 0) + { + TRACE("multiple clients uses %s - disallowing uninstallation\n", debugstr_w(component->Component)); + component->Action = INSTALLSTATE_UNKNOWN; + } + } + + TRACE("component %s (installed %d request %d action %d)\n", + debugstr_w(component->Component), component->Installed, component->ActionRequest, component->Action); } return ERROR_SUCCESS; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index e348f32..1747a44 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1223,7 +1223,9 @@ static const char shc_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" "s72\ti2\tS64\tS0\tS255\n" "CustomAction\tAction\n" - "TestComponentAction\t19\t\twrong component action on install\t\n"; + "TestComponentAction\t19\t\twrong component action on install\t\n" + "TestDisallowedAction\t19\t\twrong component action on disallowed remove\t\n" + "TestRemoveAction\t19\t\twrong component action on remove\t\n"; static const char shc_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" @@ -1233,6 +1235,27 @@ static const char shc_install_exec_seq_dat[] = "CostInitialize\t\t200\n" "FileCost\t\t300\n" "CostFinalize\t\t600\n" + "TestDisallowedAction\tREMOVE AND ($sharedcomponent <> -1)\t700\n" + "InstallValidate\t\t900\n" + "InstallInitialize\t\t1200\n" + "ProcessComponents\t\t1300\n" + "RemoveFiles\t\t1400\n" + "InstallFiles\t\t1500\n" + "TestComponentAction\tNOT REMOVE AND ($sharedcomponent <> 3)\t1600\n" + "RegisterProduct\t\t1700\n" + "PublishFeatures\t\t1800\n" + "PublishProduct\t\t1900\n" + "InstallFinalize\t\t2000\n"; + +static const char shc2_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "LaunchConditions\t\t100\n" + "CostInitialize\t\t200\n" + "FileCost\t\t300\n" + "CostFinalize\t\t600\n" + "TestRemoveAction\tREMOVE AND ($sharedcomponent <> 2)\t700\n" "InstallValidate\t\t900\n" "InstallInitialize\t\t1200\n" "ProcessComponents\t\t1300\n" @@ -1990,7 +2013,7 @@ static const msi_table shc2_tables[] = ADD_TABLE(shc_feature), ADD_TABLE(shc_feature_comp), ADD_TABLE(shc_custom_action), - ADD_TABLE(shc_install_exec_seq), + ADD_TABLE(shc2_install_exec_seq), ADD_TABLE(shc2_property) };

1 0

Zebediah Figura : http.sys: Fill out the request headers.
by Alexandre Julliard Aug. 27, 2019

Aug. 27, 2019

Module: wine Branch: master Commit: 60eb2c597e93d396ef35be6a57ada380e7897737 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60eb2c597e93d396ef35be6a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 26 23:31:20 2019 -0500 http.sys: Fill out the request headers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 198 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 196 insertions(+), 2 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 8c46282..2607af5 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -37,6 +37,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(http); * be consumed; httpapi has no opportunity to massage it. Since it contains * pointers, this is somewhat nontrivial. */ +struct http_unknown_header_32 +{ + USHORT NameLength; + USHORT RawValueLength; + ULONG pName; /* char string */ + ULONG pRawValue; /* char string */ +}; + struct http_request_32 { ULONG Flags; @@ -86,6 +94,14 @@ struct http_request_32 ULONG pRequestInfo; /* NULL (FIXME) */ }; +struct http_unknown_header_64 +{ + USHORT NameLength; + USHORT RawValueLength; + ULONGLONG pName; /* char string */ + ULONGLONG pRawValue; /* char string */ +}; + struct http_request_64 { ULONG Flags; @@ -264,6 +280,76 @@ static int parse_token(const char *str, const char *end) return p - str; } +static HTTP_HEADER_ID parse_header_name(const char *header, int len) +{ + static const char *const headers[] = + { + "Cache-Control", + "Connection", + "Date", + "Keep-Alive", + "Pragma", + "Trailer", + "Transfer-Encoding", + "Upgrade", + "Via", + "Warning", + "Allow", + "Content-Length", + "Content-Type", + "Content-Encoding", + "Content-Language", + "Content-Location", + "Content-MD5", + "Content-Range", + "Expires", + "Last-Modified", + "Accept", + "Accept-Charset", + "Accept-Encoding", + "Accept-Language", + "Authorization", + "Cookie", + "Expect", + "From", + "Host", + "If-Match", + "If-Modified-Since", + "If-None-Match", + "If-Range", + "If-Unmodified-Since", + "Max-Forwards", + "Proxy-Authorization", + "Referer", + "Range", + "TE", + "Translate", + "User-Agent", + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(headers); ++i) + { + if (!strncmp(header, headers[i], len)) + return i; + } + return HttpHeaderRequestMaximum; +} + +static void parse_header(const char *name, int *name_len, const char **value, int *value_len) +{ + const char *p = name; + *name_len = parse_token(name, NULL); + p += *name_len; + while (*p == ' ' || *p == '\t') ++p; + ++p; /* skip colon */ + while (*p == ' ' || *p == '\t') ++p; + *value = p; + while (isprint(*p) || *p == '\t') ++p; + while (isspace(*p)) --p; /* strip trailing LWS */ + *value_len = p - *value + 1; +} + static NTSTATUS complete_irp(struct connection *conn, IRP *irp) { static const WCHAR httpW[] = {'h','t','t','p',':','/','/'}; @@ -273,9 +359,10 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); const DWORD output_len = stack->Parameters.DeviceIoControl.OutputBufferLength; ULONG cooked_len, host_len, abs_path_len, query_len, offset; - const char *p, *host, *abs_path, *query; + const char *p, *name, *value, *host, *abs_path, *query; + USHORT unk_headers_count = 0, unk_header_idx; + int name_len, value_len, len; struct sockaddr_in addr; - int len; TRACE("Completing IRP %p.\n", irp); @@ -314,6 +401,27 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) /* addresses */ irp_size += 2 * sizeof(addr); + /* headers */ + p = strstr(conn->buffer, "\r\n") + 2; + while (memcmp(p, "\r\n", 2)) + { + name = p; + parse_header(name, &name_len, &value, &value_len); + if (parse_header_name(name, name_len) == HttpHeaderRequestMaximum) + { + irp_size += name_len + 1; + ++unk_headers_count; + } + irp_size += value_len + 1; + p = strstr(p, "\r\n") + 2; + } + p += 2; + + if (params.bits == 32) + irp_size += unk_headers_count * sizeof(struct http_unknown_header_32); + else + irp_size += unk_headers_count * sizeof(struct http_unknown_header_64); + TRACE("Need %u bytes, have %u.\n", irp_size, output_len); irp->IoStatus.Information = irp_size; @@ -337,6 +445,7 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) if (params.bits == 32) { struct http_request_32 *req = irp->AssociatedIrp.SystemBuffer; + struct http_unknown_header_32 *unk_headers = NULL; char *buffer = irp->AssociatedIrp.SystemBuffer; offset = sizeof(*req); @@ -393,11 +502,54 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) memcpy(buffer + offset, &addr, sizeof(addr)); offset += sizeof(addr); + req->Headers.UnknownHeaderCount = unk_headers_count; + if (unk_headers_count) + { + req->Headers.pUnknownHeaders = params.addr + offset; + unk_headers = (struct http_unknown_header_32 *)(buffer + offset); + offset += unk_headers_count * sizeof(*unk_headers); + } + + unk_header_idx = 0; + p = strstr(conn->buffer, "\r\n") + 2; + while (memcmp(p, "\r\n", 2)) + { + HTTP_HEADER_ID id; + + name = p; + parse_header(name, &name_len, &value, &value_len); + if ((id = parse_header_name(name, name_len)) == HttpHeaderRequestMaximum) + { + unk_headers[unk_header_idx].NameLength = name_len; + unk_headers[unk_header_idx].RawValueLength = value_len; + unk_headers[unk_header_idx].pName = params.addr + offset; + memcpy(buffer + offset, name, name_len); + offset += name_len; + buffer[offset++] = 0; + unk_headers[unk_header_idx].pRawValue = params.addr + offset; + memcpy(buffer + offset, value, value_len); + offset += value_len; + buffer[offset++] = 0; + ++unk_header_idx; + } + else + { + req->Headers.KnownHeaders[id].RawValueLength = value_len; + req->Headers.KnownHeaders[id].pRawValue = params.addr + offset; + memcpy(buffer + offset, value, value_len); + offset += value_len; + buffer[offset++] = 0; + } + p = strstr(p, "\r\n") + 2; + } + p += 2; + req->BytesReceived = conn->req_len; } else { struct http_request_64 *req = irp->AssociatedIrp.SystemBuffer; + struct http_unknown_header_64 *unk_headers = NULL; char *buffer = irp->AssociatedIrp.SystemBuffer; offset = sizeof(*req); @@ -454,6 +606,48 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) memcpy(buffer + offset, &addr, sizeof(addr)); offset += sizeof(addr); + req->Headers.UnknownHeaderCount = unk_headers_count; + if (unk_headers_count) + { + req->Headers.pUnknownHeaders = params.addr + offset; + unk_headers = (struct http_unknown_header_64 *)(buffer + offset); + offset += unk_headers_count * sizeof(*unk_headers); + } + + unk_header_idx = 0; + p = strstr(conn->buffer, "\r\n") + 2; + while (memcmp(p, "\r\n", 2)) + { + HTTP_HEADER_ID id; + + name = p; + parse_header(name, &name_len, &value, &value_len); + if ((id = parse_header_name(name, name_len)) == HttpHeaderRequestMaximum) + { + unk_headers[unk_header_idx].NameLength = name_len; + unk_headers[unk_header_idx].RawValueLength = value_len; + unk_headers[unk_header_idx].pName = params.addr + offset; + memcpy(buffer + offset, name, name_len); + offset += name_len; + buffer[offset++] = 0; + unk_headers[unk_header_idx].pRawValue = params.addr + offset; + memcpy(buffer + offset, value, value_len); + offset += value_len; + buffer[offset++] = 0; + ++unk_header_idx; + } + else + { + req->Headers.KnownHeaders[id].RawValueLength = value_len; + req->Headers.KnownHeaders[id].pRawValue = params.addr + offset; + memcpy(buffer + offset, value, value_len); + offset += value_len; + buffer[offset++] = 0; + } + p = strstr(p, "\r\n") + 2; + } + p += 2; + req->BytesReceived = conn->req_len; }

1 0

Francois Gouget : dbgeng: Fix the spelling of GetInterruptTimeout().
by Alexandre Julliard Aug. 27, 2019

Aug. 27, 2019

Module: wine Branch: master Commit: 248b775f95dd851934aa0351d9186dc79310ffdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=248b775f95dd851934aa0351… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 27 03:31:48 2019 +0200 dbgeng: Fix the spelling of GetInterruptTimeout(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbgeng.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/dbgeng.h b/include/dbgeng.h index 3eeb670..d916d24 100644 --- a/include/dbgeng.h +++ b/include/dbgeng.h @@ -1733,7 +1733,7 @@ DECLARE_INTERFACE_(IDebugControl, IUnknown) /* IDebugControl */ STDMETHOD(GetInterrupt)(THIS) PURE; STDMETHOD(SetInterrupt)(THIS_ ULONG flags) PURE; - STDMETHOD(GetIterruptTimeout)(THIS_ ULONG *timeout) PURE; + STDMETHOD(GetInterruptTimeout)(THIS_ ULONG *timeout) PURE; STDMETHOD(SetInterruptTimeout)(THIS_ ULONG timeout) PURE; STDMETHOD(GetLogFile)(THIS_ char *buffer, ULONG buffer_size, ULONG *file_size, BOOL *append) PURE; STDMETHOD(OpenLogFile)(THIS_ const char *file, BOOL append) PURE; @@ -1853,7 +1853,7 @@ DECLARE_INTERFACE_(IDebugControl2, IUnknown) /* IDebugControl */ STDMETHOD(GetInterrupt)(THIS) PURE; STDMETHOD(SetInterrupt)(THIS_ ULONG flags) PURE; - STDMETHOD(GetIterruptTimeout)(THIS_ ULONG *timeout) PURE; + STDMETHOD(GetInterruptTimeout)(THIS_ ULONG *timeout) PURE; STDMETHOD(SetInterruptTimeout)(THIS_ ULONG timeout) PURE; STDMETHOD(GetLogFile)(THIS_ char *buffer, ULONG buffer_size, ULONG *file_size, BOOL *append) PURE; STDMETHOD(OpenLogFile)(THIS_ const char *file, BOOL append) PURE;

1 0

Francois Gouget : ntdll: Fix the spelling of StoragePortClassGuid.
by Alexandre Julliard Aug. 27, 2019

Aug. 27, 2019

Module: wine Branch: master Commit: 3126d366b65d28d504138c03215917af246cde1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3126d366b65d28d504138c03… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 27 03:32:34 2019 +0200 ntdll: Fix the spelling of StoragePortClassGuid. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ntddstor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ntddstor.h b/include/ntddstor.h index d38a947..b8c4bb7 100644 --- a/include/ntddstor.h +++ b/include/ntddstor.h @@ -68,7 +68,7 @@ DEFINE_GUID(FloppyClassGuid, 0x53f56311, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b); DEFINE_GUID(CdChangerClassGuid, 0x53f56312, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b); -DEFINE_GUID(StroagePortClassGuid, +DEFINE_GUID(StoragePortClassGuid, 0x2accfe60, 0xc130, 0x11d2, 0xb0, 0x82, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b); typedef struct _STORAGE_DEVICE_NUMBER {

1 0

Alistair Leslie-Hughes : odbccp32: Correct error when driver cannot be found.
by Alexandre Julliard Aug. 27, 2019

Aug. 27, 2019

Module: wine Branch: master Commit: 8df456ccd4ce1c2c42e5a24c71a8c3eb7d05ff03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8df456ccd4ce1c2c42e5a24c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 27 03:45:03 2019 +0000 odbccp32: Correct error when driver cannot be found. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 2 +- dlls/odbccp32/tests/misc.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 283ed41..1198b48 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -288,7 +288,7 @@ static HMODULE load_config_driver(const WCHAR *driver) if(ret != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, filename); - push_error(ODBC_ERROR_INVALID_DSN, odbc_error_invalid_dsn); + push_error(ODBC_ERROR_COMPONENT_NOT_FOUND, odbc_error_component_not_found); return NULL; } diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index dc65bdf..dc2ca7e 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -741,6 +741,31 @@ static void test_SQLValidDSNW(void) ok(ret, "got %d\n", ret); } +static void test_SQLConfigDataSource(void) +{ + BOOL ret; + + ret = SQLConfigDataSource(0, ODBC_ADD_DSN, "SQL Server", "DSN=WINEMQIS\0Database=MQIS\0\0"); + ok(ret, "got %d\n", ret); + + ret = SQLConfigDataSource(0, ODBC_REMOVE_DSN, "SQL Server", "DSN=WINEMQIS\0\0"); + ok(ret, "got %d\n", ret); + + ret = SQLConfigDataSource(0, ODBC_REMOVE_DSN, "SQL Server", "DSN=WINEMQIS\0\0"); + if(!ret) + { + RETCODE ret; + DWORD err; + ret = SQLInstallerError(1, &err, NULL, 0, NULL); + ok(ret == SQL_SUCCESS_WITH_INFO, "got %d\n", ret); + todo_wine ok(err == ODBC_ERROR_INVALID_DSN, "got %u\n", err); + } + + ret = SQLConfigDataSource(0, ODBC_ADD_DSN, "ODBC driver", "DSN=ODBC data source\0\0"); + todo_wine ok(!ret, "got %d\n", ret); + todo_wine check_error(ODBC_ERROR_COMPONENT_NOT_FOUND); +} + START_TEST(misc) { test_SQLConfigMode(); @@ -754,4 +779,5 @@ START_TEST(misc) test_SQLGetInstalledDrivers(); test_SQLValidDSN(); test_SQLValidDSNW(); + test_SQLConfigDataSource(); }

1 0

Zebediah Figura : http.sys: Fill out the local and remote addresses.
by Alexandre Julliard Aug. 27, 2019

Aug. 27, 2019

Module: wine Branch: master Commit: 0d5643592fe5c41f22cb73f9158685e02a1fd214 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d5643592fe5c41f22cb73f9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 26 23:31:19 2019 -0500 http.sys: Fill out the local and remote addresses. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 1208669..8c46282 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -274,6 +274,8 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) const DWORD output_len = stack->Parameters.DeviceIoControl.OutputBufferLength; ULONG cooked_len, host_len, abs_path_len, query_len, offset; const char *p, *host, *abs_path, *query; + struct sockaddr_in addr; + int len; TRACE("Completing IRP %p.\n", irp); @@ -309,6 +311,9 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) cooked_len = (7 /* scheme */ + host_len + abs_path_len + query_len) * sizeof(WCHAR); irp_size += cooked_len + sizeof(WCHAR); + /* addresses */ + irp_size += 2 * sizeof(addr); + TRACE("Need %u bytes, have %u.\n", irp_size, output_len); irp->IoStatus.Information = irp_size; @@ -376,6 +381,18 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) buffer[offset++] = 0; buffer[offset++] = 0; + req->Address.pRemoteAddress = params.addr + offset; + len = sizeof(addr); + getpeername(conn->socket, (struct sockaddr *)&addr, &len); + memcpy(buffer + offset, &addr, sizeof(addr)); + offset += sizeof(addr); + + req->Address.pLocalAddress = params.addr + offset; + len = sizeof(addr); + getsockname(conn->socket, (struct sockaddr *)&addr, &len); + memcpy(buffer + offset, &addr, sizeof(addr)); + offset += sizeof(addr); + req->BytesReceived = conn->req_len; } else @@ -425,6 +442,18 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) buffer[offset++] = 0; buffer[offset++] = 0; + req->Address.pRemoteAddress = params.addr + offset; + len = sizeof(addr); + getpeername(conn->socket, (struct sockaddr *)&addr, &len); + memcpy(buffer + offset, &addr, sizeof(addr)); + offset += sizeof(addr); + + req->Address.pLocalAddress = params.addr + offset; + len = sizeof(addr); + getsockname(conn->socket, (struct sockaddr *)&addr, &len); + memcpy(buffer + offset, &addr, sizeof(addr)); + offset += sizeof(addr); + req->BytesReceived = conn->req_len; }

1 0

Francois Gouget : testbot: Sanitize the environment for system() & co.
by Alexandre Julliard Aug. 27, 2019

Aug. 27, 2019

Module: tools Branch: master Commit: 3ef757cc31d4792a0b1a0f394d1dcfb0454b9751 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3ef757cc31d4792a0b1a0f3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 27 01:49:30 2019 +0200 testbot: Sanitize the environment for system() & co. system() may start a shell so make sure its behavior will not be modified in unexpected ways by the environment ($CDPATH, $IFS) or an external file ($ENV, $BASH_ENV). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Config.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 4469229..d6267de 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -69,6 +69,9 @@ $LogDir = "$::RootDir/var"; $DataDir = "$::RootDir/var"; $BinDir = "$::RootDir/bin"; +# Sanitize the environment for system() & co +delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; # from perlsec + # See the ScheduleOnHost() documentation in lib/WineTestBot/Jobs.pm $MaxRevertingVMs = 1; $MaxRevertsWhileRunningVMs = 0;

1 0

Francois Gouget : testbot: Specify the service path instead of relying on $PATH.
by Alexandre Julliard Aug. 27, 2019

Aug. 27, 2019

Module: tools Branch: master Commit: ccc707a6414c0462c0a0e538c858113f51916769 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ccc707a6414c0462c0a0e53… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 27 01:50:35 2019 +0200 testbot: Specify the service path instead of relying on $PATH. This allows CheckWineTestBot.pl to use the same $PATH as the other tools. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/CheckWineTestBot.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/scripts/CheckWineTestBot.pl b/testbot/scripts/CheckWineTestBot.pl index 9c2e291..0af2550 100755 --- a/testbot/scripts/CheckWineTestBot.pl +++ b/testbot/scripts/CheckWineTestBot.pl @@ -38,17 +38,17 @@ sub BEGIN use WineTestBot::Config; use WineTestBot::Engine::Notify; -$ENV{PATH} = "/sbin:/usr/sbin:/usr/bin:/bin"; +$ENV{PATH} = "/usr/bin:/bin"; my $rc = 0; if (! PingEngine()) { if ($> == 0) { - system "service winetestbot restart > /dev/null"; + system "/usr/sbin/service winetestbot restart > /dev/null"; sleep 5; } - + open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); print SENDMAIL <<"EOF"; From: $RobotEMail

1 0

Francois Gouget : testbot: Fix the "no snapshot" case in BackupVM.
by Alexandre Julliard Aug. 27, 2019

Aug. 27, 2019

Module: tools Branch: master Commit: 8c53a4830914ace8293504a337c5c3e6e979da83 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8c53a4830914ace8293504a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 27 01:53:23 2019 +0200 testbot: Fix the "no snapshot" case in BackupVM. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/BackupVM | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/testbot/scripts/BackupVM b/testbot/scripts/BackupVM index 2cf3320..d7e5483 100755 --- a/testbot/scripts/BackupVM +++ b/testbot/scripts/BackupVM @@ -209,10 +209,14 @@ then fi snapshots=`echo "/$snapdir/$opt_vm"/*.xml` -if [ -n "$opt_snapshot" -a "$snapshots" = "/$snapdir/$opt_vm/*.xml" ] +if [ "$snapshots" = "/$snapdir/$opt_vm/*.xml" ] then - error "the '$opt_vm' VM does not seem to have snapshots! Use --no-snapshot if this is expected." - exit 2 + if [ -n "$opt_snapshot" ] + then + error "the '$opt_vm' VM does not seem to have snapshots! Use --no-snapshot if this is expected." + exit 2 + fi + snapshots="" fi # Backup the symbolic links but also their targets!

1 0

Alexandre Julliard : Revert "wine/asm.h: Quote stdcall decored symbols."
by Alexandre Julliard Aug. 27, 2019

Aug. 27, 2019

Module: wine Branch: master Commit: a0190cc27c609ebd96bd2f31811ac81c0ea4c511 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0190cc27c609ebd96bd2f31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 27 10:12:29 2019 +0200 Revert "wine/asm.h: Quote stdcall decored symbols." This reverts commit bdcc54c19d7356077362e7001aa9c4a08919af89. It breaks with older binutils. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/asm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index 66062c0..01dfdb1 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -28,7 +28,7 @@ #endif #if defined(_WIN32) && defined(__i386__) -# define __ASM_STDCALL(name,args) "\"" __ASM_NAME(name) "@" #args "\"" +# define __ASM_STDCALL(name,args) __ASM_NAME(name) "@" #args #else # define __ASM_STDCALL(name,args) __ASM_NAME(name) #endif

1 0