November 2020 - Wine-Commits

Nikolay Sivov : mf/evr: Accept samples when prerolling.
by Alexandre Julliard Nov. 9, 2020

Nov. 9, 2020

Module: wine Branch: master Commit: 8c9988d8d45bf48f5b40ef76856a08a24ce872af URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c9988d8d45bf48f5b40ef76… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 9 15:02:41 2020 +0300 mf/evr: Accept samples when prerolling. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index f5bbfffc4a5..486958f5f79 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -350,7 +350,7 @@ static HRESULT WINAPI video_stream_sink_ProcessSample(IMFStreamSink *iface, IMFS { WARN("No sample timestamp, hr %#x.\n", hr); } - else if (stream->parent->state == EVR_STATE_RUNNING) + else if (stream->parent->state == EVR_STATE_RUNNING || stream->flags & EVR_STREAM_PREROLLING) { if (SUCCEEDED(IMFTransform_ProcessInput(stream->parent->mixer, stream->id, sample, 0))) IMFVideoPresenter_ProcessMessage(stream->parent->presenter, MFVP_MESSAGE_PROCESSINPUTNOTIFY, 0);

1 0

Nikolay Sivov : mf/tests: Add a test for copier buffer handling.
by Alexandre Julliard Nov. 9, 2020

Nov. 9, 2020

Module: wine Branch: master Commit: e6cc5c067b11281ab27909b0d787a0a0b2455117 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6cc5c067b11281ab27909b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 9 15:02:40 2020 +0300 mf/tests: Add a test for copier buffer handling. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index d304a62f08a..c38c817eb4b 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3921,6 +3921,108 @@ static void test_sample_copier(void) IMFTransform_Release(copier); } +static void sample_copier_process(IMFTransform *copier, IMFMediaBuffer *input_buffer, + IMFMediaBuffer *output_buffer) +{ + IMFSample *input_sample, *output_sample; + MFT_OUTPUT_DATA_BUFFER buffer; + DWORD status; + HRESULT hr; + + hr = MFCreateSample(&input_sample); + ok(hr == S_OK, "Failed to create a sample, hr %#x.\n", hr); + + hr = MFCreateSample(&output_sample); + ok(hr == S_OK, "Failed to create a sample, hr %#x.\n", hr); + + hr = IMFSample_AddBuffer(input_sample, input_buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_AddBuffer(output_sample, output_buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_ProcessInput(copier, 0, input_sample, 0); + ok(hr == S_OK, "Failed to process input, hr %#x.\n", hr); + + status = 0; + memset(&buffer, 0, sizeof(buffer)); + buffer.pSample = output_sample; + hr = IMFTransform_ProcessOutput(copier, 0, 1, &buffer, &status); + ok(hr == S_OK, "Failed to get output, hr %#x.\n", hr); + + IMFSample_Release(input_sample); + IMFSample_Release(output_sample); +} + +static void test_sample_copier_output_processing(void) +{ + IMFMediaBuffer *input_buffer, *output_buffer; + MFT_OUTPUT_STREAM_INFO output_info; + IMFMediaType *mediatype; + IMFTransform *copier; + DWORD max_length; + HRESULT hr; + BYTE *ptr; + + hr = MFCreateSampleCopierMFT(&copier); + ok(hr == S_OK, "Failed to create sample copier, hr %#x.\n", hr); + + /* Configure for 16 x 16 of D3DFMT_X8R8G8B8. */ + hr = MFCreateMediaType(&mediatype); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_SUBTYPE, &MFVideoFormat_RGB32); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaType_SetUINT64(mediatype, &MF_MT_FRAME_SIZE, ((UINT64)16) << 32 | 16); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFTransform_SetInputType(copier, 0, mediatype, 0); + ok(hr == S_OK, "Failed to set input type, hr %#x.\n", hr); + + hr = IMFTransform_SetOutputType(copier, 0, mediatype, 0); + ok(hr == S_OK, "Failed to set input type, hr %#x.\n", hr); + + /* Source and destination are linear buffers, destination is twice as large. */ + hr = IMFTransform_GetOutputStreamInfo(copier, 0, &output_info); + ok(hr == S_OK, "Failed to get output info, hr %#x.\n", hr); + + hr = MFCreateAlignedMemoryBuffer(output_info.cbSize, output_info.cbAlignment, &output_buffer); + ok(hr == S_OK, "Failed to create media buffer, hr %#x.\n", hr); + + hr = IMFMediaBuffer_Lock(output_buffer, &ptr, &max_length, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + memset(ptr, 0xcc, max_length); + hr = IMFMediaBuffer_Unlock(output_buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFCreateAlignedMemoryBuffer(output_info.cbSize, output_info.cbAlignment, &input_buffer); + ok(hr == S_OK, "Failed to create media buffer, hr %#x.\n", hr); + + hr = IMFMediaBuffer_Lock(input_buffer, &ptr, &max_length, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + memset(ptr, 0xaa, max_length); + hr = IMFMediaBuffer_Unlock(input_buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaBuffer_SetCurrentLength(input_buffer, 4); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + sample_copier_process(copier, input_buffer, output_buffer); + + hr = IMFMediaBuffer_Lock(output_buffer, &ptr, &max_length, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(ptr[0] == 0xaa && ptr[4] == 0xcc, "Unexpected buffer contents.\n"); + + hr = IMFMediaBuffer_Unlock(output_buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFMediaType_Release(mediatype); + IMFTransform_Release(copier); +} + static void test_MFGetTopoNodeCurrentType(void) { IMFMediaType *media_type, *media_type2; @@ -4020,5 +4122,6 @@ START_TEST(mf) test_MFGetSupportedMimeTypes(); test_MFGetSupportedSchemes(); test_sample_copier(); + test_sample_copier_output_processing(); test_MFGetTopoNodeCurrentType(); }

1 0

Francois Gouget : cryptnet: Fix the spelling of the x-pkcs7-certificates MIME type.
by Alexandre Julliard Nov. 9, 2020

Nov. 9, 2020

Module: wine Branch: master Commit: 44e76ea3c780a7b20be05dc4ae2cdbd79556e61b URL: https://source.winehq.org/git/wine.git/?a=commit;h=44e76ea3c780a7b20be05dc4… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 9 17:45:58 2020 +0100 cryptnet: Fix the spelling of the x-pkcs7-certificates MIME type. This may fix connections to some encrypted websites. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptnet/cryptnet_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 5243481ff28..efcb3dc9ba2 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -888,7 +888,7 @@ static BOOL WINAPI HTTP_RetrieveEncodedObjectW(LPCWSTR pszURL, { L"application/x-x509-ca-cert", L"application/x-x509-email-cert", L"application/x-x509-server-cert", L"application/x-x509-user-cert", - L"application/x-pkcs7-certifcates", L"application/pkix-crl", + L"application/x-pkcs7-certificates", L"application/pkix-crl", L"application/x-pkcs7-crl", L"application/x-pkcs7-signature", L"application/x-pkcs7-mime", NULL };

1 0

Alistair Leslie-Hughes : include: Add interface IGetDataSource.
by Alexandre Julliard Nov. 9, 2020

Nov. 9, 2020

Module: wine Branch: master Commit: da8079b3da16541c1a206798396df786ea16f2e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da8079b3da16541c1a206798… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 12 18:33:40 2020 +1100 include: Add interface IGetDataSource. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/usrmarshal.c | 13 +++++++++++++ include/Makefile.in | 1 + include/getdts.idl | 34 ++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 4 files changed, 49 insertions(+) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 43e3aaeaa1a..2fe4e60b68b 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1576,3 +1576,16 @@ HRESULT __RPC_STUB IColumnsInfo_MapColumnIDs_Stub(IColumnsInfo* This, DBORDINAL FIXME("(%p)->(%lu %p %p %p): stub\n", This, column_ids, dbids, columns, error); return E_NOTIMPL; } + +HRESULT CALLBACK IGetDataSource_GetDataSource_Proxy(IGetDataSource* This, REFIID riid, IUnknown **datasource) +{ + FIXME("(%p)->(%s %p): stub\n", This, debugstr_guid(riid), datasource); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IGetDataSource_GetDataSource_Stub(IGetDataSource* This, REFIID riid, IUnknown **datasource, + IErrorInfo **error) +{ + FIXME("(%p)->(%s %p %p): stub\n", This, debugstr_guid(riid), datasource, error); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index b2c8ba7f987..ea021a4b80a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -307,6 +307,7 @@ SOURCES = \ gdiplusmetaheader.h \ gdipluspixelformats.h \ gdiplustypes.h \ + getdts.idl \ guiddef.h \ hidusage.h \ highlevelmonitorconfigurationapi.h \ diff --git a/include/getdts.idl b/include/getdts.idl new file mode 100644 index 00000000000..40991070cc1 --- /dev/null +++ b/include/getdts.idl @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a75-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IGetDataSource : IUnknown +{ + [local] + HRESULT GetDataSource([in] REFIID riid, [out, iid_is(riid)] IUnknown **datasource); + + [call_as(GetDataSource)] + HRESULT RemoteGetDataSource([in] REFIID riid, [out, iid_is(riid)] IUnknown **datasource, [out] IErrorInfo **error); +} diff --git a/include/oledb.idl b/include/oledb.idl index 537bb211cc5..1ffbefa9ffd 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -69,6 +69,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "binres.idl" #include "crtrow.idl" #include "errrec.idl" +#include "getdts.idl" cpp_quote("#include <accctrl.h>")

1 0

Nikolay Sivov : gdi32: Merge in Uniscribe functionality.
by Alexandre Julliard Nov. 9, 2020

Nov. 9, 2020

Module: wine Branch: master Commit: b9178da5865f42b6192ecc02bd7afff8d4c90a21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9178da5865f42b6192ecc02… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 9 13:04:04 2020 +0300 gdi32: Merge in Uniscribe functionality. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 2 +- dlls/gdi32/Makefile.in | 15 +- dlls/gdi32/gdi32.spec | 38 ++ dlls/{usp10 => gdi32/uniscribe}/bidi.c | 0 dlls/{usp10 => gdi32/uniscribe}/bracket.c | 0 dlls/{usp10 => gdi32/uniscribe}/breaking.c | 0 dlls/gdi32/{ => uniscribe}/direction.c | 0 dlls/{usp10 => gdi32/uniscribe}/indic.c | 0 dlls/{usp10 => gdi32/uniscribe}/indicsyllable.c | 0 dlls/{usp10 => gdi32/uniscribe}/linebreak.c | 0 dlls/{usp10 => gdi32/uniscribe}/mirror.c | 0 dlls/{usp10 => gdi32/uniscribe}/opentype.c | 0 dlls/{usp10 => gdi32/uniscribe}/shape.c | 0 dlls/{usp10 => gdi32/uniscribe}/shaping.c | 0 dlls/{usp10 => gdi32/uniscribe}/usp10.c | 21 +- dlls/{usp10 => gdi32/uniscribe}/usp10_internal.h | 0 dlls/usp10/Makefile.in | 17 - dlls/usp10/direction.c | 426 ----------------------- dlls/usp10/usp10.spec | 76 ++-- tools/make_specfiles | 1 + tools/make_unicode | 13 +- 21 files changed, 114 insertions(+), 495 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b9178da5865f42b6192e…

1 0

Nikolay Sivov : evr/presenter: Fix error handling on object creation.
by Alexandre Julliard Nov. 9, 2020

Nov. 9, 2020

Module: wine Branch: master Commit: c528ef47ebb9b3ee9399928d4a53927ffca96cb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c528ef47ebb9b3ee9399928d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 9 15:02:44 2020 +0300 evr/presenter: Fix error handling on object creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 1b98e63a49a..335e5df2459 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -1207,13 +1207,18 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) InitializeCriticalSection(&object->cs); if (FAILED(hr = DXVA2CreateDirect3DDeviceManager9(&object->reset_token, &object->device_manager))) - IUnknown_Release(&object->IUnknown_inner); + goto failed; if (FAILED(hr = video_presenter_init_d3d(object))) - IUnknown_Release(&object->IUnknown_inner); + goto failed; - if (SUCCEEDED(hr)) - *out = &object->IUnknown_inner; + *out = &object->IUnknown_inner; + + return S_OK; + +failed: + + IUnknown_Release(&object->IUnknown_inner); return hr; }

1 0

Damjan Jovanovic : ntdll: Improve character device type detection on FreeBSD and macOS.
by Alexandre Julliard Nov. 9, 2020

Nov. 9, 2020

Module: wine Branch: master Commit: bf8da00ee02ea33c4a7d0a9a5fc32c2a4e08866e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf8da00ee02ea33c4a7d0a9a… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Nov 9 03:47:21 2020 +0200 ntdll: Improve character device type detection on FreeBSD and macOS. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/ntdll/unix/file.c | 28 ++++++++++++++++++++++++++++ include/config.h.in | 3 +++ 4 files changed, 33 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 943d4c5d8f4..2d92f52b4c6 100755 --- a/configure +++ b/configure @@ -7589,7 +7589,7 @@ fi -for ac_header in sys/mount.h sys/statfs.h sys/user.h sys/vfs.h +for ac_header in sys/conf.h sys/mount.h sys/statfs.h sys/user.h sys/vfs.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <sys/types.h> diff --git a/configure.ac b/configure.ac index 923d5e3b0f3..666219f5f36 100644 --- a/configure.ac +++ b/configure.ac @@ -540,7 +540,7 @@ AC_HEADER_STAT() dnl **** Checks for headers that depend on other ones **** -AC_CHECK_HEADERS([sys/mount.h sys/statfs.h sys/user.h sys/vfs.h],,, +AC_CHECK_HEADERS([sys/conf.h sys/mount.h sys/statfs.h sys/user.h sys/vfs.h],,, [#include <sys/types.h> #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index d12a3ffb119..d6a7b0c1550 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -99,6 +99,9 @@ #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> #endif +#ifdef HAVE_SYS_CONF_H +#include <sys/conf.h> +#endif #ifdef HAVE_SYS_MOUNT_H #include <sys/mount.h> #endif @@ -6065,6 +6068,31 @@ static NTSTATUS get_device_info( int fd, FILE_FS_DEVICE_INFORMATION *info ) info->DeviceType = FILE_DEVICE_TAPE; break; } +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) + { + int d_type; + if (ioctl(fd, FIODTYPE, &d_type) == 0) + { + switch(d_type) + { + case D_TAPE: + info->DeviceType = FILE_DEVICE_TAPE; + break; + case D_DISK: + info->DeviceType = FILE_DEVICE_DISK; + break; + case D_TTY: + info->DeviceType = FILE_DEVICE_SERIAL_PORT; + break; +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + case D_MEM: + info->DeviceType = FILE_DEVICE_NULL; + break; +#endif + } + /* no special d_type for parallel ports */ + } + } #endif } else if (S_ISBLK( st.st_mode )) diff --git a/include/config.h.in b/include/config.h.in index 4adb6325e14..9b52424ae85 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1001,6 +1001,9 @@ /* Define to 1 if you have the <sys/cdio.h> header file. */ #undef HAVE_SYS_CDIO_H +/* Define to 1 if you have the <sys/conf.h> header file. */ +#undef HAVE_SYS_CONF_H + /* Define to 1 if you have the <sys/epoll.h> header file. */ #undef HAVE_SYS_EPOLL_H

1 0

Damjan Jovanovic : ntdll: Implement get_thread_times() on FreeBSD.
by Alexandre Julliard Nov. 9, 2020

Nov. 9, 2020

Module: wine Branch: master Commit: a563f584f544cd75b86738c1aa061dd47851684f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a563f584f544cd75b86738c1… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Nov 7 09:21:20 2020 +0200 ntdll: Implement get_thread_times() on FreeBSD. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 2 +- dlls/ntdll/unix/thread.c | 54 +++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 50 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index f39ffb42c6f..02eb5f1d871 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -3,7 +3,7 @@ MODULE = ntdll.dll IMPORTLIB = ntdll IMPORTS = winecrt0 EXTRAINCL = $(UNWIND_CFLAGS) -EXTRALIBS = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) +EXTRALIBS = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS) EXTRADLLFLAGS = -mno-cygwin -nodefaultlibs -Wl,--image-base,0x7bc00000 C_SRCS = \ diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index a161c5d1c90..8c91f49690b 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -43,6 +43,21 @@ #ifdef HAVE_SYS_SYSCALL_H #include <sys/syscall.h> #endif +#ifdef HAVE_SYS_SYSCTL_H +#include <sys/sysctl.h> +#endif +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif +#ifdef HAVE_SYS_QUEUE_H +#include <sys/queue.h> +#endif +#ifdef HAVE_SYS_USER_H +#include <sys/user.h> +#endif +#ifdef HAVE_LIBPROCSTAT_H +#include <libprocstat.h> +#endif #define NONAMELESSUNION #include "ntstatus.h" @@ -790,9 +805,9 @@ static void wow64_context_to_server( context_t *to, const WOW64_CONTEXT *from ) #endif /* __x86_64__ */ -#ifdef linux BOOL get_thread_times(int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, LARGE_INTEGER *user_time) { +#ifdef linux unsigned long clocks_per_sec = sysconf( _SC_CLK_TCK ); unsigned long usr, sys; const char *pos; @@ -837,15 +852,44 @@ BOOL get_thread_times(int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, LA ERR("Failed to parse %s\n", debugstr_a(buf)); return FALSE; -} +#elif defined(HAVE_LIBPROCSTAT) + struct procstat *pstat; + struct kinfo_proc *kip; + unsigned int proc_count; + BOOL ret = FALSE; + + pstat = procstat_open_sysctl(); + if (!pstat) + return FALSE; + if (unix_tid == -1) + kip = procstat_getprocs(pstat, KERN_PROC_PID, unix_pid, &proc_count); + else + kip = procstat_getprocs(pstat, KERN_PROC_PID | KERN_PROC_INC_THREAD, unix_pid, &proc_count); + if (kip) + { + unsigned int i; + for (i = 0; i < proc_count; i++) + { + if (unix_tid == -1 || kip[i].ki_tid == unix_tid) + { + kernel_time->QuadPart = 10000000 * (ULONGLONG)kip[i].ki_rusage.ru_stime.tv_sec + + 10 * (ULONGLONG)kip[i].ki_rusage.ru_stime.tv_usec; + user_time->QuadPart = 10000000 * (ULONGLONG)kip[i].ki_rusage.ru_utime.tv_sec + + 10 * (ULONGLONG)kip[i].ki_rusage.ru_utime.tv_usec; + ret = TRUE; + break; + } + } + procstat_freeprocs(pstat, kip); + } + procstat_close(pstat); + return ret; #else -BOOL get_thread_times(int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, LARGE_INTEGER *user_time) -{ static int once; if (!once++) FIXME("not implemented on this platform\n"); return FALSE; -} #endif +} /****************************************************************************** * NtQueryInformationThread (NTDLL.@)

1 0

Brendan Shanks : winecoreaudio.drv: Only read 'length' bytes from received MIDIPackets.
by Alexandre Julliard Nov. 9, 2020

Nov. 9, 2020

Module: wine Branch: master Commit: 1fc8a8f234e5f46f0d37c173719a8727f0822a88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fc8a8f234e5f46f0d37c173… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Oct 28 17:29:13 2020 -0700 winecoreaudio.drv: Only read 'length' bytes from received MIDIPackets. The Core MIDI MIDIPacket struct is declared with a 256-byte data array, but this is just for convenience. There may be only one accessible byte, or there may be more than 256. Only read 'length' bytes from the packet, and correctly handle a length > 256. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coremidi.c | 7 ++----- dlls/winecoreaudio.drv/coremidi.h | 8 +------- dlls/winecoreaudio.drv/midi.c | 18 +++++++++++++++--- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 5ec564603a9..94761b05c4f 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -57,15 +57,12 @@ void CoreMIDI_GetObjectName(MIDIObjectRef obj, char *name, int size) void MIDIIn_ReadProc(const MIDIPacketList *pktlist, void *refCon, void *connRefCon) { unsigned int i; - MIDIMessage msg; MIDIPacket *packet = (MIDIPacket *)pktlist->packet; for (i = 0; i < pktlist->numPackets; ++i) { - msg.devID = *((UInt16 *)connRefCon); - msg.length = packet->length; - memcpy(msg.data, packet->data, sizeof(packet->data)); + UInt16 devID = *((UInt16 *)connRefCon); - MIDIIn_SendMessage(msg); + MIDIIn_SendMessage(devID, packet->data, packet->length); packet = MIDIPacketNext(packet); } diff --git a/dlls/winecoreaudio.drv/coremidi.h b/dlls/winecoreaudio.drv/coremidi.h index c93edc6c31d..3433a1d4342 100644 --- a/dlls/winecoreaudio.drv/coremidi.h +++ b/dlls/winecoreaudio.drv/coremidi.h @@ -65,12 +65,6 @@ extern int AudioUnit_SetVolume(AudioUnit au, float left, float right); extern int AudioUnit_GetVolume(AudioUnit au, float *left, float *right); #endif -typedef struct { - UInt16 devID; - UInt16 length; - Byte data[256]; -} MIDIMessage; - /* coremidi.c */ extern MIDIClientRef CoreMIDI_CreateClient(CFStringRef name); extern void CoreMIDI_GetObjectName(MIDIObjectRef obj, char *name, int size); @@ -79,6 +73,6 @@ extern void MIDIIn_ReadProc(const MIDIPacketList *pktlist, void *refCon, void *c extern void MIDIOut_Send(MIDIPortRef port, MIDIEndpointRef dest, UInt8 *buffer, unsigned length); /* midi.c */ -void MIDIIn_SendMessage(MIDIMessage msg); +void MIDIIn_SendMessage(UInt16 devID, const void *buffer, UInt16 length); #endif diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index edaf1283124..c299d116f12 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -78,6 +78,12 @@ typedef struct tagMIDISource { DWORD startTime; } MIDISource; +typedef struct { + UInt16 devID; + UInt16 length; + Byte data[]; +} MIDIMessage; + static CRITICAL_SECTION midiInLock; /* Critical section for MIDI In */ static CFStringRef MIDIInThreadPortName = NULL; @@ -797,16 +803,22 @@ static DWORD MIDIIn_Reset(WORD wDevID) * Call from CoreMIDI IO threaded callback, * we can't call Wine debug channels, critical section or anything using NtCurrentTeb here. */ -void MIDIIn_SendMessage(MIDIMessage msg) +void MIDIIn_SendMessage(UInt16 devID, const void *buffer, UInt16 length) { - CFDataRef data; + MIDIMessage msg; + CFMutableDataRef data; CFMessagePortRef messagePort; messagePort = CFMessagePortCreateRemote(kCFAllocatorDefault, MIDIInThreadPortName); - data = CFDataCreate(kCFAllocatorDefault, (UInt8 *) &msg, sizeof(msg)); + msg.devID = devID; + msg.length = length; + + data = CFDataCreateMutable(kCFAllocatorDefault, sizeof(msg) + length); if (data) { + CFDataAppendBytes(data, (UInt8 *) &msg, sizeof(msg)); + CFDataAppendBytes(data, buffer, length); CFMessagePortSendRequest(messagePort, 0, data, 0.0, 0.0, NULL, NULL); CFRelease(data); }

1 0

Ziqing Hui : windowscodecs: Correctly set pixel format of uncompressed DDS with extended header.
by Alexandre Julliard Nov. 9, 2020

Nov. 9, 2020

Module: wine Branch: master Commit: 3b531c06e009a15d0f77c55bf724d4772ae68038 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b531c06e009a15d0f77c55b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Nov 6 11:43:47 2020 +0800 windowscodecs: Correctly set pixel format of uncompressed DDS with extended header. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 36 ++++++++++++++++++++++++++++++++---- dlls/windowscodecs/tests/ddsformat.c | 5 ----- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 9e6886e7ea7..d0932767d6f 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -251,7 +251,24 @@ static struct dds_format { &GUID_WICPixelFormatUndefined, 0, DXGI_FORMAT_R8G8_UNORM }, { { sizeof(DDS_PIXELFORMAT), DDPF_LUMINANCE, 0, 8, 0xFF,0,0,0 }, &GUID_WICPixelFormat8bppGray, 8, DXGI_FORMAT_R8_UNORM }, - { { 0 }, &GUID_WICPixelFormatUndefined, 0, DXGI_FORMAT_UNKNOWN } + { { 0 }, &GUID_WICPixelFormat8bppAlpha, 8, DXGI_FORMAT_A8_UNORM }, + { { 0 }, &GUID_WICPixelFormat8bppGray, 8, DXGI_FORMAT_R8_UNORM }, + { { 0 }, &GUID_WICPixelFormat16bppGray, 16, DXGI_FORMAT_R16_UNORM }, + { { 0 }, &GUID_WICPixelFormat16bppGrayHalf, 16, DXGI_FORMAT_R16_FLOAT }, + { { 0 }, &GUID_WICPixelFormat16bppBGR565, 16, DXGI_FORMAT_B5G6R5_UNORM }, + { { 0 }, &GUID_WICPixelFormat16bppBGRA5551, 16, DXGI_FORMAT_B5G5R5A1_UNORM }, + { { 0 }, &GUID_WICPixelFormat32bppGrayFloat, 32, DXGI_FORMAT_R32_FLOAT }, + { { 0 }, &GUID_WICPixelFormat32bppRGBA, 32, DXGI_FORMAT_R8G8B8A8_UNORM }, + { { 0 }, &GUID_WICPixelFormat32bppBGRA, 32, DXGI_FORMAT_B8G8R8A8_UNORM }, + { { 0 }, &GUID_WICPixelFormat32bppBGR, 32, DXGI_FORMAT_B8G8R8X8_UNORM }, + { { 0 }, &GUID_WICPixelFormat32bppR10G10B10A2, 32, DXGI_FORMAT_R10G10B10A2_UNORM }, + { { 0 }, &GUID_WICPixelFormat32bppRGBE, 32, DXGI_FORMAT_R9G9B9E5_SHAREDEXP }, + { { 0 }, &GUID_WICPixelFormat32bppRGBA1010102XR, 32, DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM }, + { { 0 }, &GUID_WICPixelFormat64bppRGBA, 64, DXGI_FORMAT_R16G16B16A16_UNORM }, + { { 0 }, &GUID_WICPixelFormat64bppRGBAHalf, 64, DXGI_FORMAT_R16G16B16A16_FLOAT }, + { { 0 }, &GUID_WICPixelFormat96bppRGBFloat, 96, DXGI_FORMAT_R32G32B32_FLOAT }, + { { 0 }, &GUID_WICPixelFormat128bppRGBAFloat, 128, DXGI_FORMAT_R32G32B32A32_FLOAT }, + { { 0 }, &GUID_WICPixelFormatUndefined, 0, DXGI_FORMAT_UNKNOWN } }; static DXGI_FORMAT compressed_formats[] = { @@ -449,6 +466,18 @@ static UINT get_bytes_per_block_from_format(DXGI_FORMAT format) } } +static const GUID *dxgi_format_to_wic_format(DXGI_FORMAT dxgi_format) +{ + UINT i; + for (i = 0; i < ARRAY_SIZE(dds_format_table); i++) + { + if (dds_format_table[i].pixel_format.size == 0 && + dds_format_table[i].dxgi_format == dxgi_format) + return dds_format_table[i].wic_format; + } + return &GUID_WICPixelFormatUndefined; +} + static BOOL is_compressed(DXGI_FORMAT format) { UINT i; @@ -485,9 +514,8 @@ static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *h &GUID_WICPixelFormat32bppPBGRA : &GUID_WICPixelFormat32bppBGRA; info->pixel_format_bpp = 32; } else { - info->pixel_format = &GUID_WICPixelFormatUndefined; - info->pixel_format_bpp = 0; - FIXME("Pixel format is incorrect for uncompressed DDS image with extended header\n"); + info->pixel_format = dxgi_format_to_wic_format(info->format); + info->pixel_format_bpp = get_bytes_per_block_from_format(info->format) * 8; } } else { format_info = get_dds_format(&header->ddspf); diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 2e7304b9d42..b7b002d380d 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -941,7 +941,6 @@ static void test_dds_decoder_frame_properties(IWICBitmapFrameDecode *frame_decod hr = IWICBitmapFrameDecode_GetPixelFormat(frame_decode, &pixel_format); ok(hr == S_OK, "Test %u, frame %u: GetPixelFormat failed, hr %#x\n", i, frame_index, hr); if (hr != S_OK) return; - todo_wine_if(IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat96bppRGBFloat)) ok(IsEqualGUID(&pixel_format, test_data[i].expected_pixel_format), "Test %u, frame %u: Expected pixel format %s, got %s\n", i, frame_index, debugstr_guid(test_data[i].expected_pixel_format), debugstr_guid(&pixel_format)); @@ -1076,7 +1075,6 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, 0, 0, NULL); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); - todo_wine_if(IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat96bppRGBFloat)) { hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect_test_a, stride, sizeof(buffer), buffer); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect_test_b, stride, sizeof(buffer), buffer); @@ -1113,7 +1111,6 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride, stride * rect.Height, buffer); ok(hr == S_OK, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); - } hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride, sizeof(buffer), NULL); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); @@ -1126,7 +1123,6 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra memcpy(pixels, test_data[i].data + block_offset, frame_size); } - todo_wine_if(IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat96bppRGBFloat)) { memset(buffer, 0, sizeof(buffer)); hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride, sizeof(buffer), buffer); ok(hr == S_OK, "Test %u, frame %u: CopyPixels failed, hr %#x\n", i, frame_index, hr); @@ -1152,7 +1148,6 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra "Test %u, frame %u: Pixels mismatch\n", i, frame_index); }; } - } } static void test_dds_decoder_frame(IWICBitmapDecoder *decoder, int i)

1 0