wine-commits August 2019

wine-commits@winehq.org

2 participants
703 discussions

Zhiyi Zhang : msctf: Check TF_GetThreadMgr error in DocumentMgr_Destructor.
by Alexandre Julliard 27 Aug '19

27 Aug '19

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

Alexandre Julliard : kernelbase: Comment out DECLSPEC_HOTPATCH on stub functions.
by Alexandre Julliard 27 Aug '19

27 Aug '19

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

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

27 Aug '19

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

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

27 Aug '19

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

27 Aug '19

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

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

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 : 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

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

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

← Newer
1
...
6
7
8
9
10
11
12
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2019