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

Francois Gouget : wdscore: Fix the name of the WdsIterate*() stubs.
by Alexandre Julliard Aug. 27, 2019

Aug. 27, 2019

Module: wine Branch: master Commit: 2094ca241941deb479fb6780fb448db422d16abc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2094ca241941deb479fb6780… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 27 03:34:33 2019 +0200 wdscore: Fix the name of the WdsIterate*() stubs. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wdscore/wdscore.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wdscore/wdscore.spec b/dlls/wdscore/wdscore.spec index ab4aeb7..15958b8 100644 --- a/dlls/wdscore/wdscore.spec +++ b/dlls/wdscore/wdscore.spec @@ -125,8 +125,8 @@ @ stub WdsInitializeDataUInt32 @ stub WdsInitializeDataUInt64 @ stub WdsIsDiagnosticModeEnabled -@ stub WdsInterateOfflineQueue -@ stub WdsInterateQueue +@ stub WdsIterateOfflineQueue +@ stub WdsIterateQueue @ stub WdsLockBlackboardValue @ stub WdsLockExecutionGroup @ stub WdsLogCreate

1 0

Francois Gouget : ntoskrnl.exe: Fix the name of CONFIGURATION_TYPE' s MaximumType enum entry.
by Alexandre Julliard Aug. 27, 2019

Aug. 27, 2019

Module: wine Branch: master Commit: 1718fbd25826a28331cb6fc68d0ce3bbab711cbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1718fbd25826a28331cb6fc6… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 27 03:33:54 2019 +0200 ntoskrnl.exe: Fix the name of CONFIGURATION_TYPE's MaximumType enum entry. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/ntddk.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 32f9a6f..36f69cd 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -104,7 +104,7 @@ typedef enum _CONFIGURATION_TYPE DockingInformation, RealModeIrqRoutingTable, RealModePCIEnumeration, - MaximunType + MaximumType } CONFIGURATION_TYPE, *PCONFIGURATION_TYPE; typedef struct _IMAGE_INFO

1 0

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

Aug. 27, 2019

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

Francois Gouget : api-*-advapi32-*: Fix the name of the ConvertToAutoInheritPrivateObjectSecurity() stub.
by Alexandre Julliard Aug. 27, 2019

Aug. 27, 2019

Module: wine Branch: master Commit: d7d6aa113803c0b00e140224abcbd40ae8dd33fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7d6aa113803c0b00e140224… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 27 03:35:35 2019 +0200 api-*-advapi32-*: Fix the name of the ConvertToAutoInheritPrivateObjectSecurity() stub. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index 579811b..1d58187 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -23,7 +23,7 @@ @ stdcall AreAllAccessesGranted(long long) advapi32.AreAllAccessesGranted @ stdcall AreAnyAccessesGranted(long long) advapi32.AreAnyAccessesGranted @ stdcall CheckTokenMembership(long ptr ptr) advapi32.CheckTokenMembership -@ stub ConvertToAutoInheritPrivateObjecSecurity +@ stdcall ConvertToAutoInheritPrivateObjectSecurity(ptr ptr ptr ptr long ptr) advapi32.ConvertToAutoInheritPrivateObjectSecurity @ stdcall CopySid(long ptr ptr) advapi32.CopySid @ stdcall CreatePrivateObjectSecurity(ptr ptr ptr long long ptr) advapi32.CreatePrivateObjectSecurity @ stdcall CreatePrivateObjectSecurityEx(ptr ptr ptr ptr long long long ptr) advapi32.CreatePrivateObjectSecurityEx

1 0

Alexandre Julliard : kernelbase: Comment out DECLSPEC_HOTPATCH on stub functions.
by Alexandre Julliard Aug. 27, 2019

Aug. 27, 2019

Module: wine Branch: master Commit: 5fb8e3edef02030c056dc827bfbdf3c45c78bdac URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fb8e3edef02030c056dc827… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 27 11:46:51 2019 +0200 kernelbase: Comment out DECLSPEC_HOTPATCH on stub functions. It triggers a MinGW compiler bug. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47633 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 2 +- dlls/kernelbase/process.c | 7 +++---- dlls/kernelbase/thread.c | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 2aa751c..ed1471d 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -1172,7 +1172,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH OpenFileById( HANDLE handle, LPFILE_ID_DESCRIPTO /*********************************************************************** * ReOpenFile (kernelbase.@) */ -HANDLE WINAPI DECLSPEC_HOTPATCH ReOpenFile( HANDLE handle, DWORD access, DWORD sharing, DWORD flags ) +HANDLE WINAPI /* DECLSPEC_HOTPATCH */ ReOpenFile( HANDLE handle, DWORD access, DWORD sharing, DWORD flags ) { FIXME( "(%p, %d, %d, %d): stub\n", handle, access, sharing, flags ); return INVALID_HANDLE_VALUE; diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 8423a54..a205b14 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -155,7 +155,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetProcessId( HANDLE process ) /********************************************************************** * GetProcessMitigationPolicy (kernelbase.@) */ -BOOL WINAPI DECLSPEC_HOTPATCH GetProcessMitigationPolicy( HANDLE process, PROCESS_MITIGATION_POLICY policy, +BOOL WINAPI /* DECLSPEC_HOTPATCH */ GetProcessMitigationPolicy( HANDLE process, PROCESS_MITIGATION_POLICY policy, void *buffer, SIZE_T length ) { FIXME( "(%p, %u, %p, %lu): stub\n", process, policy, buffer, length ); @@ -291,7 +291,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetProcessAffinityUpdateMode( HANDLE process, DWOR /********************************************************************** * SetProcessMitigationPolicy (kernelbase.@) */ -BOOL WINAPI DECLSPEC_HOTPATCH SetProcessMitigationPolicy( PROCESS_MITIGATION_POLICY policy, +BOOL WINAPI /* DECLSPEC_HOTPATCH */ SetProcessMitigationPolicy( PROCESS_MITIGATION_POLICY policy, void *buffer, SIZE_T length ) { FIXME( "(%d, %p, %lu): stub\n", policy, buffer, length ); @@ -302,7 +302,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetProcessMitigationPolicy( PROCESS_MITIGATION_POL /*********************************************************************** * SetProcessPriorityBoost (kernelbase.@) */ -BOOL WINAPI DECLSPEC_HOTPATCH SetProcessPriorityBoost( HANDLE process, BOOL disable ) +BOOL WINAPI /* DECLSPEC_HOTPATCH */ SetProcessPriorityBoost( HANDLE process, BOOL disable ) { FIXME( "(%p,%d): stub\n", process, disable ); return TRUE; @@ -327,7 +327,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetProcessShutdownParameters( DWORD level, DWORD f BOOL WINAPI DECLSPEC_HOTPATCH SetProcessWorkingSetSizeEx( HANDLE process, SIZE_T minset, SIZE_T maxset, DWORD flags ) { - WARN( "(%p,%ld,%ld,%x): stub - harmless\n", process, minset, maxset, flags ); return TRUE; } diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 518ea93..2bc3d85 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -1084,7 +1084,7 @@ PTP_CLEANUP_GROUP WINAPI DECLSPEC_HOTPATCH CreateThreadpoolCleanupGroup(void) /*********************************************************************** * CreateThreadpoolIo (kernelbase.@) */ -PTP_IO WINAPI DECLSPEC_HOTPATCH CreateThreadpoolIo( HANDLE handle, PTP_WIN32_IO_CALLBACK callback, +PTP_IO WINAPI /* DECLSPEC_HOTPATCH */ CreateThreadpoolIo( HANDLE handle, PTP_WIN32_IO_CALLBACK callback, PVOID userdata, TP_CALLBACK_ENVIRON *environment ) { FIXME( "(%p, %p, %p, %p): stub\n", handle, callback, userdata, environment );

1 0

Hans Leidekker : ntdll: Read the chassis type from sysfs.
by Alexandre Julliard Aug. 27, 2019

Aug. 27, 2019

Module: wine Branch: master Commit: 4e71e86747234a7add959befecbbbb9428908717 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e71e86747234a7add959bef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 27 16:35:54 2019 +0200 ntdll: Read the chassis type from sysfs. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index a9985fb..06f8f39 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -115,7 +115,7 @@ struct smbios_board { struct smbios_chassis { struct smbios_header hdr; BYTE vendor; - BYTE shape; + BYTE type; BYTE version; BYTE serial; BYTE asset_tag; @@ -2117,6 +2117,7 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG char board_vendor[128], board_product[128], board_version[128], board_serial[128]; size_t board_vendor_len, board_product_len, board_version_len, board_serial_len; char chassis_vendor[128], chassis_version[128], chassis_serial[128], chassis_asset_tag[128]; + char chassis_type[11] = "2"; /* unknown */ size_t chassis_vendor_len, chassis_version_len, chassis_serial_len, chassis_asset_tag_len; char *buffer = (char*)sfti->TableBuffer; BYTE string_count; @@ -2142,6 +2143,7 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG chassis_version_len = get_smbios_string("/sys/class/dmi/id/chassis_version", S(chassis_version)); chassis_serial_len = get_smbios_string("/sys/class/dmi/id/chassis_serial", S(chassis_serial)); chassis_asset_tag_len = get_smbios_string("/sys/class/dmi/id/chassis_tag", S(chassis_asset_tag)); + get_smbios_string("/sys/class/dmi/id/chassis_type", S(chassis_type)); #undef S *required_len = sizeof(struct smbios_prologue); @@ -2237,7 +2239,7 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG chassis->hdr.length = sizeof(struct smbios_chassis); chassis->hdr.handle = 0; chassis->vendor = chassis_vendor_len ? ++string_count : 0; - chassis->shape = 0x2; /* unknown */ + chassis->type = atoi(chassis_type); chassis->version = chassis_version_len ? ++string_count : 0; chassis->serial = chassis_serial_len ? ++string_count : 0; chassis->asset_tag = chassis_asset_tag_len ? ++string_count : 0;

1 0

Zhiyi Zhang : msctf: Check TF_GetThreadMgr error in DocumentMgr_Destructor.
by Alexandre Julliard Aug. 27, 2019

Aug. 27, 2019

Module: wine Branch: master Commit: 0bebbbaa51c7647389ef9ac886169f6037356460 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bebbbaa51c7647389ef9ac8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 27 21:06:41 2019 +0800 msctf: Check TF_GetThreadMgr error in DocumentMgr_Destructor. Thread manager could be already destroyed when calling DocumentMgr_Destructor. This removes the error dialog when closing Unreal Engine 4 games. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/documentmgr.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index dd49cd0..44856db 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -77,11 +77,15 @@ static inline EnumTfContext *impl_from_IEnumTfContexts(IEnumTfContexts *iface) static void DocumentMgr_Destructor(DocumentMgr *This) { - ITfThreadMgr *tm; + ITfThreadMgr *tm = NULL; TRACE("destroying %p\n", This); TF_GetThreadMgr(&tm); - ThreadMgr_OnDocumentMgrDestruction(tm, &This->ITfDocumentMgr_iface); + if (tm) + { + ThreadMgr_OnDocumentMgrDestruction(tm, &This->ITfDocumentMgr_iface); + ITfThreadMgr_Release(tm); + } if (This->contextStack[0]) ITfContext_Release(This->contextStack[0]);

1 0

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

Aug. 27, 2019

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

Zebediah Figura : http.sys: Implement HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY.
by Alexandre Julliard Aug. 27, 2019

Aug. 27, 2019

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

Michael Stefaniuc : msi/tests: Actually test two return values.
by Alexandre Julliard Aug. 27, 2019

Aug. 27, 2019

Module: wine Branch: master Commit: 8738075da4e59336898457fb381488aa3be877cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8738075da4e59336898457fb… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Aug 16 21:28:52 2019 +0200 msi/tests: Actually test two return values. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/package.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 4d384d0..0604098 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2081,9 +2081,9 @@ static void test_condition(void) ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateConditionA(hpkg, "!nofeature=\"\""); ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); - MsiEvaluateConditionA(hpkg, "$nocomponent=\"\""); + r = MsiEvaluateConditionA(hpkg, "$nocomponent=\"\""); ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); - MsiEvaluateConditionA(hpkg, "?nocomponent=\"\""); + r = MsiEvaluateConditionA(hpkg, "?nocomponent=\"\""); ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); MsiSetPropertyA(hpkg, "A", "2");

1 0