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

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

27 Aug '19

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 raw URL.
by Alexandre Julliard 27 Aug '19

27 Aug '19

Module: wine Branch: master Commit: d5ec9fa75f6c369975b6022128a8ac690109bc48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5ec9fa75f6c369975b60221… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 26 23:31:17 2019 -0500 http.sys: Fill out the raw URL. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 7690867..1c4dd12 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -279,6 +279,7 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) if (conn->unk_verb_len) irp_size += conn->unk_verb_len + 1; + irp_size += conn->url_len + 1; TRACE("Need %u bytes, have %u.\n", irp_size, output_len); irp->IoStatus.Information = irp_size; @@ -312,6 +313,7 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) req->Version = conn->version; req->Verb = conn->verb; req->UnknownVerbLength = conn->unk_verb_len; + req->RawUrlLength = conn->url_len; if (conn->unk_verb_len) { @@ -321,6 +323,11 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) buffer[offset++] = 0; } + req->pRawUrl = params.addr + offset; + memcpy(buffer + offset, conn->url, conn->url_len); + offset += conn->url_len; + buffer[offset++] = 0; + req->BytesReceived = conn->req_len; } else @@ -335,6 +342,7 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) req->Version = conn->version; req->Verb = conn->verb; req->UnknownVerbLength = conn->unk_verb_len; + req->RawUrlLength = conn->url_len; if (conn->unk_verb_len) { @@ -344,6 +352,11 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) buffer[offset++] = 0; } + req->pRawUrl = params.addr + offset; + memcpy(buffer + offset, conn->url, conn->url_len); + offset += conn->url_len; + buffer[offset++] = 0; + req->BytesReceived = conn->req_len; }

1 0

Zebediah Figura : http.sys: Fill out the cooked URL.
by Alexandre Julliard 27 Aug '19

27 Aug '19

Module: wine Branch: master Commit: d39dc9803b1a5811e83474fd4a855f787844df35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d39dc9803b1a5811e83474fd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 26 23:31:18 2019 -0500 http.sys: Fill out the cooked URL. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 1c4dd12..1208669 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -266,12 +266,14 @@ static int parse_token(const char *str, const char *end) static NTSTATUS complete_irp(struct connection *conn, IRP *irp) { + static const WCHAR httpW[] = {'h','t','t','p',':','/','/'}; const struct http_receive_request_params params = *(struct http_receive_request_params *)irp->AssociatedIrp.SystemBuffer; DWORD irp_size = (params.bits == 32) ? sizeof(struct http_request_32) : sizeof(struct http_request_64); IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); const DWORD output_len = stack->Parameters.DeviceIoControl.OutputBufferLength; - ULONG offset; + ULONG cooked_len, host_len, abs_path_len, query_len, offset; + const char *p, *host, *abs_path, *query; TRACE("Completing IRP %p.\n", irp); @@ -281,6 +283,32 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) irp_size += conn->unk_verb_len + 1; irp_size += conn->url_len + 1; + /* cooked URL */ + if (conn->url[0] == '/') + { + p = host = conn->host; + while (isgraph(*p)) ++p; + host_len = p - conn->host; + abs_path = conn->url; + abs_path_len = conn->url_len; + } + else + { + host = conn->url + 7; + abs_path = strchr(host, '/'); + host_len = abs_path - host; + abs_path_len = (conn->url + conn->url_len) - abs_path; + } + if ((query = memchr(abs_path, '?', abs_path_len))) + { + query_len = (abs_path + abs_path_len) - query; + abs_path_len = query - abs_path; + } + else + query_len = 0; + cooked_len = (7 /* scheme */ + host_len + abs_path_len + query_len) * sizeof(WCHAR); + irp_size += cooked_len + sizeof(WCHAR); + TRACE("Need %u bytes, have %u.\n", irp_size, output_len); irp->IoStatus.Information = irp_size; @@ -328,6 +356,26 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) offset += conn->url_len; buffer[offset++] = 0; + req->CookedUrl.FullUrlLength = cooked_len; + req->CookedUrl.HostLength = host_len * sizeof(WCHAR); + req->CookedUrl.AbsPathLength = abs_path_len * sizeof(WCHAR); + req->CookedUrl.QueryStringLength = query_len * sizeof(WCHAR); + req->CookedUrl.pFullUrl = params.addr + offset; + req->CookedUrl.pHost = req->CookedUrl.pFullUrl + 7 * sizeof(WCHAR); + req->CookedUrl.pAbsPath = req->CookedUrl.pHost + host_len * sizeof(WCHAR); + if (query) + req->CookedUrl.pQueryString = req->CookedUrl.pAbsPath + abs_path_len * sizeof(WCHAR); + + memcpy(buffer + offset, httpW, sizeof(httpW)); + offset += 7 * sizeof(WCHAR); + MultiByteToWideChar(CP_ACP, 0, host, host_len, (WCHAR *)(buffer + offset), host_len * sizeof(WCHAR)); + offset += host_len * sizeof(WCHAR); + MultiByteToWideChar(CP_ACP, 0, abs_path, abs_path_len + query_len, + (WCHAR *)(buffer + offset), (abs_path_len + query_len) * sizeof(WCHAR)); + offset += (abs_path_len + query_len) * sizeof(WCHAR); + buffer[offset++] = 0; + buffer[offset++] = 0; + req->BytesReceived = conn->req_len; } else @@ -357,6 +405,26 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) offset += conn->url_len; buffer[offset++] = 0; + req->CookedUrl.FullUrlLength = cooked_len; + req->CookedUrl.HostLength = host_len * sizeof(WCHAR); + req->CookedUrl.AbsPathLength = abs_path_len * sizeof(WCHAR); + req->CookedUrl.QueryStringLength = query_len * sizeof(WCHAR); + req->CookedUrl.pFullUrl = params.addr + offset; + req->CookedUrl.pHost = req->CookedUrl.pFullUrl + 7 * sizeof(WCHAR); + req->CookedUrl.pAbsPath = req->CookedUrl.pHost + host_len * sizeof(WCHAR); + if (query) + req->CookedUrl.pQueryString = req->CookedUrl.pAbsPath + abs_path_len * sizeof(WCHAR); + + memcpy(buffer + offset, httpW, sizeof(httpW)); + offset += 7 * sizeof(WCHAR); + MultiByteToWideChar(CP_ACP, 0, host, host_len, (WCHAR *)(buffer + offset), host_len * sizeof(WCHAR)); + offset += host_len * sizeof(WCHAR); + MultiByteToWideChar(CP_ACP, 0, abs_path, abs_path_len + query_len, + (WCHAR *)(buffer + offset), (abs_path_len + query_len) * sizeof(WCHAR)); + offset += (abs_path_len + query_len) * sizeof(WCHAR); + buffer[offset++] = 0; + buffer[offset++] = 0; + req->BytesReceived = conn->req_len; }

1 0

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

27 Aug '19

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

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

27 Aug '19

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

Zebediah Figura : http.sys: Implement HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY.
by Alexandre Julliard 27 Aug '19

27 Aug '19

Module: wine Branch: master Commit: fc8996cc6038c319aaebc5592f67ae24154acb92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc8996cc6038c319aaebc559… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 26 23:31:21 2019 -0500 http.sys: Implement HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 2607af5..fe53638 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -45,6 +45,26 @@ struct http_unknown_header_32 ULONG pRawValue; /* char string */ }; +struct http_data_chunk_32 +{ + HTTP_DATA_CHUNK_TYPE DataChunkType; + union + { + struct + { + ULONG pBuffer; /* char string */ + ULONG BufferLength; + } FromMemory; + /* for the struct size */ + struct + { + ULARGE_INTEGER StartingOffset; + ULARGE_INTEGER Length; + HANDLE FileHandle; + } FromFileHandle; + }; +}; + struct http_request_32 { ULONG Flags; @@ -102,6 +122,26 @@ struct http_unknown_header_64 ULONGLONG pRawValue; /* char string */ }; +struct http_data_chunk_64 +{ + HTTP_DATA_CHUNK_TYPE DataChunkType; + union + { + struct + { + ULONGLONG pBuffer; /* char string */ + ULONG BufferLength; + } FromMemory; + /* for the struct size */ + struct + { + ULARGE_INTEGER StartingOffset; + ULARGE_INTEGER Length; + HANDLE FileHandle; + } FromFileHandle; + }; +}; + struct http_request_64 { ULONG Flags; @@ -358,7 +398,7 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) DWORD irp_size = (params.bits == 32) ? sizeof(struct http_request_32) : sizeof(struct http_request_64); 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; + ULONG cooked_len, host_len, abs_path_len, query_len, chunk_len = 0, offset; const char *p, *name, *value, *host, *abs_path, *query; USHORT unk_headers_count = 0, unk_header_idx; int name_len, value_len, len; @@ -447,6 +487,7 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) struct http_request_32 *req = irp->AssociatedIrp.SystemBuffer; struct http_unknown_header_32 *unk_headers = NULL; char *buffer = irp->AssociatedIrp.SystemBuffer; + struct http_data_chunk_32 *chunk = NULL; offset = sizeof(*req); @@ -544,6 +585,26 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) } p += 2; + if (irp_size + sizeof(*chunk) < output_len && (params.flags & HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY)) + chunk_len = min(conn->content_len, output_len - (irp_size + sizeof(*chunk))); + if (chunk_len) + { + req->EntityChunkCount = 1; + req->pEntityChunks = params.addr + offset; + chunk = (struct http_data_chunk_32 *)(buffer + offset); + offset += sizeof(*chunk); + chunk->DataChunkType = HttpDataChunkFromMemory; + chunk->FromMemory.BufferLength = chunk_len; + chunk->FromMemory.pBuffer = params.addr + offset; + memcpy(buffer + offset, p, chunk_len); + offset += chunk_len; + + irp->IoStatus.Information = irp_size + sizeof(*chunk) + chunk_len; + } + + if (chunk_len < conn->content_len) + req->Flags |= HTTP_REQUEST_FLAG_MORE_ENTITY_BODY_EXISTS; + req->BytesReceived = conn->req_len; } else @@ -551,6 +612,7 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) struct http_request_64 *req = irp->AssociatedIrp.SystemBuffer; struct http_unknown_header_64 *unk_headers = NULL; char *buffer = irp->AssociatedIrp.SystemBuffer; + struct http_data_chunk_64 *chunk = NULL; offset = sizeof(*req); @@ -648,6 +710,26 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) } p += 2; + if (irp_size + sizeof(*chunk) < output_len && (params.flags & HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY)) + chunk_len = min(conn->content_len, output_len - (irp_size + sizeof(*chunk))); + if (chunk_len) + { + req->EntityChunkCount = 1; + req->pEntityChunks = params.addr + offset; + chunk = (struct http_data_chunk_64 *)(buffer + offset); + offset += sizeof(*chunk); + chunk->DataChunkType = HttpDataChunkFromMemory; + chunk->FromMemory.BufferLength = chunk_len; + chunk->FromMemory.pBuffer = params.addr + offset; + memcpy(buffer + offset, p, chunk_len); + offset += chunk_len; + + irp->IoStatus.Information = irp_size + sizeof(*chunk) + chunk_len; + } + + if (chunk_len < conn->content_len) + req->Flags |= HTTP_REQUEST_FLAG_MORE_ENTITY_BODY_EXISTS; + req->BytesReceived = conn->req_len; }

1 0

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

27 Aug '19

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

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

27 Aug '19

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 27 Aug '19

27 Aug '19

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

Francois Gouget : ninput: Fix the name of MANIPULATION_VELOCITY' s velocityExpansion field.
by Alexandre Julliard 27 Aug '19

27 Aug '19

Module: wine Branch: master Commit: 8d486f5ba56d06506ae84c71ad1471f4f355e798 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d486f5ba56d06506ae84c71… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 27 03:33:08 2019 +0200 ninput: Fix the name of MANIPULATION_VELOCITY's velocityExpansion field. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/interactioncontext.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/interactioncontext.h b/include/interactioncontext.h index a643b62..a3a5f34 100644 --- a/include/interactioncontext.h +++ b/include/interactioncontext.h @@ -113,7 +113,7 @@ typedef struct MANIPULATION_VELOCITY { float velocityX; float velocityY; - float velocityExapnsion; + float velocityExpansion; float velocityAngular; } MANIPULATION_VELOCITY;

1 0