June 2020 - Wine-devel - list.winehq.org

[PATCH 2/6] winhttp: Get rid of some redundant assignments.
by Hans Leidekker 22 Jun '20

22 Jun '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 2 +- dlls/winhttp/session.c | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 08e9d7584e..1324005f1d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3106,7 +3106,7 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR addref_object( &request->hdr ); socket->request = request; - if ((hsocket = alloc_handle( &socket->hdr ))) socket->hdr.handle = hsocket; + hsocket = alloc_handle( &socket->hdr ); release_object( &socket->hdr ); release_object( &request->hdr ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 13d228d851..a5ec8b22f3 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -282,8 +282,7 @@ HINTERNET WINAPI WinHttpOpen( LPCWSTR agent, DWORD access, LPCWSTR proxy, LPCWST if (bypass && !(session->proxy_bypass = strdupW( bypass ))) goto end; } - if (!(handle = alloc_handle( &session->hdr ))) goto end; - session->hdr.handle = handle; + handle = alloc_handle( &session->hdr ); end: release_object( &session->hdr ); @@ -559,10 +558,10 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO connect->hostport = port; if (!set_server_for_hostname( connect, server, port )) goto end; - if (!(hconnect = alloc_handle( &connect->hdr ))) goto end; - connect->hdr.handle = hconnect; - - send_callback( &session->hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, &hconnect, sizeof(hconnect) ); + if ((hconnect = alloc_handle( &connect->hdr ))) + { + send_callback( &session->hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, &hconnect, sizeof(hconnect) ); + } end: release_object( &connect->hdr ); @@ -1137,10 +1136,10 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o if (!(request->version = strdupW( version ))) goto end; if (!(add_accept_types_header( request, types ))) goto end; - if (!(hrequest = alloc_handle( &request->hdr ))) goto end; - request->hdr.handle = hrequest; - - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, &hrequest, sizeof(hrequest) ); + if ((hrequest = alloc_handle( &request->hdr ))) + { + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, &hrequest, sizeof(hrequest) ); + } end: release_object( &request->hdr ); -- 2.20.1

1 0

[PATCH 1/4] ntoskrnl/tests: Use the same sin port as ws2_32 tests.
by Paul Gofman 22 Jun '20

22 Jun '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntoskrnl.exe/tests/driver.h | 2 ++ dlls/ntoskrnl.exe/tests/driver4.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 4b70046b8e2..3bfc4bd80ac 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -55,3 +55,5 @@ static inline char *drv_strrchr( const char *str, char ch ) do { if (*str == ch) ret = (char *)(ULONG_PTR)str; } while (*str++); return ret; } + +#define SERVER_LISTEN_PORT 9374 diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver4.c index fedd5f25c2c..e11879e9e5b 100644 --- a/dlls/ntoskrnl.exe/tests/driver4.c +++ b/dlls/ntoskrnl.exe/tests/driver4.c @@ -243,7 +243,7 @@ static void test_wsk_listen_socket(void) memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; - addr.sin_port = htons(12345); + addr.sin_port = htons(SERVER_LISTEN_PORT); IoReuseIrp(wsk_irp, STATUS_UNSUCCESSFUL); IoSetCompletionRoutine(wsk_irp, irp_completion_routine, &irp_complete_event, TRUE, TRUE, TRUE); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index c53f97e9d19..5555095bd22 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -532,7 +532,7 @@ static DWORD WINAPI wsk_test_thread(void *parameter) memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; - addr.sin_port = htons(12345); + addr.sin_port = htons(SERVER_LISTEN_PORT); addr.sin_addr.s_addr = htonl(0x7f000001); ret = connect(s, (struct sockaddr *)&addr, sizeof(addr)); -- 2.26.2

2 4

[PATCH V2 2/2] gdiplus: keep temporary dc from being released.
by Changping Yu 22 Jun '20

22 Jun '20

2 1

Trying to find debian version
by Zesh 22 Jun '20

22 Jun '20

I am trying to install wine and when trying to find my debian version, lsb_release -da says kali-rolling. So does cat /etc/debian_version. Is their another command I can use? On my virtual machine description it says it is running debian x64. Thanks.

2 1

[PATCH 1/2] mfplat: Add IMFVideoMediaType semi-stub.
by Nikolay Sivov 22 Jun '20

22 Jun '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mediatype.c | 487 +++++++++++++++++++++++++++++++++++++++- dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 1 + 3 files changed, 480 insertions(+), 10 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index f92577a9cbc..ca806a899f5 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -37,6 +37,7 @@ struct media_type { struct attributes attributes; IMFMediaType IMFMediaType_iface; + IMFVideoMediaType IMFVideoMediaType_iface; }; struct stream_desc @@ -66,11 +67,16 @@ struct presentation_desc static HRESULT presentation_descriptor_init(struct presentation_desc *object, DWORD count); -static inline struct media_type *impl_from_IMFMediaType(IMFMediaType *iface) +static struct media_type *impl_from_IMFMediaType(IMFMediaType *iface) { return CONTAINING_RECORD(iface, struct media_type, IMFMediaType_iface); } +static struct media_type *impl_from_IMFVideoMediaType(IMFVideoMediaType *iface) +{ + return CONTAINING_RECORD(iface, struct media_type, IMFVideoMediaType_iface); +} + static inline struct stream_desc *impl_from_IMFStreamDescriptor(IMFStreamDescriptor *iface) { return CONTAINING_RECORD(iface, struct stream_desc, IMFStreamDescriptor_iface); @@ -413,13 +419,10 @@ static HRESULT WINAPI mediatype_GetMajorType(IMFMediaType *iface, GUID *guid) return attributes_GetGUID(&media_type->attributes, &MF_MT_MAJOR_TYPE, guid); } -static HRESULT WINAPI mediatype_IsCompressedFormat(IMFMediaType *iface, BOOL *compressed) +static HRESULT mediatype_is_compressed(struct media_type *media_type, BOOL *compressed) { - struct media_type *media_type = impl_from_IMFMediaType(iface); UINT32 value; - TRACE("%p, %p.\n", iface, compressed); - if (FAILED(attributes_GetUINT32(&media_type->attributes, &MF_MT_ALL_SAMPLES_INDEPENDENT, &value))) { value = 0; @@ -430,11 +433,19 @@ static HRESULT WINAPI mediatype_IsCompressedFormat(IMFMediaType *iface, BOOL *co return S_OK; } -static HRESULT WINAPI mediatype_IsEqual(IMFMediaType *iface, IMFMediaType *type, DWORD *flags) +static HRESULT WINAPI mediatype_IsCompressedFormat(IMFMediaType *iface, BOOL *compressed) +{ + struct media_type *media_type = impl_from_IMFMediaType(iface); + + TRACE("%p, %p.\n", iface, compressed); + + return mediatype_is_compressed(media_type, compressed); +} + +static HRESULT media_type_is_equal(struct media_type *media_type, IMFMediaType *type, DWORD *flags) { const DWORD full_equality_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_DATA | MF_MEDIATYPE_EQUAL_FORMAT_USER_DATA; - struct media_type *media_type = impl_from_IMFMediaType(iface); struct comparand { IMFAttributes *type; @@ -446,8 +457,6 @@ static HRESULT WINAPI mediatype_IsEqual(IMFMediaType *iface, IMFMediaType *type, unsigned int i; BOOL result; - TRACE("%p, %p, %p.\n", iface, type, flags); - *flags = 0; left.type = &media_type->attributes.IMFAttributes_iface; @@ -535,6 +544,15 @@ static HRESULT WINAPI mediatype_IsEqual(IMFMediaType *iface, IMFMediaType *type, return *flags == full_equality_flags ? S_OK : S_FALSE; } +static HRESULT WINAPI mediatype_IsEqual(IMFMediaType *iface, IMFMediaType *type, DWORD *flags) +{ + struct media_type *media_type = impl_from_IMFMediaType(iface); + + TRACE("%p, %p, %p.\n", iface, type, flags); + + return media_type_is_equal(media_type, type, flags); +} + static HRESULT WINAPI mediatype_GetRepresentation(IMFMediaType *iface, GUID guid, void **representation) { FIXME("%p, %s, %p.\n", iface, debugstr_guid(&guid), representation); @@ -591,6 +609,425 @@ static const IMFMediaTypeVtbl mediatypevtbl = mediatype_FreeRepresentation }; +static HRESULT WINAPI video_mediatype_QueryInterface(IMFVideoMediaType *iface, REFIID riid, void **out) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualIID(riid, &IID_IMFVideoMediaType) || + IsEqualIID(riid, &IID_IMFMediaType) || + IsEqualIID(riid, &IID_IMFAttributes) || + IsEqualIID(riid, &IID_IUnknown)) + { + *out = iface; + IMFVideoMediaType_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI video_mediatype_AddRef(IMFVideoMediaType *iface) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + ULONG refcount = InterlockedIncrement(&media_type->attributes.ref); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI video_mediatype_Release(IMFVideoMediaType *iface) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + ULONG refcount = InterlockedDecrement(&media_type->attributes.ref); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + clear_attributes_object(&media_type->attributes); + heap_free(media_type); + } + + return refcount; +} + +static HRESULT WINAPI video_mediatype_GetItem(IMFVideoMediaType *iface, REFGUID key, PROPVARIANT *value) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); + + return attributes_GetItem(&media_type->attributes, key, value); +} + +static HRESULT WINAPI video_mediatype_GetItemType(IMFVideoMediaType *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), type); + + return attributes_GetItemType(&media_type->attributes, key, type); +} + +static HRESULT WINAPI video_mediatype_CompareItem(IMFVideoMediaType *iface, REFGUID key, REFPROPVARIANT value, BOOL *result) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %s, %p.\n", iface, debugstr_attr(key), debugstr_propvar(value), result); + + return attributes_CompareItem(&media_type->attributes, key, value, result); +} + +static HRESULT WINAPI video_mediatype_Compare(IMFVideoMediaType *iface, IMFAttributes *attrs, + MF_ATTRIBUTES_MATCH_TYPE type, BOOL *result) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %p, %d, %p.\n", iface, attrs, type, result); + + return attributes_Compare(&media_type->attributes, attrs, type, result); +} + +static HRESULT WINAPI video_mediatype_GetUINT32(IMFVideoMediaType *iface, REFGUID key, UINT32 *value) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); + + return attributes_GetUINT32(&media_type->attributes, key, value); +} + +static HRESULT WINAPI video_mediatype_GetUINT64(IMFVideoMediaType *iface, REFGUID key, UINT64 *value) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); + + return attributes_GetUINT64(&media_type->attributes, key, value); +} + +static HRESULT WINAPI video_mediatype_GetDouble(IMFVideoMediaType *iface, REFGUID key, double *value) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); + + return attributes_GetDouble(&media_type->attributes, key, value); +} + +static HRESULT WINAPI video_mediatype_GetGUID(IMFVideoMediaType *iface, REFGUID key, GUID *value) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); + + return attributes_GetGUID(&media_type->attributes, key, value); +} + +static HRESULT WINAPI video_mediatype_GetStringLength(IMFVideoMediaType *iface, REFGUID key, UINT32 *length) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), length); + + return attributes_GetStringLength(&media_type->attributes, key, length); +} + +static HRESULT WINAPI video_mediatype_GetString(IMFVideoMediaType *iface, REFGUID key, WCHAR *value, + UINT32 size, UINT32 *length) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p, %u, %p.\n", iface, debugstr_attr(key), value, size, length); + + return attributes_GetString(&media_type->attributes, key, value, size, length); +} + +static HRESULT WINAPI video_mediatype_GetAllocatedString(IMFVideoMediaType *iface, REFGUID key, + WCHAR **value, UINT32 *length) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p, %p.\n", iface, debugstr_attr(key), value, length); + + return attributes_GetAllocatedString(&media_type->attributes, key, value, length); +} + +static HRESULT WINAPI video_mediatype_GetBlobSize(IMFVideoMediaType *iface, REFGUID key, UINT32 *size) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), size); + + return attributes_GetBlobSize(&media_type->attributes, key, size); +} + +static HRESULT WINAPI video_mediatype_GetBlob(IMFVideoMediaType *iface, REFGUID key, UINT8 *buf, + UINT32 bufsize, UINT32 *blobsize) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p, %u, %p.\n", iface, debugstr_attr(key), buf, bufsize, blobsize); + + return attributes_GetBlob(&media_type->attributes, key, buf, bufsize, blobsize); +} + +static HRESULT WINAPI video_mediatype_GetAllocatedBlob(IMFVideoMediaType *iface, REFGUID key, UINT8 **buf, UINT32 *size) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p, %p.\n", iface, debugstr_attr(key), buf, size); + + return attributes_GetAllocatedBlob(&media_type->attributes, key, buf, size); +} + +static HRESULT WINAPI video_mediatype_GetUnknown(IMFVideoMediaType *iface, REFGUID key, REFIID riid, void **obj) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %s, %p.\n", iface, debugstr_attr(key), debugstr_guid(riid), obj); + + return attributes_GetUnknown(&media_type->attributes, key, riid, obj); +} + +static HRESULT WINAPI video_mediatype_SetItem(IMFVideoMediaType *iface, REFGUID key, REFPROPVARIANT value) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_propvar(value)); + + return attributes_SetItem(&media_type->attributes, key, value); +} + +static HRESULT WINAPI video_mediatype_DeleteItem(IMFVideoMediaType *iface, REFGUID key) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s.\n", iface, debugstr_attr(key)); + + return attributes_DeleteItem(&media_type->attributes, key); +} + +static HRESULT WINAPI video_mediatype_DeleteAllItems(IMFVideoMediaType *iface) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p.\n", iface); + + return attributes_DeleteAllItems(&media_type->attributes); +} + +static HRESULT WINAPI video_mediatype_SetUINT32(IMFVideoMediaType *iface, REFGUID key, UINT32 value) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %u.\n", iface, debugstr_attr(key), value); + + return attributes_SetUINT32(&media_type->attributes, key, value); +} + +static HRESULT WINAPI video_mediatype_SetUINT64(IMFVideoMediaType *iface, REFGUID key, UINT64 value) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), wine_dbgstr_longlong(value)); + + return attributes_SetUINT64(&media_type->attributes, key, value); +} + +static HRESULT WINAPI video_mediatype_SetDouble(IMFVideoMediaType *iface, REFGUID key, double value) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %f.\n", iface, debugstr_attr(key), value); + + return attributes_SetDouble(&media_type->attributes, key, value); +} + +static HRESULT WINAPI video_mediatype_SetGUID(IMFVideoMediaType *iface, REFGUID key, REFGUID value) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_mf_guid(value)); + + return attributes_SetGUID(&media_type->attributes, key, value); +} + +static HRESULT WINAPI video_mediatype_SetString(IMFVideoMediaType *iface, REFGUID key, const WCHAR *value) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_w(value)); + + return attributes_SetString(&media_type->attributes, key, value); +} + +static HRESULT WINAPI video_mediatype_SetBlob(IMFVideoMediaType *iface, REFGUID key, const UINT8 *buf, UINT32 size) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p, %u.\n", iface, debugstr_attr(key), buf, size); + + return attributes_SetBlob(&media_type->attributes, key, buf, size); +} + +static HRESULT WINAPI video_mediatype_SetUnknown(IMFVideoMediaType *iface, REFGUID key, IUnknown *unknown) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), unknown); + + return attributes_SetUnknown(&media_type->attributes, key, unknown); +} + +static HRESULT WINAPI video_mediatype_LockStore(IMFVideoMediaType *iface) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p.\n", iface); + + return attributes_LockStore(&media_type->attributes); +} + +static HRESULT WINAPI video_mediatype_UnlockStore(IMFVideoMediaType *iface) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p.\n", iface); + + return attributes_UnlockStore(&media_type->attributes); +} + +static HRESULT WINAPI video_mediatype_GetCount(IMFVideoMediaType *iface, UINT32 *count) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %p.\n", iface, count); + + return attributes_GetCount(&media_type->attributes, count); +} + +static HRESULT WINAPI video_mediatype_GetItemByIndex(IMFVideoMediaType *iface, UINT32 index, GUID *key, PROPVARIANT *value) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %u, %p, %p.\n", iface, index, key, value); + + return attributes_GetItemByIndex(&media_type->attributes, index, key, value); +} + +static HRESULT WINAPI video_mediatype_CopyAllItems(IMFVideoMediaType *iface, IMFAttributes *dest) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %p.\n", iface, dest); + + return attributes_CopyAllItems(&media_type->attributes, dest); +} + +static HRESULT WINAPI video_mediatype_GetMajorType(IMFVideoMediaType *iface, GUID *guid) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %p.\n", iface, guid); + + return attributes_GetGUID(&media_type->attributes, &MF_MT_MAJOR_TYPE, guid); +} + +static HRESULT WINAPI video_mediatype_IsCompressedFormat(IMFVideoMediaType *iface, BOOL *compressed) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %p.\n", iface, compressed); + + return mediatype_is_compressed(media_type, compressed); +} + +static HRESULT WINAPI video_mediatype_IsEqual(IMFVideoMediaType *iface, IMFMediaType *type, DWORD *flags) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %p, %p.\n", iface, type, flags); + + return media_type_is_equal(media_type, type, flags); +} + +static HRESULT WINAPI video_mediatype_GetRepresentation(IMFVideoMediaType *iface, GUID guid, void **representation) +{ + FIXME("%p, %s, %p.\n", iface, debugstr_guid(&guid), representation); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mediatype_FreeRepresentation(IMFVideoMediaType *iface, GUID guid, void *representation) +{ + FIXME("%p, %s, %p.\n", iface, debugstr_guid(&guid), representation); + + return E_NOTIMPL; +} + +static const MFVIDEOFORMAT * WINAPI video_mediatype_GetVideoFormat(IMFVideoMediaType *iface) +{ + FIXME("%p.\n", iface); + + return NULL; +} + +static HRESULT WINAPI video_mediatype_GetVideoRepresentation(IMFVideoMediaType *iface, GUID representation, + void **data, LONG stride) +{ + FIXME("%p, %s, %p, %d.\n", iface, debugstr_guid(&representation), data, stride); + + return E_NOTIMPL; +} + +static const IMFVideoMediaTypeVtbl videomediatypevtbl = +{ + video_mediatype_QueryInterface, + video_mediatype_AddRef, + video_mediatype_Release, + video_mediatype_GetItem, + video_mediatype_GetItemType, + video_mediatype_CompareItem, + video_mediatype_Compare, + video_mediatype_GetUINT32, + video_mediatype_GetUINT64, + video_mediatype_GetDouble, + video_mediatype_GetGUID, + video_mediatype_GetStringLength, + video_mediatype_GetString, + video_mediatype_GetAllocatedString, + video_mediatype_GetBlobSize, + video_mediatype_GetBlob, + video_mediatype_GetAllocatedBlob, + video_mediatype_GetUnknown, + video_mediatype_SetItem, + video_mediatype_DeleteItem, + video_mediatype_DeleteAllItems, + video_mediatype_SetUINT32, + video_mediatype_SetUINT64, + video_mediatype_SetDouble, + video_mediatype_SetGUID, + video_mediatype_SetString, + video_mediatype_SetBlob, + video_mediatype_SetUnknown, + video_mediatype_LockStore, + video_mediatype_UnlockStore, + video_mediatype_GetCount, + video_mediatype_GetItemByIndex, + video_mediatype_CopyAllItems, + video_mediatype_GetMajorType, + video_mediatype_IsCompressedFormat, + video_mediatype_IsEqual, + video_mediatype_GetRepresentation, + video_mediatype_FreeRepresentation, + video_mediatype_GetVideoFormat, + video_mediatype_GetVideoRepresentation, +}; + /*********************************************************************** * MFCreateMediaType (mfplat.@) */ @@ -2171,3 +2608,35 @@ HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WA return hr; } + +/*********************************************************************** + * MFCreateVideoMediaTypeFromSubtype (mfplat.@) + */ +HRESULT WINAPI MFCreateVideoMediaTypeFromSubtype(const GUID *subtype, IMFVideoMediaType **media_type) +{ + struct media_type *object; + HRESULT hr; + + TRACE("%s, %p.\n", debugstr_guid(subtype), media_type); + + if (!media_type) + return E_INVALIDARG; + + object = heap_alloc(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + if (FAILED(hr = init_attributes_object(&object->attributes, 0))) + { + heap_free(object); + return hr; + } + object->IMFVideoMediaType_iface.lpVtbl = &videomediatypevtbl; + + IMFVideoMediaType_SetGUID(&object->IMFVideoMediaType_iface, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + IMFVideoMediaType_SetGUID(&object->IMFVideoMediaType_iface, &MF_MT_SUBTYPE, subtype); + + *media_type = &object->IMFVideoMediaType_iface; + + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index a1833312fc1..01f9efaecaa 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -76,7 +76,7 @@ @ stub MFCreateVideoMediaType @ stub MFCreateVideoMediaTypeFromBitMapInfoHeader @ stub MFCreateVideoMediaTypeFromBitMapInfoHeaderEx -@ stub MFCreateVideoMediaTypeFromSubtype +@ stdcall MFCreateVideoMediaTypeFromSubtype(ptr ptr) @ stub MFCreateVideoMediaTypeFromVideoInfoHeader2 @ stub MFCreateVideoMediaTypeFromVideoInfoHeader @ stdcall MFCreateWaveFormatExFromMFMediaType(ptr ptr ptr long) diff --git a/include/mfapi.h b/include/mfapi.h index 05ada65b9db..4da25341c68 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -510,6 +510,7 @@ HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HR const PROPVARIANT *value, IMFMediaEvent **event); HRESULT WINAPI MFCreateMediaType(IMFMediaType **type); HRESULT WINAPI MFCreateSample(IMFSample **sample); +HRESULT WINAPI MFCreateVideoMediaTypeFromSubtype(const GUID *subtype, IMFVideoMediaType **media_type); HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer); HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *type, WAVEFORMATEX **format, UINT32 *size, UINT32 flags); HRESULT WINAPI MFEndCreateFile(IMFAsyncResult *result, IMFByteStream **stream); -- 2.27.0

1 1

[PATCH 1/2] gdiplus: Simplify modulo 8 math used for rendering origin.
by Jeff Smith 22 Jun '20

22 Jun '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- Supersedes uncommitted portions of 187295 and 187296. dlls/gdiplus/graphics.c | 10 +++++----- dlls/gdiplus/tests/brush.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6619be9b58..4b141e19b6 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -159,8 +159,8 @@ static HBITMAP create_hatch_bitmap(const GpHatch *hatch, INT origin_x, INT origi * degree of shading needed. */ for (y = 0; y < 8; y++) { - const int hy = (((y + origin_y) % 8) + 8) % 8; - const int hx = ((origin_x % 8) + 8) % 8; + const int hy = (y + origin_y) & 7; + const int hx = origin_x & 7; unsigned int row = (0x10101 * hatch_data[hy]) >> hx; for (x = 0; x < 8; x++, row >>= 1) @@ -1198,13 +1198,13 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, /* See create_hatch_bitmap for an explanation of how index is derived. */ for (y = 0; y < fill_area->Height; y++, argb_pixels += cdwStride) { - const int hy = (7 - ((y + fill_area->Y - graphics->origin_y) % 8)) % 8; - const int hx = ((graphics->origin_x % 8) + 8) % 8; + const int hy = ~(y + fill_area->Y - graphics->origin_y) & 7; + const int hx = graphics->origin_x & 7; const unsigned int row = (0x10101 * hatch_data[hy]) >> hx; for (x = 0; x < fill_area->Width; x++) { - const unsigned int srow = row >> (7 - ((x + fill_area->X) % 8)); + const unsigned int srow = row >> (~(x + fill_area->X) & 7); int index; if (hatch_data[8]) index = (srow & 1) ? 2 : (srow & 0x82) ? 1 : 0; diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 5d5280c7f9..78939e6899 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -1814,8 +1814,8 @@ static void test_renderingOrigin(void) for (i = 0; i < ARRAY_SIZE(tests); i++) { - const INT exp_x = ((tests[i][0] % 8) + 8) % 8; - const INT exp_y = ((tests[i][1] % 8) + 8) % 8; + const INT exp_x = tests[i][0] & 7; + const INT exp_y = tests[i][1] & 7; status = GdipSetRenderingOrigin(graphics_image, tests[i][0], tests[i][1]); expect(Ok, status); -- 2.23.0

3 8

[PATCH v2] windowscodecs/tests: Format ok() message for tests/ddsformat.c.
by Ziqing Hui 22 Jun '20

22 Jun '20

v2: Fix a typo. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 223 ++++++++++++++------------- 1 file changed, 113 insertions(+), 110 deletions(-)

2 1

[PATCH 1/2] gdiplus/tests: Add GDI/GDI+ graphics interop test.
by Shawn M. Chapla 22 Jun '20

22 Jun '20

Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- dlls/gdiplus/tests/graphics.c | 92 +++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index f2ff589ab5..7040327e67 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -6792,6 +6792,97 @@ static void test_hdc_caching(void) DeleteObject(hbm); } +static void test_gdi_interop(void) +{ + GpBitmap *bitmap; + GpGraphics *graphics; + GpMatrix *transform; + GpBrush *brush; + GpStatus stat; + HDC hdc; + HBRUSH hbrush, holdbrush; + ARGB color; + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + stat = GdipCreateMatrix(&transform); + expect(Ok, stat); + + stat = GdipSetMatrixElements(transform, 1.0, 0.0, 0.0, 1.0, 50.0, 50.0); + expect(Ok, stat); + + /* GDI+: Set world transform. Should not matter to GDI. */ + stat = GdipSetWorldTransform(graphics, transform); + expect(Ok, stat); + + stat = GdipGetDC(graphics, &hdc); + expect(Ok, stat); + + hbrush = CreateSolidBrush(0xff0000); + + holdbrush = SelectObject(hdc, hbrush); + + /* GDI: Draw a rectangle at physical coords (5, 5) to (12, 10). */ + Rectangle(hdc, 5, 5, 12, 10); + + holdbrush = SelectObject(hdc, holdbrush); + + /* GDI: Set view port origin. Should not matter to GDI+. */ + SetViewportOrgEx(hdc, 20, 20, NULL); + + GdipReleaseDC(graphics, hdc); + + stat = GdipCreateSolidFill((ARGB)0xff0000ff, (GpSolidFill**)&brush); + expect(Ok, stat); + + /* GDI+: Draw a rectangle at physical coords (85, 85) to (88, 95). */ + stat = GdipFillRectangleI(graphics, brush, 35, 35, 3, 10); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + stat = GdipGetDC(graphics, &hdc); + expect(Ok, stat); + + holdbrush = SelectObject(hdc, hbrush); + + /* GDI: Draw a rectangle at physical coords (25, 25) to (30, 34). + Updated view port origin should still be in effect. */ + Rectangle(hdc, 5, 5, 10, 14); + + SelectObject(hdc, holdbrush); + + DeleteObject(hbrush); + stat = GdipReleaseDC(graphics, hdc); + expect(Ok, stat); + + stat = GdipDeleteMatrix(transform); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap, 6, 6, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + stat = GdipBitmapGetPixel(bitmap, 26, 26, &color); + expect(Ok, stat); + todo_wine expect(0xff0000ff, color); + + stat = GdipBitmapGetPixel(bitmap, 86, 86, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -6885,6 +6976,7 @@ START_TEST(graphics) test_GdipGraphicsSetAbort(); test_cliphrgn_transform(); test_hdc_caching(); + test_gdi_interop(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd ); -- 2.27.0

2 3

[PATCH V2 1/2] gdiplus/tests: Add Gdip{Get, Release}DC more test.
by Changping Yu 22 Jun '20

22 Jun '20

1 0

[PATCH] msxml3: Add support for loading document from relative URL provided by hosting site.
by Dmitry Timoshkov 22 Jun '20

22 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/domdoc.c | 86 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 71 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 76d3fdb601..390644d5da 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -41,6 +41,9 @@ #include "ole2.h" #include "olectl.h" #include "msxml6.h" +#include "mshtml.h" +#include "docobj.h" +#include "urlmon.h" #include "wininet.h" #include "winreg.h" #include "shlwapi.h" @@ -2155,16 +2158,78 @@ static HRESULT domdoc_onDataAvailable(void *obj, char *ptr, DWORD len) return E_FAIL; } -static HRESULT domdoc_load_moniker(domdoc *This, IMoniker *mon) +static HRESULT domdoc_load_file(domdoc *This, LPWSTR filename, IUri **uri) { + IMoniker *mon, *base_mon = NULL; bsc_t *bsc; HRESULT hr; - hr = bind_url(mon, domdoc_onDataAvailable, This, &bsc); - if(FAILED(hr)) - return hr; + if (This->site) + { + BSTR base_url = NULL; + IXMLDOMDocument *doc; + IHTMLDocument2 *doc2; + IOleClientSite *site; + IServiceProvider *sp; - return detach_bsc(bsc); + if (IUnknown_QueryInterface(This->site, &IID_IXMLDOMDocument, (void **)&doc) == S_OK) + { + IXMLDOMDocument_get_url(doc, &base_url); + IXMLDOMDocument_Release(doc); + } + else if (IUnknown_QueryInterface(This->site, &IID_IHTMLDocument2, (void **)&doc2) == S_OK) + { + IHTMLDocument2_get_URL(doc2, &base_url); + IHTMLDocument2_Release(doc2); + } + else if (IUnknown_QueryInterface(This->site, &IID_IServiceProvider, (void **)&sp) == S_OK) + { + if (IServiceProvider_QueryService(sp, &SID_SContainerDispatch, &IID_IXMLDOMDocument, (void **)&doc) == S_OK) + { + IXMLDOMDocument_get_url(doc, &base_url); + IXMLDOMDocument_Release(doc); + } + else if (IServiceProvider_QueryService(sp, &SID_SContainerDispatch, &IID_IHTMLDocument2, (void **)&doc2) == S_OK) + { + IHTMLDocument2_get_URL(doc2, &base_url); + IHTMLDocument2_Release(doc2); + } + IServiceProvider_Release(sp); + } + else if (IUnknown_QueryInterface(This->site, &IID_IOleClientSite, (void **)&site) == S_OK) + { + FIXME("IID_IOleClientSite => %p\n", site); + IOleClientSite_Release(site); + } + + if (base_url) + { + TRACE("base_url: %s\n", debugstr_w(base_url)); + CreateURLMonikerEx(NULL, base_url, &base_mon, 0); + SysFreeString(base_url); + } + } + + if (base_mon) /* look for file starting from base URL */ + hr = CreateUri(filename, Uri_CREATE_ALLOW_RELATIVE | Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, uri); + else /* look for file in the PATH */ + hr = create_uri(filename, uri); + if (hr == S_OK) + { + hr = CreateURLMonikerEx2(base_mon, *uri, &mon, 0); + if (hr == S_OK) + { + hr = bind_url(mon, domdoc_onDataAvailable, This, &bsc); + if (hr == S_OK) + hr = detach_bsc(bsc); + IMoniker_Release(mon); + } + } + + if (base_mon) + IMoniker_Release(base_mon); + + return hr; } static HRESULT WINAPI domdoc_load( @@ -2293,7 +2358,6 @@ static HRESULT WINAPI domdoc_load( if ( filename ) { IUri *uri = NULL; - IMoniker *mon; if (This->properties->uri) { @@ -2301,15 +2365,7 @@ static HRESULT WINAPI domdoc_load( This->properties->uri = NULL; } - hr = create_uri(filename, &uri); - if (SUCCEEDED(hr)) - hr = CreateURLMonikerEx2(NULL, uri, &mon, 0); - if ( SUCCEEDED(hr) ) - { - hr = domdoc_load_moniker( This, mon ); - IMoniker_Release(mon); - } - + hr = domdoc_load_file(This, filename, &uri); if (SUCCEEDED(hr)) { get_doc(This)->name = (char *)xmlchar_from_wcharn(filename, -1, TRUE); -- 2.26.2

2 1