November 2019 - Wine-Commits

Alistair Leslie-Hughes : ntdll: Fix compile error on macos.
by Alexandre Julliard Nov. 1, 2019

Nov. 1, 2019

Module: wine Branch: master Commit: 4a1bbff61b2199d6234b1100c0b2f190e6f7ffe0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a1bbff61b2199d6234b1100… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 1 07:13:59 2019 +0000 ntdll: Fix compile error on macos. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 81bac70b0f..b6daa226b3 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -3196,7 +3196,7 @@ static NTSTATUS fill_battery_state(SYSTEM_BATTERY_STATE *bs) #else -static NTSTATUS fill_battery_state(SYSTEM_BATTERY_STATE *) +static NTSTATUS fill_battery_state(SYSTEM_BATTERY_STATE *bs) { FIXME("SystemBatteryState not implemented on this platform\n"); return STATUS_NOT_IMPLEMENTED;

1 0

Zebediah Figura : qedit/mediadet: Check for failure from IEnumPins::Next().
by Alexandre Julliard Nov. 1, 2019

Nov. 1, 2019

Module: wine Branch: master Commit: 9defa529fcc98dad5387a0a6c2a7ea40a8966808 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9defa529fcc98dad5387a0a6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 31 23:33:32 2019 -0500 qedit/mediadet: Check for failure from IEnumPins::Next(). Fixes a test crash when gstreamer is not present. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/mediadet.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index b7a5abb80c..1d70a86a5a 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -456,7 +456,12 @@ static HRESULT GetSplitter(MediaDetImpl *This) IPin_Release(source_pin); goto retry; } - IEnumPins_Next(pins, 1, &splitter_pin, NULL); + if (IEnumPins_Next(pins, 1, &splitter_pin, NULL) != S_OK) + { + IEnumPins_Release(pins); + IPin_Release(source_pin); + goto retry; + } IEnumPins_Release(pins); hr = IPin_Connect(source_pin, splitter_pin, NULL);

1 0

Piotr Caban : msvcrt: Fix test failures on Windows 10.
by Alexandre Julliard Nov. 1, 2019

Nov. 1, 2019

Module: wine Branch: master Commit: c2b6dcb08f63b18e62017122057ede7144bcdf74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2b6dcb08f63b18e62017122… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 1 11:49:34 2019 +0100 msvcrt: Fix test failures on Windows 10. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/printf.c | 286 ++++++++++++++++++++++++--------------------- 1 file changed, 150 insertions(+), 136 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c2b6dcb08f63b18e6201…

1 0

Piotr Caban : msvcrt: Simplify printf tests table.
by Alexandre Julliard Nov. 1, 2019

Nov. 1, 2019

Module: wine Branch: master Commit: 465f3cf37a9b13842798b9478c381e7de4ed2aa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=465f3cf37a9b13842798b947… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 1 11:49:27 2019 +0100 msvcrt: Simplify printf tests table. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/printf.c | 253 ++++++++++++++++++++++----------------------- 1 file changed, 126 insertions(+), 127 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=465f3cf37a9b13842798…

1 0

Louis Lenders : httpapi: Add stub for HttpReceiveRequestEntityBody.
by Alexandre Julliard Nov. 1, 2019

Nov. 1, 2019

Module: wine Branch: master Commit: ab77c7bb06a28d9bf419abf1c6604b848290b91e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab77c7bb06a28d9bf419abf1… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Oct 31 13:37:42 2019 +0100 httpapi: Add stub for HttpReceiveRequestEntityBody. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48017 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi.spec | 2 +- dlls/httpapi/httpapi_main.c | 14 ++++++++++++++ include/http.h | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index e2f165c688..c27d0c96b0 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -39,7 +39,7 @@ @ stub HttpReceiveClientCertificate @ stdcall HttpReceiveHttpRequest(ptr int64 long ptr long ptr ptr) @ stub HttpReceiveHttpResponse -@ stub HttpReceiveRequestEntityBody +@ stdcall HttpReceiveRequestEntityBody(ptr int64 long ptr long ptr ptr) @ stub HttpRemoveAllUrlsFromConfigGroup @ stdcall HttpRemoveUrl(ptr wstr) @ stub HttpRemoveUrlFromConfigGroup diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 03511d6c9f..47b5d8a2bb 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -278,6 +278,20 @@ ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url) return remove_url(queue, url); } +/*********************************************************************** + * HttpReceiveRequestEntityBody (HTTPAPI.@) + */ +ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, + void *buffer, ULONG size, ULONG *ret_size, OVERLAPPED *ovl) +{ + *ret_size = 0; + + FIXME("stub: queue %p, id %s, flags %#x, buffer %p, size %#x, ret_size %p, ovl %p.\n", + queue, wine_dbgstr_longlong(id), flags, buffer, size, ret_size, ovl); + + return ERROR_HANDLE_EOF; +} + /*********************************************************************** * HttpReceiveHttpRequest (HTTPAPI.@) */ diff --git a/include/http.h b/include/http.h index 7586d0cbe0..49eb557fae 100644 --- a/include/http.h +++ b/include/http.h @@ -441,6 +441,7 @@ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved ULONG WINAPI HttpTerminate(ULONG flags, void *reserved); ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED); ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_REQUEST *request, ULONG size, ULONG *ret_size, OVERLAPPED *ovl); +ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, void *buffer, ULONG size, ULONG *ret_size, OVERLAPPED *ovl); ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url); ULONG WINAPI HttpRemoveUrlFromUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, ULONG flags); ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_RESPONSE *response, HTTP_CACHE_POLICY *cache_policy, ULONG *ret_size, void *reserved1, ULONG reserved2, OVERLAPPED *ovl, HTTP_LOG_DATA *log_data);

1 0