wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Piotr Caban : hidclass.sys: Set LinkUsage field in build_elements function.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 37d129e8fe21c8b1c86ba7f61b61e87ca1268169 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37d129e8fe21c8b1c86ba7f6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 3 12:00:43 2019 +0200 hidclass.sys: Set LinkUsage field in build_elements function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index adf9a98..279d8dd 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -714,6 +714,7 @@ static void build_elements(WINE_HID_REPORT *wine_report, struct feature* feature wine_element->caps.button.ReportID = feature->caps.ReportID; wine_element->caps.button.BitField = feature->BitField; wine_element->caps.button.LinkCollection = feature->collection->index; + wine_element->caps.button.LinkUsage = feature->collection->caps.u.NotRange.Usage[0]; wine_element->caps.button.LinkUsagePage = feature->collection->caps.UsagePage; wine_element->caps.button.IsRange = feature->caps.IsRange; wine_element->caps.button.IsStringRange = feature->caps.IsStringRange; @@ -751,6 +752,7 @@ static void build_elements(WINE_HID_REPORT *wine_report, struct feature* feature wine_element->caps.value.ReportID = feature->caps.ReportID; wine_element->caps.value.BitField = feature->BitField; wine_element->caps.value.LinkCollection = feature->collection->index; + wine_element->caps.value.LinkUsage = feature->collection->caps.u.NotRange.Usage[0]; wine_element->caps.value.LinkUsagePage = feature->collection->caps.UsagePage; wine_element->caps.value.IsRange = feature->caps.IsRange; wine_element->caps.value.IsStringRange = feature->caps.IsStringRange;

1 0

Piotr Caban : hidclass.sys: Set LinkUsagePage field in build_elements function.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 31cd586c8cfc679441be2e3e54735df1c6b46fa1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31cd586c8cfc679441be2e3e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 3 12:00:38 2019 +0200 hidclass.sys: Set LinkUsagePage field in build_elements function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 90ba3d1..adf9a98 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -714,6 +714,7 @@ static void build_elements(WINE_HID_REPORT *wine_report, struct feature* feature wine_element->caps.button.ReportID = feature->caps.ReportID; wine_element->caps.button.BitField = feature->BitField; wine_element->caps.button.LinkCollection = feature->collection->index; + wine_element->caps.button.LinkUsagePage = feature->collection->caps.UsagePage; wine_element->caps.button.IsRange = feature->caps.IsRange; wine_element->caps.button.IsStringRange = feature->caps.IsStringRange; wine_element->caps.button.IsDesignatorRange = feature->caps.IsDesignatorRange; @@ -750,6 +751,7 @@ static void build_elements(WINE_HID_REPORT *wine_report, struct feature* feature wine_element->caps.value.ReportID = feature->caps.ReportID; wine_element->caps.value.BitField = feature->BitField; wine_element->caps.value.LinkCollection = feature->collection->index; + wine_element->caps.value.LinkUsagePage = feature->collection->caps.UsagePage; wine_element->caps.value.IsRange = feature->caps.IsRange; wine_element->caps.value.IsStringRange = feature->caps.IsStringRange; wine_element->caps.value.IsDesignatorRange = feature->caps.IsDesignatorRange;

1 0

Piotr Caban : hidclass.sys: Set LinkCollection field in build_elements function.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 5c01898c9d07c8bafbfa5a527d5181ef843c61bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c01898c9d07c8bafbfa5a52… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 3 12:00:28 2019 +0200 hidclass.sys: Set LinkCollection field in build_elements function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 09f9401..90ba3d1 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -713,6 +713,7 @@ static void build_elements(WINE_HID_REPORT *wine_report, struct feature* feature wine_element->caps.button.UsagePage = feature->caps.UsagePage; wine_element->caps.button.ReportID = feature->caps.ReportID; wine_element->caps.button.BitField = feature->BitField; + wine_element->caps.button.LinkCollection = feature->collection->index; wine_element->caps.button.IsRange = feature->caps.IsRange; wine_element->caps.button.IsStringRange = feature->caps.IsStringRange; wine_element->caps.button.IsDesignatorRange = feature->caps.IsDesignatorRange; @@ -748,6 +749,7 @@ static void build_elements(WINE_HID_REPORT *wine_report, struct feature* feature wine_element->caps.value.UsagePage = feature->caps.UsagePage; wine_element->caps.value.ReportID = feature->caps.ReportID; wine_element->caps.value.BitField = feature->BitField; + wine_element->caps.value.LinkCollection = feature->collection->index; wine_element->caps.value.IsRange = feature->caps.IsRange; wine_element->caps.value.IsStringRange = feature->caps.IsStringRange; wine_element->caps.value.IsDesignatorRange = feature->caps.IsDesignatorRange;

1 0

Piotr Caban : hid: Only set first usage in an array in HidP_SetUsageValue.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 028e1ee3db8232c5e92533dda99e936cd694b3d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=028e1ee3db8232c5e92533dd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 3 11:59:13 2019 +0200 hid: Only set first usage in an array in HidP_SetUsageValue. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index bfdc888..2c4e98a 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -263,6 +263,7 @@ static NTSTATUS find_value(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT else if (report->Elements[i].caps.value.u.NotRange.Usage == Usage) { *element = report->Elements[i]; + element->bitCount = value->BitSize; return HIDP_STATUS_SUCCESS; } }

1 0

Piotr Caban : hid: Add support for ranges in find_value.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 6249de6e5d3e5f781a023e925c59672f1a3171d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6249de6e5d3e5f781a023e92… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 3 11:59:06 2019 +0200 hid: Add support for ranges in find_value. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index e4d4820..bfdc888 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -199,7 +199,7 @@ NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, static NTSTATUS find_value(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, - WINE_HID_ELEMENT **element) + WINE_HID_ELEMENT *element) { PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; WINE_HID_REPORT *report = NULL; @@ -247,11 +247,22 @@ static NTSTATUS find_value(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT for (i = 0; i < report->elementCount; i++) { - if (report->Elements[i].ElementType == ValueElement && - report->Elements[i].caps.value.UsagePage == UsagePage && - report->Elements[i].caps.value.u.NotRange.Usage == Usage) + HIDP_VALUE_CAPS *value = &report->Elements[i].caps.value; + + if (report->Elements[i].ElementType != ValueElement || + value->UsagePage != UsagePage) + continue; + + if (value->IsRange && value->u.Range.UsageMin <= Usage && Usage <= value->u.Range.UsageMax) + { + *element = report->Elements[i]; + element->valueStartBit += value->BitSize * (Usage - value->u.Range.UsageMin); + element->bitCount = value->BitSize; + return HIDP_STATUS_SUCCESS; + } + else if (report->Elements[i].caps.value.u.NotRange.Usage == Usage) { - *element = &report->Elements[i]; + *element = report->Elements[i]; return HIDP_STATUS_SUCCESS; } } @@ -289,7 +300,7 @@ NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE Usag PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength) { NTSTATUS rc; - WINE_HID_ELEMENT *element; + WINE_HID_ELEMENT element; TRACE("(%i, %x, %i, %i, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, PreparsedData, Report, ReportLength); @@ -299,10 +310,10 @@ NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE Usag { ULONG rawValue; rc = get_report_data((BYTE*)Report, ReportLength, - element->valueStartBit, element->bitCount, &rawValue); + element.valueStartBit, element.bitCount, &rawValue); if (rc != HIDP_STATUS_SUCCESS) return rc; - *UsageValue = logical_to_physical(sign_extend(rawValue, element), element); + *UsageValue = logical_to_physical(sign_extend(rawValue, &element), &element); } return rc; @@ -313,7 +324,7 @@ NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USAGE Usage, PULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength) { - WINE_HID_ELEMENT *element; + WINE_HID_ELEMENT element; NTSTATUS rc; TRACE("(%i, %x, %i, %i, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, @@ -324,7 +335,7 @@ NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, if (rc == HIDP_STATUS_SUCCESS) { return get_report_data((BYTE*)Report, ReportLength, - element->valueStartBit, element->bitCount, UsageValue); + element.valueStartBit, element.bitCount, UsageValue); } return rc; @@ -598,7 +609,7 @@ NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USAGE Usage, ULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength) { - WINE_HID_ELEMENT *element; + WINE_HID_ELEMENT element; NTSTATUS rc; TRACE("(%i, %x, %i, %i, %i, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, @@ -609,7 +620,7 @@ NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, if (rc == HIDP_STATUS_SUCCESS) { return set_report_data((BYTE*)Report, ReportLength, - element->valueStartBit, element->bitCount, UsageValue); + element.valueStartBit, element.bitCount, UsageValue); } return rc; @@ -620,7 +631,7 @@ NTSTATUS WINAPI HidP_SetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USH PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength) { - WINE_HID_ELEMENT *element; + WINE_HID_ELEMENT element; NTSTATUS rc; ULONG i; @@ -634,7 +645,7 @@ NTSTATUS WINAPI HidP_SetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USH if (rc == HIDP_STATUS_SUCCESS) { rc = set_report_data((BYTE*)Report, ReportLength, - element->valueStartBit, element->bitCount, -1); + element.valueStartBit, element.bitCount, -1); if (rc != HIDP_STATUS_SUCCESS) {

1 0

Piotr Caban : hid: Add HidP_SetUsages implementation.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: c5d704334fc1f179900a4e1c4433f5ccbbc0541f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5d704334fc1f179900a4e1c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 3 11:59:02 2019 +0200 hid: Add HidP_SetUsages implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 5714d6c..b50e04d 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -38,7 +38,7 @@ @ stub HidP_SetScaledUsageValue @ stdcall HidP_SetUsageValue(long long long long long ptr ptr long) @ stub HidP_SetUsageValueArray -@ stub HidP_SetUsages +@ stdcall HidP_SetUsages(long long long ptr ptr ptr ptr long) @ stdcall HidP_TranslateUsagesToI8042ScanCodes(ptr long long ptr ptr ptr) @ stub HidP_UnsetUsages @ stub HidP_UsageListDifference diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 7c58426..e4d4820 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -616,6 +616,38 @@ NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, } +NTSTATUS WINAPI HidP_SetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, + PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, + PCHAR Report, ULONG ReportLength) +{ + WINE_HID_ELEMENT *element; + NTSTATUS rc; + ULONG i; + + TRACE("(%i, %x, %i, %p, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, UsageList, + UsageLength, PreparsedData, Report, ReportLength); + + for (i = 0; i < *UsageLength; i++) + { + rc = find_value(ReportType, UsagePage, LinkCollection, + UsageList[i], PreparsedData, Report, &element); + if (rc == HIDP_STATUS_SUCCESS) + { + rc = set_report_data((BYTE*)Report, ReportLength, + element->valueStartBit, element->bitCount, -1); + + if (rc != HIDP_STATUS_SUCCESS) + { + *UsageLength = i; + return rc; + } + } + } + + return HIDP_STATUS_SUCCESS; +} + + NTSTATUS WINAPI HidP_TranslateUsagesToI8042ScanCodes(USAGE *ChangedUsageList, ULONG UsageListLength, HIDP_KEYBOARD_DIRECTION KeyAction, HIDP_KEYBOARD_MODIFIER_STATE *ModifierState,

1 0

Nikolay Sivov : mfplat: Implement IsEndOfStream() for file stream.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 52f374ad50b1ab9431c0ef7f913afc283a389827 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52f374ad50b1ab9431c0ef7f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 6 13:52:18 2019 +0300 mfplat: Implement IsEndOfStream() for file stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 0e21497..61521ce 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2648,16 +2648,25 @@ static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWOR return E_NOTIMPL; } -static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *endstream) +static HRESULT WINAPI bytestream_file_IsEndOfStream(IMFByteStream *iface, BOOL *ret) { - mfbytestream *This = impl_from_IMFByteStream(iface); + struct bytestream *stream = impl_from_IMFByteStream(iface); + LARGE_INTEGER position, length; + HRESULT hr = S_OK; - FIXME("%p, %p\n", This, endstream); + TRACE("%p, %p.\n", iface, ret); - if(endstream) - *endstream = TRUE; + EnterCriticalSection(&stream->cs); - return S_OK; + position.QuadPart = 0; + if (SetFilePointerEx(stream->hfile, position, &length, FILE_END)) + *ret = stream->position >= length.QuadPart; + else + hr = HRESULT_FROM_WIN32(GetLastError()); + + LeaveCriticalSection(&stream->cs); + + return hr; } static HRESULT WINAPI bytestream_file_Read(IMFByteStream *iface, BYTE *buffer, ULONG size, ULONG *read_len) @@ -2771,7 +2780,7 @@ static const IMFByteStreamVtbl bytestream_file_vtbl = mfbytestream_SetLength, mfbytestream_GetCurrentPosition, mfbytestream_SetCurrentPosition, - mfbytestream_IsEndOfStream, + bytestream_file_IsEndOfStream, bytestream_file_Read, bytestream_BeginRead, bytestream_EndRead,

1 0

Nikolay Sivov : mfplat: Implement Read() for file-based stream.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 6da78ff6dd49dac742c709a993fcd7aff4d90999 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6da78ff6dd49dac742c709a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 6 13:52:17 2019 +0300 mfplat: Implement Read() for file-based stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 8efe680..0e21497 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2660,13 +2660,30 @@ static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *end return S_OK; } -static HRESULT WINAPI mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) +static HRESULT WINAPI bytestream_file_Read(IMFByteStream *iface, BYTE *buffer, ULONG size, ULONG *read_len) { - mfbytestream *This = impl_from_IMFByteStream(iface); + struct bytestream *stream = impl_from_IMFByteStream(iface); + LARGE_INTEGER position; + HRESULT hr = S_OK; + BOOL ret; + + TRACE("%p, %p, %u, %p.\n", iface, buffer, size, read_len); - FIXME("%p, %p, %u, %p\n", This, data, count, byte_read); + EnterCriticalSection(&stream->cs); - return E_NOTIMPL; + position.QuadPart = stream->position; + if ((ret = SetFilePointerEx(stream->hfile, position, NULL, FILE_BEGIN))) + { + if ((ret = ReadFile(stream->hfile, buffer, size, read_len, NULL))) + stream->position += *read_len; + } + + if (!ret) + hr = HRESULT_FROM_WIN32(GetLastError()); + + LeaveCriticalSection(&stream->cs); + + return hr; } static HRESULT WINAPI bytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG size, IMFAsyncCallback *callback, @@ -2744,7 +2761,7 @@ static HRESULT WINAPI mfbytestream_Close(IMFByteStream *iface) return E_NOTIMPL; } -static const IMFByteStreamVtbl mfbytestream_vtbl = +static const IMFByteStreamVtbl bytestream_file_vtbl = { bytestream_QueryInterface, bytestream_AddRef, @@ -2755,7 +2772,7 @@ static const IMFByteStreamVtbl mfbytestream_vtbl = mfbytestream_GetCurrentPosition, mfbytestream_SetCurrentPosition, mfbytestream_IsEndOfStream, - mfbytestream_Read, + bytestream_file_Read, bytestream_BeginRead, bytestream_EndRead, mfbytestream_Write, @@ -3209,16 +3226,14 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open LPCWSTR url, IMFByteStream **bytestream) { DWORD capabilities = MFBYTESTREAM_IS_SEEKABLE | MFBYTESTREAM_DOES_NOT_USE_NETWORK; - struct bytestream *object; - DWORD fileaccessmode = 0; + DWORD filecreation_disposition = 0, fileaccessmode = 0, fileattributes = 0; DWORD filesharemode = FILE_SHARE_READ; - DWORD filecreation_disposition = 0; - DWORD fileattributes = 0; + struct bytestream *object; FILETIME writetime; HANDLE file; HRESULT hr; - FIXME("(%d, %d, %d, %s, %p): stub\n", accessmode, openmode, flags, debugstr_w(url), bytestream); + TRACE("%d, %d, %#x, %s, %p.\n", accessmode, openmode, flags, debugstr_w(url), bytestream); switch (accessmode) { @@ -3279,7 +3294,7 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open heap_free(object); return hr; } - object->IMFByteStream_iface.lpVtbl = &mfbytestream_vtbl; + object->IMFByteStream_iface.lpVtbl = &bytestream_file_vtbl; object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; object->IMFGetService_iface.lpVtbl = &bytestream_file_getservice_vtbl; object->read_callback.lpVtbl = &bytestream_file_read_callback_vtbl;

1 0

Nikolay Sivov : mfplat: Improve SetGUID() traces.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 59599486c8064ffab68bf4bfed7f2d76ec5f27d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59599486c8064ffab68bf4bf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 6 13:52:16 2019 +0300 mfplat: Improve SetGUID() traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 2 +- dlls/mfplat/main.c | 2 +- dlls/mfplat/mediatype.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 0d912a7..b0b5ccc 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -483,7 +483,7 @@ static HRESULT WINAPI sample_SetGUID(IMFSample *iface, REFGUID key, REFGUID valu { struct sample *sample = impl_from_IMFSample(iface); - TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_guid(value)); + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_mf_guid(value)); return attributes_SetGUID(&sample->attributes, key, value); } diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 74b609b..8efe680 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -5705,7 +5705,7 @@ static HRESULT WINAPI mfmediaevent_SetGUID(IMFMediaEvent *iface, REFGUID key, RE { struct media_event *event = impl_from_IMFMediaEvent(iface); - TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_guid(value)); + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_mf_guid(value)); return attributes_SetGUID(&event->attributes, key, value); } diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index e522e90..e23ebd1 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -324,7 +324,7 @@ static HRESULT WINAPI mediatype_SetGUID(IMFMediaType *iface, REFGUID key, REFGUI { struct media_type *media_type = impl_from_IMFMediaType(iface); - TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_guid(value)); + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_mf_guid(value)); return attributes_SetGUID(&media_type->attributes, key, value); } @@ -871,7 +871,7 @@ static HRESULT WINAPI stream_descriptor_SetGUID(IMFStreamDescriptor *iface, REFG { struct stream_desc *stream_desc = impl_from_IMFStreamDescriptor(iface); - TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_guid(value)); + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_mf_guid(value)); return attributes_SetGUID(&stream_desc->attributes, key, value); } @@ -1450,7 +1450,7 @@ static HRESULT WINAPI presentation_descriptor_SetGUID(IMFPresentationDescriptor { struct presentation_desc *presentation_desc = impl_from_IMFPresentationDescriptor(iface); - TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_guid(value)); + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_mf_guid(value)); return attributes_SetGUID(&presentation_desc->attributes, key, value); }

1 0

Nikolay Sivov : mf: Implement SetObject()/GetObject() for topology node.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: c1d023565af92b9e3d3cc6c198191e652616f47e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1d023565af92b9e3d3cc6c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 6 13:52:15 2019 +0300 mf: Implement SetObject()/GetObject() for topology node. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/Makefile.in | 2 +- dlls/mf/tests/mf.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/topology.c | 78 +++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 158 insertions(+), 5 deletions(-) diff --git a/dlls/mf/tests/Makefile.in b/dlls/mf/tests/Makefile.in index f233cff..bdb493c 100644 --- a/dlls/mf/tests/Makefile.in +++ b/dlls/mf/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mf.dll -IMPORTS = mf mfplat +IMPORTS = mf mfplat mfuuid C_SRCS = \ mf.c diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 059062f..cea5f98 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -27,6 +27,12 @@ #include "winbase.h" #include "initguid.h" +#include "ole2.h" + +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + +#undef INITGUID +#include <guiddef.h> #include "mfapi.h" #include "mferror.h" #include "mfidl.h" @@ -35,11 +41,45 @@ DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); +static HRESULT WINAPI test_unk_QueryInterface(IUnknown *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_unk_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI test_unk_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl test_unk_vtbl = +{ + test_unk_QueryInterface, + test_unk_AddRef, + test_unk_Release, +}; + static void test_topology(void) { IMFCollection *collection, *collection2; + IUnknown test_unk2 = { &test_unk_vtbl }; + IUnknown test_unk = { &test_unk_vtbl }; IMFTopologyNode *node, *node2, *node3; IMFTopology *topology, *topology2; + UINT32 attr_count; + IUnknown *object; DWORD size; WORD count; HRESULT hr; @@ -302,6 +342,49 @@ static void test_topology(void) ok(hr == S_OK, "Failed to create a node, hr %#x.\n", hr); hr = IMFTopology_AddNode(topology, node); ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + + /* Associated object. */ + hr = IMFTopologyNode_SetObject(node, NULL); + ok(hr == S_OK, "Failed to set object, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetObject(node, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + object = (void *)0xdeadbeef; + hr = IMFTopologyNode_GetObject(node, &object); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(!object, "Unexpected object %p.\n", object); + + hr = IMFTopologyNode_SetObject(node, &test_unk); + ok(hr == S_OK, "Failed to set object, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetObject(node, &object); + ok(hr == S_OK, "Failed to get object, hr %#x.\n", hr); + ok(object == &test_unk, "Unexpected object %p.\n", object); + IUnknown_Release(object); + + hr = IMFTopologyNode_SetObject(node, &test_unk2); + ok(hr == S_OK, "Failed to set object, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetCount(node, &attr_count); + ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); + ok(attr_count == 0, "Unexpected attribute count %u.\n", attr_count); + + hr = IMFTopologyNode_SetGUID(node, &MF_TOPONODE_TRANSFORM_OBJECTID, &MF_TOPONODE_TRANSFORM_OBJECTID); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetObject(node, NULL); + ok(hr == S_OK, "Failed to set object, hr %#x.\n", hr); + + object = (void *)0xdeadbeef; + hr = IMFTopologyNode_GetObject(node, &object); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(!object, "Unexpected object %p.\n", object); + + hr = IMFTopologyNode_GetCount(node, &attr_count); + ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); + ok(attr_count == 1, "Unexpected attribute count %u.\n", attr_count); + IMFTopologyNode_Release(node); hr = IMFTopology_GetOutputNodeCollection(topology, &collection); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 543e08f..e01444b 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -25,7 +25,13 @@ #include "windef.h" #include "winbase.h" + #include "initguid.h" +#include "ole2.h" +#include "ocidl.h" + +#undef INITGUID +#include <guiddef.h> #include "mfapi.h" #include "mferror.h" #include "mfidl.h" @@ -54,6 +60,8 @@ struct topology_node IMFAttributes *attributes; MF_TOPOLOGY_TYPE node_type; TOPOID id; + IUnknown *object; + CRITICAL_SECTION cs; }; struct topology_loader @@ -755,7 +763,10 @@ static ULONG WINAPI topology_node_Release(IMFTopologyNode *iface) if (!refcount) { + if (node->object) + IUnknown_Release(node->object); IMFAttributes_Release(node->attributes); + DeleteCriticalSection(&node->cs); heap_free(node); } @@ -1038,16 +1049,74 @@ static HRESULT WINAPI topology_node_CopyAllItems(IMFTopologyNode *iface, IMFAttr static HRESULT WINAPI topology_node_SetObject(IMFTopologyNode *iface, IUnknown *object) { - FIXME("(%p)->(%p)\n", iface, object); + static const GUID *iids[3] = { &IID_IPersist, &IID_IPersistStorage, &IID_IPersistPropertyBag }; + struct topology_node *node = impl_from_IMFTopologyNode(iface); + IPersist *persist = NULL; + BOOL has_object_id; + GUID object_id; + unsigned int i; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, object); + + has_object_id = IMFAttributes_GetGUID(node->attributes, &MF_TOPONODE_TRANSFORM_OBJECTID, &object_id) == S_OK; + + if (object && !has_object_id) + { + for (i = 0; i < ARRAY_SIZE(iids); ++i) + { + persist = NULL; + if (SUCCEEDED(hr = IUnknown_QueryInterface(object, iids[i], (void **)&persist))) + break; + } + + if (persist) + { + if (FAILED(hr = IPersist_GetClassID(persist, &object_id))) + { + IPersist_Release(persist); + persist = NULL; + } + } + } + + EnterCriticalSection(&node->cs); + + if (node->object) + IUnknown_Release(node->object); + node->object = object; + if (node->object) + IUnknown_AddRef(node->object); + + if (persist) + IMFAttributes_SetGUID(node->attributes, &MF_TOPONODE_TRANSFORM_OBJECTID, &object_id); + + LeaveCriticalSection(&node->cs); + + if (persist) + IPersist_Release(persist); + + return S_OK; } static HRESULT WINAPI topology_node_GetObject(IMFTopologyNode *iface, IUnknown **object) { - FIXME("(%p)->(%p)\n", iface, object); + struct topology_node *node = impl_from_IMFTopologyNode(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, object); + + if (!object) + return E_POINTER; + + EnterCriticalSection(&node->cs); + + *object = node->object; + if (*object) + IUnknown_AddRef(*object); + + LeaveCriticalSection(&node->cs); + + return *object ? S_OK : E_FAIL; } static HRESULT WINAPI topology_node_GetNodeType(IMFTopologyNode *iface, MF_TOPOLOGY_TYPE *node_type) @@ -1243,6 +1312,7 @@ HRESULT WINAPI MFCreateTopologyNode(MF_TOPOLOGY_TYPE node_type, IMFTopologyNode return hr; } object->id = ((TOPOID)GetCurrentProcessId() << 32) | InterlockedIncrement(&next_node_id); + InitializeCriticalSection(&object->cs); *node = &object->IMFTopologyNode_iface;

1 0

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 May 2019