March 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : qcap/capturegraph: Return BOOL from pin_matches().
by Alexandre Julliard March 6, 2020

March 6, 2020

Module: wine Branch: master Commit: e09be148f2220b3706f7c4e95e9a04d473d03883 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e09be148f2220b3706f7c4e9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 5 20:04:33 2020 -0600 qcap/capturegraph: Return BOOL from pin_matches(). It is not interesting to account for IPin::QueryDirection failing. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/capturegraph.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index bae75f8372..7a96101724 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -580,25 +580,24 @@ fnCaptureGraphBuilder2_CopyCaptureFile(ICaptureGraphBuilder2 * iface, return E_NOTIMPL; } -static HRESULT pin_matches(IPin *pin, PIN_DIRECTION direction, const GUID *cat, const GUID *type, BOOL unconnected) +static BOOL pin_matches(IPin *pin, PIN_DIRECTION direction, const GUID *cat, const GUID *type, BOOL unconnected) { IPin *partner; PIN_DIRECTION pindir; HRESULT hr; - hr = IPin_QueryDirection(pin, &pindir); + if (FAILED(hr = IPin_QueryDirection(pin, &pindir))) + ERR("Failed to query direction, hr %#x.\n", hr); if (unconnected && IPin_ConnectedTo(pin, &partner) == S_OK && partner!=NULL) { IPin_Release(partner); TRACE("No match, %p already connected to %p\n", pin, partner); - return FAILED(hr) ? hr : S_FALSE; + return FALSE; } - if (FAILED(hr)) - return hr; - if (SUCCEEDED(hr) && pindir != direction) - return S_FALSE; + if (pindir != direction) + return FALSE; if (cat) { @@ -608,13 +607,13 @@ static HRESULT pin_matches(IPin *pin, PIN_DIRECTION direction, const GUID *cat, hr = IPin_QueryInterface(pin, &IID_IKsPropertySet, (void**)&props); if (FAILED(hr)) - return S_FALSE; + return FALSE; hr = IKsPropertySet_Get(props, &AMPROPSETID_Pin, 0, NULL, 0, &category, sizeof(category), &fetched); IKsPropertySet_Release(props); if (FAILED(hr) || !IsEqualIID(&category, cat)) - return S_FALSE; + return FALSE; } if (type) @@ -625,14 +624,14 @@ static HRESULT pin_matches(IPin *pin, PIN_DIRECTION direction, const GUID *cat, hr = IPin_EnumMediaTypes(pin, &types); if (FAILED(hr)) - return S_FALSE; + return FALSE; IEnumMediaTypes_Reset(types); while (1) { if (IEnumMediaTypes_Next(types, 1, &media_type, &fetched) != S_OK || fetched != 1) { IEnumMediaTypes_Release(types); - return S_FALSE; + return FALSE; } if (IsEqualIID(&media_type->majortype, type)) @@ -646,7 +645,7 @@ static HRESULT pin_matches(IPin *pin, PIN_DIRECTION direction, const GUID *cat, } TRACE("Pin matched\n"); - return S_OK; + return TRUE; } static HRESULT WINAPI @@ -712,13 +711,10 @@ fnCaptureGraphBuilder2_FindPin(ICaptureGraphBuilder2 * iface, } TRACE("Testing match\n"); - hr = pin_matches(pin, pindir, pCategory, pType, fUnconnected); - if (hr == S_OK && numcurrent++ == num) + if (pin_matches(pin, pindir, pCategory, pType, fUnconnected) && numcurrent++ == num) break; IPin_Release(pin); pin = NULL; - if (FAILED(hr)) - break; } IEnumPins_Release(enumpins); IBaseFilter_Release(filter); @@ -729,7 +725,7 @@ fnCaptureGraphBuilder2_FindPin(ICaptureGraphBuilder2 * iface, return E_FAIL; } } - else if (pin_matches(pin, pindir, pCategory, pType, fUnconnected) != S_OK) + else if (!pin_matches(pin, pindir, pCategory, pType, fUnconnected)) { IPin_Release(pin); return E_FAIL;

1 0

Zebediah Figura : d3dcompiler: Pass a struct source_location to add_func_parameter().
by Alexandre Julliard March 6, 2020

March 6, 2020

Module: wine Branch: master Commit: 3048fb906485e174b5d6327fb9a41e05c1bce642 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3048fb906485e174b5d6327f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 3 20:29:48 2020 -0600 d3dcompiler: Pass a struct source_location to add_func_parameter(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 593090ed35..e91c2a08eb 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -826,7 +826,7 @@ static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct lis return TRUE; } -static BOOL add_func_parameter(struct list *list, struct parse_parameter *param, const struct source_location *loc) +static BOOL add_func_parameter(struct list *list, struct parse_parameter *param, const struct source_location loc) { struct hlsl_ir_var *decl = d3dcompiler_alloc(sizeof(*decl)); @@ -836,7 +836,7 @@ static BOOL add_func_parameter(struct list *list, struct parse_parameter *param, return FALSE; } decl->data_type = param->type; - decl->loc = *loc; + decl->loc = loc; decl->name = param->name; decl->semantic = param->semantic; decl->reg_reservation = param->reg_reservation; @@ -1411,12 +1411,9 @@ parameters: scope_start param_list: parameter { - struct source_location loc; - $$ = d3dcompiler_alloc(sizeof(*$$)); list_init($$); - loc = get_location(&@1); - if (!add_func_parameter($$, &$1, &loc)) + if (!add_func_parameter($$, &$1, get_location(&@1))) { ERR("Error adding function parameter %s.\n", $1.name); set_parse_status(&hlsl_ctx.status, PARSE_ERR); @@ -1425,13 +1422,10 @@ param_list: parameter } | param_list ',' parameter { - struct source_location loc; - $$ = $1; - loc = get_location(&@3); - if (!add_func_parameter($$, &$3, &loc)) + if (!add_func_parameter($$, &$3, get_location(&@3))) { - hlsl_report_message(loc, HLSL_LEVEL_ERROR, + hlsl_report_message(get_location(&@3), HLSL_LEVEL_ERROR, "duplicate parameter %s", $3.name); YYABORT; }

1 0

Nikolay Sivov : mfplat: Remove extra critical section from presentation descriptor.
by Alexandre Julliard March 6, 2020

March 6, 2020

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

Vincent Povirk : windowscodecs: Fix ICNS encoder write_source call.
by Alexandre Julliard March 6, 2020

March 6, 2020

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 : mfplat: Remove extra critical section used in sample implementation.
by Alexandre Julliard March 6, 2020

March 6, 2020

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

Matteo Bruni : d3d9: Retrieve state from the stateblock in d3d9_stateblock_Apply().
by Alexandre Julliard March 6, 2020

March 6, 2020

Module: wine Branch: master Commit: acaf1204e0892eb5b97078472446d4db6de53887 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acaf1204e0892eb5b9707847… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 6 12:33:13 2020 +0100 d3d9: Retrieve state from the stateblock in d3d9_stateblock_Apply(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/stateblock.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index a1ce3d5856..3c1e323009 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -118,11 +118,9 @@ static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) struct wined3d_texture *wined3d_texture; struct wined3d_buffer *wined3d_buffer; struct d3d9_vertexbuffer *buffer; - unsigned int i, offset, stride; - enum wined3d_format_id format; struct d3d9_texture *texture; struct d3d9_device *device; - HRESULT hr; + unsigned int i; TRACE("iface %p.\n", iface); @@ -138,15 +136,14 @@ static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) device->sysmem_vb = 0; for (i = 0; i < D3D9_MAX_STREAMS; ++i) { - if (FAILED(hr = wined3d_device_get_stream_source(device->wined3d_device, - i, &wined3d_buffer, &offset, &stride))) + if (!(wined3d_buffer = device->stateblock_state->streams[i].buffer)) continue; - if (!wined3d_buffer || !(buffer = wined3d_buffer_get_parent(wined3d_buffer))) + if (!(buffer = wined3d_buffer_get_parent(wined3d_buffer))) continue; if (buffer->draw_buffer) device->sysmem_vb |= 1u << i; } - device->sysmem_ib = (wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &format, &offset)) + device->sysmem_ib = (wined3d_buffer = device->stateblock_state->index_buffer) && (buffer = wined3d_buffer_get_parent(wined3d_buffer)) && buffer->draw_buffer; device->auto_mipmaps = 0; for (i = 0; i < D3D9_MAX_TEXTURE_UNITS; ++i)

1 0

Zhiyi Zhang : wined3d: Refactor wined3d_get_adapter_display_mode() to wined3d_output_get_display_mode().
by Alexandre Julliard March 6, 2020

March 6, 2020

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

Gabriel Ivăncescu : jscript: Use NULL in frame->this_obj for the global code object.
by Alexandre Julliard March 6, 2020

March 6, 2020

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

March 6, 2020

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: Pass a struct wined3d_output pointer to wined3d_swapchain_state_set_display_mode().
by Alexandre Julliard March 6, 2020

March 6, 2020

Module: wine Branch: master Commit: 3635e09dd51ae37331c1a33236bd026a36ffbef8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3635e09dd51ae37331c1a332… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 6 21:16:02 2020 +0800 wined3d: Pass a struct wined3d_output pointer to wined3d_swapchain_state_set_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/wined3d/swapchain.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 312e8f2d24..65935a6165 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1430,19 +1430,19 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha } static HRESULT wined3d_swapchain_state_set_display_mode(struct wined3d_swapchain_state *state, - struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_display_mode *mode) + struct wined3d *wined3d, struct wined3d_output *output, struct wined3d_display_mode *mode) { HRESULT hr; if (state->desc.flags & WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE) { - if (FAILED(hr = wined3d_find_closest_matching_adapter_mode(wined3d, adapter_idx, mode))) + if (FAILED(hr = wined3d_find_closest_matching_adapter_mode(wined3d, 0, mode))) { WARN("Failed to find closest matching mode, hr %#x.\n", hr); } } - if (FAILED(hr = wined3d_set_adapter_display_mode(wined3d, adapter_idx, mode))) + if (FAILED(hr = wined3d_set_adapter_display_mode(wined3d, 0, mode))) { WARN("Failed to set display mode, hr %#x.\n", hr); return WINED3DERR_INVALIDCALL; @@ -1480,7 +1480,8 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta else if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { actual_mode = *mode; - if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, 0, &actual_mode))) + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, output, + &actual_mode))) { wined3d_mutex_unlock(); return hr; @@ -1649,7 +1650,8 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st } } - if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, 0, &actual_mode))) + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, output, + &actual_mode))) return hr; } else

1 0