wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Vincent Povirk : windowscodecs: Fix ICNS encoder write_source call.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: fea96a5739573d7d1deff38588e29f278cd388a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fea96a5739573d7d1deff385… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Mar 6 10:02:58 2020 -0600 windowscodecs: Fix ICNS encoder write_source call. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/icnsformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index 8194bc508a..5b94906e80 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -401,7 +401,7 @@ static HRESULT WINAPI IcnsFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, if (SUCCEEDED(hr)) { hr = write_source(iface, pIBitmapSource, prc, - &GUID_WICPixelFormat32bppBGRA, 32, This->size, This->size); + &GUID_WICPixelFormat32bppBGRA, 32, FALSE, This->size, This->size); } return hr;

1 0

Nikolay Sivov : include: Add some MFT flags types.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 7e289dec7688a94e126c2c9859fa63b78d2ec5d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e289dec7688a94e126c2c98… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 6 18:33:06 2020 +0300 include: Add some MFT flags types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mftransform.idl | 108 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 84 insertions(+), 24 deletions(-) diff --git a/include/mftransform.idl b/include/mftransform.idl index 8cc0ffbc50..59e40f95f7 100644 --- a/include/mftransform.idl +++ b/include/mftransform.idl @@ -18,6 +18,90 @@ import "mfobjects.idl"; +typedef [v1_enum] enum _MFT_MESSAGE_TYPE +{ + MFT_MESSAGE_COMMAND_FLUSH = 0x00000000, + MFT_MESSAGE_COMMAND_DRAIN = 0x00000001, + MFT_MESSAGE_SET_D3D_MANAGER = 0x00000002, + MFT_MESSAGE_DROP_SAMPLES = 0x00000003, + MFT_MESSAGE_COMMAND_TICK = 0x00000004, + MFT_MESSAGE_NOTIFY_BEGIN_STREAMING = 0x10000000, + MFT_MESSAGE_NOTIFY_END_STREAMING = 0x10000001, + MFT_MESSAGE_NOTIFY_END_OF_STREAM = 0x10000002, + MFT_MESSAGE_NOTIFY_START_OF_STREAM = 0x10000003, + MFT_MESSAGE_NOTIFY_RELEASE_RESOURCES = 0x10000004, + MFT_MESSAGE_NOTIFY_REACQUIRE_RESOURCES = 0x10000005, + MFT_MESSAGE_NOTIFY_EVENT = 0x10000006, + MFT_MESSAGE_COMMAND_SET_OUTPUT_STREAM_STATE = 0x10000007, + MFT_MESSAGE_COMMAND_FLUSH_OUTPUT_STREAM = 0x10000008, + MFT_MESSAGE_COMMAND_MARKER = 0x20000000 +} MFT_MESSAGE_TYPE; + +enum _MFT_SET_TYPE_FLAGS +{ + MFT_SET_TYPE_TEST_ONLY = 0x00000001, +}; + +enum _MFT_INPUT_STREAM_INFO_FLAGS +{ + MFT_INPUT_STREAM_WHOLE_SAMPLES = 0x00000001, + MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER = 0x00000002, + MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE = 0x00000004, + MFT_INPUT_STREAM_HOLDS_BUFFERS = 0x00000008, + MFT_INPUT_STREAM_DOES_NOT_ADDREF = 0x00000100, + MFT_INPUT_STREAM_REMOVABLE = 0x00000200, + MFT_INPUT_STREAM_OPTIONAL = 0x00000400, + MFT_INPUT_STREAM_PROCESSES_IN_PLACE = 0x00000800 +}; + +enum _MFT_INPUT_STATUS_FLAGS +{ + MFT_INPUT_STATUS_ACCEPT_DATA = 0x00000001, +}; + +enum _MFT_OUTPUT_STREAM_INFO_FLAGS +{ + MFT_OUTPUT_STREAM_WHOLE_SAMPLES = 0x00000001, + MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER = 0x00000002, + MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE = 0x00000004, + MFT_OUTPUT_STREAM_DISCARDABLE = 0x00000008, + MFT_OUTPUT_STREAM_OPTIONAL = 0x00000010, + MFT_OUTPUT_STREAM_PROVIDES_SAMPLES = 0x00000100, + MFT_OUTPUT_STREAM_CAN_PROVIDE_SAMPLES = 0x00000200, + MFT_OUTPUT_STREAM_LAZY_READ = 0x00000400, + MFT_OUTPUT_STREAM_REMOVABLE = 0x00000800 +}; + +enum _MFT_OUTPUT_DATA_BUFFER_FLAGS +{ + MFT_OUTPUT_DATA_BUFFER_INCOMPLETE = 0x01000000, + MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE = 0x00000100, + MFT_OUTPUT_DATA_BUFFER_STREAM_END = 0x00000200, + MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE = 0x00000300 +}; + +enum _MFT_OUTPUT_STATUS_FLAGS +{ + MFT_OUTPUT_STATUS_SAMPLE_READY = 0x00000001 +}; + +enum _MFT_PROCESS_OUTPUT_FLAGS +{ + MFT_PROCESS_OUTPUT_DISCARD_WHEN_NO_BUFFER = 0x00000001, + MFT_PROCESS_OUTPUT_REGENERATE_LAST_OUTPUT = 0x00000002 +}; + +enum _MFT_PROCESS_OUTPUT_STATUS +{ + MFT_PROCESS_OUTPUT_STATUS_NEW_STREAMS = 0x00000100 +}; + +enum _MFT_DRAIN_TYPE +{ + MFT_DRAIN_PRODUCE_TAILS = 0x00000000, + MFT_DRAIN_NO_TAILS = 0x00000001 +}; + typedef struct _MFT_INPUT_STREAM_INFO { LONGLONG hnsMaxLatency; @@ -42,30 +126,6 @@ typedef struct _MFT_OUTPUT_DATA_BUFFER IMFCollection *pEvents; } MFT_OUTPUT_DATA_BUFFER, *PMFT_OUTPUT_DATA_BUFFER; -typedef [v1_enum] enum _MFT_MESSAGE_TYPE -{ - MFT_MESSAGE_COMMAND_FLUSH = 0x00000000, - MFT_MESSAGE_COMMAND_DRAIN = 0x00000001, - MFT_MESSAGE_SET_D3D_MANAGER = 0x00000002, - MFT_MESSAGE_DROP_SAMPLES = 0x00000003, - MFT_MESSAGE_COMMAND_TICK = 0x00000004, - MFT_MESSAGE_NOTIFY_BEGIN_STREAMING = 0x10000000, - MFT_MESSAGE_NOTIFY_END_STREAMING = 0x10000001, - MFT_MESSAGE_NOTIFY_END_OF_STREAM = 0x10000002, - MFT_MESSAGE_NOTIFY_START_OF_STREAM = 0x10000003, - MFT_MESSAGE_COMMAND_MARKER = 0x20000000 -} MFT_MESSAGE_TYPE; - -enum _MFT_SET_TYPE_FLAGS -{ - MFT_SET_TYPE_TEST_ONLY = 0x00000001, -}; - -enum _MFT_INPUT_STATUS_FLAGS -{ - MFT_INPUT_STATUS_ACCEPT_DATA = 0x00000001, -}; - [ object, uuid(bf94c121-5b05-4e6f-8000-ba598961414d)

1 0

Nikolay Sivov : mfplat: Remove extra critical section from stream descriptor.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 2f4ba6e88bd7e48d1ef6d868fa864f566eccbb16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f4ba6e88bd7e48d1ef6d868… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 6 18:32:27 2020 +0300 mfplat: Remove extra critical section from stream descriptor. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index c52255723c..69b302ca89 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -43,7 +43,6 @@ struct stream_desc IMFMediaType **media_types; unsigned int media_types_count; IMFMediaType *current_type; - CRITICAL_SECTION cs; }; struct presentation_desc_entry @@ -665,7 +664,6 @@ static ULONG WINAPI stream_descriptor_Release(IMFStreamDescriptor *iface) if (stream_desc->current_type) IMFMediaType_Release(stream_desc->current_type); clear_attributes_object(&stream_desc->attributes); - DeleteCriticalSection(&stream_desc->cs); heap_free(stream_desc); } @@ -1087,12 +1085,12 @@ static HRESULT WINAPI mediatype_handler_SetCurrentMediaType(IMFMediaTypeHandler if (!type) return E_POINTER; - EnterCriticalSection(&stream_desc->cs); + EnterCriticalSection(&stream_desc->attributes.cs); if (stream_desc->current_type) IMFMediaType_Release(stream_desc->current_type); stream_desc->current_type = type; IMFMediaType_AddRef(stream_desc->current_type); - LeaveCriticalSection(&stream_desc->cs); + LeaveCriticalSection(&stream_desc->attributes.cs); return S_OK; } @@ -1104,7 +1102,7 @@ static HRESULT WINAPI mediatype_handler_GetCurrentMediaType(IMFMediaTypeHandler TRACE("%p, %p.\n", iface, type); - EnterCriticalSection(&stream_desc->cs); + EnterCriticalSection(&stream_desc->attributes.cs); if (stream_desc->current_type) { *type = stream_desc->current_type; @@ -1112,7 +1110,7 @@ static HRESULT WINAPI mediatype_handler_GetCurrentMediaType(IMFMediaTypeHandler } else hr = MF_E_NOT_INITIALIZED; - LeaveCriticalSection(&stream_desc->cs); + LeaveCriticalSection(&stream_desc->attributes.cs); return hr; } @@ -1124,12 +1122,12 @@ static HRESULT WINAPI mediatype_handler_GetMajorType(IMFMediaTypeHandler *iface, TRACE("%p, %p.\n", iface, type); - EnterCriticalSection(&stream_desc->cs); + EnterCriticalSection(&stream_desc->attributes.cs); if (stream_desc->current_type) hr = IMFMediaType_GetGUID(stream_desc->current_type, &MF_MT_MAJOR_TYPE, type); else hr = MF_E_ATTRIBUTENOTFOUND; - LeaveCriticalSection(&stream_desc->cs); + LeaveCriticalSection(&stream_desc->attributes.cs); return hr; } @@ -1175,7 +1173,6 @@ HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD count, object->IMFMediaTypeHandler_iface.lpVtbl = &mediatypehandlervtbl; object->identifier = identifier; object->media_types = heap_alloc(count * sizeof(*object->media_types)); - InitializeCriticalSection(&object->cs); if (!object->media_types) { IMFStreamDescriptor_Release(&object->IMFStreamDescriptor_iface);

1 0

Nikolay Sivov : mfplat: Remove extra critical section from presentation descriptor.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: ca2e20906ec636718c335f0904104492f849a4e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca2e20906ec636718c335f09… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 6 18:32:26 2020 +0300 mfplat: Remove extra critical section from presentation descriptor. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 382f066327..c52255723c 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -58,7 +58,6 @@ struct presentation_desc IMFPresentationDescriptor IMFPresentationDescriptor_iface; struct presentation_desc_entry *descriptors; unsigned int count; - CRITICAL_SECTION cs; }; static HRESULT presentation_descriptor_init(struct presentation_desc *object, DWORD count); @@ -1239,7 +1238,6 @@ static ULONG WINAPI presentation_descriptor_Release(IMFPresentationDescriptor *i IMFStreamDescriptor_Release(presentation_desc->descriptors[i].descriptor); } clear_attributes_object(&presentation_desc->attributes); - DeleteCriticalSection(&presentation_desc->cs); heap_free(presentation_desc->descriptors); heap_free(presentation_desc); } @@ -1553,9 +1551,9 @@ static HRESULT WINAPI presentation_descriptor_GetStreamDescriptorByIndex(IMFPres if (index >= presentation_desc->count) return E_INVALIDARG; - EnterCriticalSection(&presentation_desc->cs); + EnterCriticalSection(&presentation_desc->attributes.cs); *selected = presentation_desc->descriptors[index].selected; - LeaveCriticalSection(&presentation_desc->cs); + LeaveCriticalSection(&presentation_desc->attributes.cs); *descriptor = presentation_desc->descriptors[index].descriptor; IMFStreamDescriptor_AddRef(*descriptor); @@ -1572,9 +1570,9 @@ static HRESULT WINAPI presentation_descriptor_SelectStream(IMFPresentationDescri if (index >= presentation_desc->count) return E_INVALIDARG; - EnterCriticalSection(&presentation_desc->cs); + EnterCriticalSection(&presentation_desc->attributes.cs); presentation_desc->descriptors[index].selected = TRUE; - LeaveCriticalSection(&presentation_desc->cs); + LeaveCriticalSection(&presentation_desc->attributes.cs); return S_OK; } @@ -1588,9 +1586,9 @@ static HRESULT WINAPI presentation_descriptor_DeselectStream(IMFPresentationDesc if (index >= presentation_desc->count) return E_INVALIDARG; - EnterCriticalSection(&presentation_desc->cs); + EnterCriticalSection(&presentation_desc->attributes.cs); presentation_desc->descriptors[index].selected = FALSE; - LeaveCriticalSection(&presentation_desc->cs); + LeaveCriticalSection(&presentation_desc->attributes.cs); return S_OK; } @@ -1610,7 +1608,7 @@ static HRESULT WINAPI presentation_descriptor_Clone(IMFPresentationDescriptor *i presentation_descriptor_init(object, presentation_desc->count); - EnterCriticalSection(&presentation_desc->cs); + EnterCriticalSection(&presentation_desc->attributes.cs); for (i = 0; i < presentation_desc->count; ++i) { @@ -1620,7 +1618,7 @@ static HRESULT WINAPI presentation_descriptor_Clone(IMFPresentationDescriptor *i attributes_CopyAllItems(&presentation_desc->attributes, (IMFAttributes *)&object->IMFPresentationDescriptor_iface); - LeaveCriticalSection(&presentation_desc->cs); + LeaveCriticalSection(&presentation_desc->attributes.cs); *descriptor = &object->IMFPresentationDescriptor_iface; @@ -1677,7 +1675,6 @@ static HRESULT presentation_descriptor_init(struct presentation_desc *object, DW return hr; object->IMFPresentationDescriptor_iface.lpVtbl = &presentationdescriptorvtbl; object->descriptors = heap_alloc_zero(count * sizeof(*object->descriptors)); - InitializeCriticalSection(&object->cs); if (!object->descriptors) { IMFPresentationDescriptor_Release(&object->IMFPresentationDescriptor_iface);

1 0

Nikolay Sivov : mfplat: Remove extra critical section used in sample implementation.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 7f114274c0843bc7ec079a1eacea07466b2cdabc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f114274c0843bc7ec079a1e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 6 18:32:25 2020 +0300 mfplat: Remove extra critical section used in sample implementation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 55 +++++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 03037590ec..8e54a538f6 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -49,7 +49,6 @@ struct sample size_t buffer_count; size_t capacity; DWORD flags; - CRITICAL_SECTION cs; DWORD prop_flags; LONGLONG duration; LONGLONG timestamp; @@ -281,7 +280,6 @@ static ULONG WINAPI sample_Release(IMFSample *iface) for (i = 0; i < sample->buffer_count; ++i) IMFMediaBuffer_Release(sample->buffers[i]); clear_attributes_object(&sample->attributes); - DeleteCriticalSection(&sample->cs); heap_free(sample->buffers); heap_free(sample); } @@ -566,9 +564,9 @@ static HRESULT WINAPI sample_GetSampleFlags(IMFSample *iface, DWORD *flags) TRACE("%p, %p.\n", iface, flags); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); *flags = sample->flags; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return S_OK; } @@ -579,9 +577,9 @@ static HRESULT WINAPI sample_SetSampleFlags(IMFSample *iface, DWORD flags) TRACE("%p, %#x.\n", iface, flags); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); sample->flags = flags; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return S_OK; } @@ -593,12 +591,12 @@ static HRESULT WINAPI sample_GetSampleTime(IMFSample *iface, LONGLONG *timestamp TRACE("%p, %p.\n", iface, timestamp); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); if (sample->prop_flags & SAMPLE_PROP_HAS_TIMESTAMP) *timestamp = sample->timestamp; else hr = MF_E_NO_SAMPLE_TIMESTAMP; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return hr; } @@ -609,10 +607,10 @@ static HRESULT WINAPI sample_SetSampleTime(IMFSample *iface, LONGLONG timestamp) TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(timestamp)); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); sample->timestamp = timestamp; sample->prop_flags |= SAMPLE_PROP_HAS_TIMESTAMP; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return S_OK; } @@ -624,12 +622,12 @@ static HRESULT WINAPI sample_GetSampleDuration(IMFSample *iface, LONGLONG *durat TRACE("%p, %p.\n", iface, duration); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); if (sample->prop_flags & SAMPLE_PROP_HAS_DURATION) *duration = sample->duration; else hr = MF_E_NO_SAMPLE_DURATION; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return hr; } @@ -640,10 +638,10 @@ static HRESULT WINAPI sample_SetSampleDuration(IMFSample *iface, LONGLONG durati TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(duration)); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); sample->duration = duration; sample->prop_flags |= SAMPLE_PROP_HAS_DURATION; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return S_OK; } @@ -657,9 +655,9 @@ static HRESULT WINAPI sample_GetBufferCount(IMFSample *iface, DWORD *count) if (!count) return E_INVALIDARG; - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); *count = sample->buffer_count; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return S_OK; } @@ -671,7 +669,7 @@ static HRESULT WINAPI sample_GetBufferByIndex(IMFSample *iface, DWORD index, IMF TRACE("%p, %u, %p.\n", iface, index, buffer); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); if (index < sample->buffer_count) { *buffer = sample->buffers[index]; @@ -679,7 +677,7 @@ static HRESULT WINAPI sample_GetBufferByIndex(IMFSample *iface, DWORD index, IMF } else hr = E_INVALIDARG; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return hr; } @@ -691,7 +689,7 @@ static HRESULT WINAPI sample_ConvertToContiguousBuffer(IMFSample *iface, IMFMedi TRACE("%p, %p.\n", iface, buffer); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); if (sample->buffer_count == 0) hr = E_UNEXPECTED; @@ -706,7 +704,7 @@ static HRESULT WINAPI sample_ConvertToContiguousBuffer(IMFSample *iface, IMFMedi hr = E_NOTIMPL; } - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return hr; } @@ -718,7 +716,7 @@ static HRESULT WINAPI sample_AddBuffer(IMFSample *iface, IMFMediaBuffer *buffer) TRACE("%p, %p.\n", iface, buffer); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); if (!mf_array_reserve((void **)&sample->buffers, &sample->capacity, sample->buffer_count + 1, sizeof(*sample->buffers))) hr = E_OUTOFMEMORY; @@ -727,7 +725,7 @@ static HRESULT WINAPI sample_AddBuffer(IMFSample *iface, IMFMediaBuffer *buffer) sample->buffers[sample->buffer_count++] = buffer; IMFMediaBuffer_AddRef(buffer); } - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return hr; } @@ -739,7 +737,7 @@ static HRESULT WINAPI sample_RemoveBufferByIndex(IMFSample *iface, DWORD index) TRACE("%p, %u.\n", iface, index); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); if (index < sample->buffer_count) { IMFMediaBuffer_Release(sample->buffers[index]); @@ -752,7 +750,7 @@ static HRESULT WINAPI sample_RemoveBufferByIndex(IMFSample *iface, DWORD index) } else hr = E_INVALIDARG; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return hr; } @@ -764,11 +762,11 @@ static HRESULT WINAPI sample_RemoveAllBuffers(IMFSample *iface) TRACE("%p.\n", iface); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); for (i = 0; i < sample->buffer_count; ++i) IMFMediaBuffer_Release(sample->buffers[i]); sample->buffer_count = 0; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return S_OK; } @@ -783,13 +781,13 @@ static HRESULT WINAPI sample_GetTotalLength(IMFSample *iface, DWORD *total_lengt *total_length = 0; - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); for (i = 0; i < sample->buffer_count; ++i) { if (SUCCEEDED(IMFMediaBuffer_GetCurrentLength(sample->buffers[i], &length))) *total_length += length; } - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return S_OK; } @@ -873,7 +871,6 @@ HRESULT WINAPI MFCreateSample(IMFSample **sample) } object->IMFSample_iface.lpVtbl = &samplevtbl; - InitializeCriticalSection(&object->cs); *sample = &object->IMFSample_iface;

1 0

Aaro Altonen : urlmon: Add URLOpenPullStreamW() stub.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 626e437c29c43d57a6d1d63f0d0fffca202c16ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=626e437c29c43d57a6d1d63f… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Fri Mar 6 15:25:37 2020 +0100 urlmon: Add URLOpenPullStreamW() stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47535 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/umstream.c | 10 ++++++++++ dlls/urlmon/urlmon.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/urlmon/umstream.c b/dlls/urlmon/umstream.c index 01cc755c23..83767548cf 100644 --- a/dlls/urlmon/umstream.c +++ b/dlls/urlmon/umstream.c @@ -358,3 +358,13 @@ HRESULT WINAPI URLOpenStreamW(LPUNKNOWN pCaller, LPCWSTR szURL, DWORD dwReserved return hr; } + +/*********************************************************************** + * URLOpenPullStreamW (URLMON.@) + */ +HRESULT WINAPI URLOpenPullStreamW(IUnknown *caller, const WCHAR *url, DWORD reserved, + IBindStatusCallback *callback) +{ + FIXME("%p %s %u %p, stub!\n", caller, debugstr_w(url), reserved, callback); + return E_NOTIMPL; +} diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 0d11ced0d4..ea3cd3814f 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -88,7 +88,7 @@ @ stdcall URLOpenBlockingStreamA(ptr str ptr long ptr) @ stdcall URLOpenBlockingStreamW(ptr wstr ptr long ptr) @ stub URLOpenPullStreamA -@ stub URLOpenPullStreamW +@ stdcall URLOpenPullStreamW(ptr wstr long ptr) @ stdcall URLOpenStreamA(ptr str long ptr) @ stdcall URLOpenStreamW(ptr wstr long ptr) @ stub UrlMkBuildVersion

1 0

Gabriel Ivăncescu : jscript: Lookup host global object on demand instead of storing it in script context.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: acb076c820dcacd41126f75373ec6019768e42e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acb076c820dcacd41126f753… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Mar 6 15:48:39 2020 +0200 jscript: Lookup host global object on demand instead of storing it in script context. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 17 ++++++++++++++++- dlls/jscript/engine.h | 1 + dlls/jscript/function.c | 4 +--- dlls/jscript/jscript.c | 10 ---------- dlls/jscript/jscript.h | 2 -- dlls/jscript/tests/jscript.c | 2 -- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 3946d02da2..ce7fbbc572 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -605,6 +605,21 @@ static BOOL lookup_global_members(script_ctx_t *ctx, BSTR identifier, exprval_t return FALSE; } +IDispatch *lookup_global_host(script_ctx_t *ctx) +{ + IDispatch *disp = NULL; + named_item_t *item; + + LIST_FOR_EACH_ENTRY(item, &ctx->named_items, named_item_t, entry) { + if(!(item->flags & SCRIPTITEM_GLOBALMEMBERS)) continue; + disp = item->disp; + break; + } + if(!disp) disp = to_disp(ctx->global); + + return disp; +} + static int __cdecl local_ref_cmp(const void *key, const void *ref) { return wcscmp((const WCHAR*)key, ((const local_ref_t*)ref)->name); @@ -1223,7 +1238,7 @@ static HRESULT interp_this(script_ctx_t *ctx) TRACE("\n"); if(!this_obj) - this_obj = ctx->host_global ? ctx->host_global : to_disp(ctx->global); + this_obj = lookup_global_host(ctx); IDispatch_AddRef(this_obj); return stack_push(ctx, jsval_disp(this_obj)); diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index cad46e12c5..7be98c51db 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -170,6 +170,7 @@ typedef struct _function_code_t { bytecode_t *bytecode; } function_code_t; +IDispatch *lookup_global_host(script_ctx_t*) DECLSPEC_HIDDEN; local_ref_t *lookup_local(const function_code_t*,const WCHAR*) DECLSPEC_HIDDEN; struct _bytecode_t { diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index baa5eb10d7..ef0de960ff 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -612,10 +612,8 @@ static HRESULT NativeFunction_call(script_ctx_t *ctx, FunctionInstance *func, ID if(this_disp) set_disp(&vthis, this_disp); - else if(ctx->host_global) - set_disp(&vthis, ctx->host_global); else - set_jsdisp(&vthis, ctx->global); + set_disp(&vthis, lookup_global_host(ctx)); hres = function->proc(ctx, &vthis, flags & ~DISPATCH_JSCRIPT_INTERNAL_MASK, argc, argv, r); diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index b878aa5e2d..36d9f84d32 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -409,11 +409,6 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) case SCRIPTSTATE_INITIALIZED: clear_script_queue(This); - if(This->ctx->host_global) { - IDispatch_Release(This->ctx->host_global); - This->ctx->host_global = NULL; - } - while(!list_empty(&This->ctx->named_items)) { named_item_t *iter = LIST_ENTRY(list_head(&This->ctx->named_items), named_item_t, entry); @@ -820,11 +815,6 @@ static HRESULT WINAPI JScript_AddNamedItem(IActiveScript *iface, WARN("object does not implement IDispatch\n"); return hres; } - - if(This->ctx->host_global) - IDispatch_Release(This->ctx->host_global); - IDispatch_AddRef(disp); - This->ctx->host_global = disp; } item = heap_alloc(sizeof(*item)); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 7f34b55973..f9d6992704 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -422,8 +422,6 @@ struct _script_ctx_t { heap_pool_t tmp_heap; - IDispatch *host_global; - jsval_t *stack; unsigned stack_size; unsigned stack_top; diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index a7dfd11347..8d4f6e1673 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -1394,7 +1394,6 @@ static void test_named_items(void) SET_EXPECT(OnLeaveScript); hr = IActiveScriptParse_ParseScriptText(parse, L"this", NULL, NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); - todo_wine ok(V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == &global_named_item, "Unexpected 'this': V_VT = %d, V_DISPATCH = %p\n", V_VT(&var), V_DISPATCH(&var)); VariantClear(&var); @@ -1427,7 +1426,6 @@ static void test_named_items(void) SET_EXPECT(OnLeaveScript); hr = IActiveScriptParse_ParseScriptText(parse, L"globalCode_this", NULL, NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); - todo_wine ok(V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == &global_named_item, "Unexpected 'this': V_VT = %d, V_DISPATCH = %p\n", V_VT(&var), V_DISPATCH(&var)); VariantClear(&var);

1 0

Gabriel Ivăncescu : jscript: Use NULL in frame->this_obj for the global code object.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: fcba99c52ea781ebaeb581fa4e5b00ca2b62c8ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcba99c52ea781ebaeb581fa… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Mar 6 15:48:38 2020 +0200 jscript: Use NULL in frame->this_obj for the global code object. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 7da8f707ed..3946d02da2 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1218,12 +1218,15 @@ static HRESULT interp_call_member(script_ctx_t *ctx) /* ECMA-262 3rd Edition 11.1.1 */ static HRESULT interp_this(script_ctx_t *ctx) { - call_frame_t *frame = ctx->call_ctx; + IDispatch *this_obj = ctx->call_ctx->this_obj; TRACE("\n"); - IDispatch_AddRef(frame->this_obj); - return stack_push(ctx, jsval_disp(frame->this_obj)); + if(!this_obj) + this_obj = ctx->host_global ? ctx->host_global : to_disp(ctx->global); + + IDispatch_AddRef(this_obj); + return stack_push(ctx, jsval_disp(this_obj)); } static HRESULT interp_identifier_ref(script_ctx_t *ctx, BSTR identifier, unsigned flags) @@ -2700,7 +2703,7 @@ static void print_backtrace(script_ctx_t *ctx) WARN("%u\t", depth); depth++; - if(frame->this_obj && frame->this_obj != to_disp(ctx->global) && frame->this_obj != ctx->host_global) + if(frame->this_obj) WARN("%p->", frame->this_obj); WARN("%s(", frame->function->name ? debugstr_w(frame->function->name) : "[unnamed]"); if(frame->base_scope && frame->base_scope->frame) { @@ -3055,13 +3058,10 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi frame->ip = function->instr_off; frame->stack_base = ctx->stack_top; - if(this_obj) + if(this_obj) { frame->this_obj = this_obj; - else if(ctx->host_global) - frame->this_obj = ctx->host_global; - else - frame->this_obj = to_disp(ctx->global); - IDispatch_AddRef(frame->this_obj); + IDispatch_AddRef(frame->this_obj); + } if(function_instance) frame->function_instance = jsdisp_addref(function_instance);

1 0

Zhiyi Zhang : wined3d: Refactor wined3d_find_closest_matching_adapter_mode() to wined3d_output_find_closest_matching_mode().
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: c51e97bc0d47ac61475a004c23f1e46fd93f3a39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c51e97bc0d47ac61475a004c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 6 21:16:48 2020 +0800 wined3d: Refactor wined3d_find_closest_matching_adapter_mode() to wined3d_output_find_closest_matching_mode(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/output.c | 7 +------ dlls/dxgi/swapchain.c | 9 ++------- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 17 ++++++++--------- dlls/wined3d/swapchain.c | 23 ++++++++++------------- dlls/wined3d/wined3d.spec | 6 +++--- dlls/wined3d/wined3d_main.c | 4 ++-- include/wine/wined3d.h | 11 +++++------ 8 files changed, 32 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c51e97bc0d47ac61475a…

1 0

Zhiyi Zhang : wined3d: Refactor wined3d_get_adapter_display_mode() to wined3d_output_get_display_mode().
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: aa177f6afcf93796a79c129ec713224abd541d8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa177f6afcf93796a79c129e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 6 21:16:29 2020 +0800 wined3d: Refactor wined3d_get_adapter_display_mode() to wined3d_output_get_display_mode(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 7 ++++++- dlls/d3d9/directx.c | 14 ++++++++++++-- dlls/ddraw/ddraw.c | 12 ++++++------ dlls/ddraw/device.c | 8 ++++---- dlls/ddraw/surface.c | 2 +- dlls/dxgi/swapchain.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 25 +++++++++++-------------- dlls/wined3d/swapchain.c | 31 ++++++++++++++++--------------- dlls/wined3d/wined3d.spec | 4 ++-- include/wine/wined3d.h | 6 +++--- 11 files changed, 63 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa177f6afcf93796a79c…

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 March 2020