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

Michael Stefaniuc : d3dx9/tests: Remove useless cast to self.
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: 9b0258f5756ed60b334ac20ca2f6e7f64eb5077e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b0258f5756ed60b334ac20c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 1 21:08:25 2019 +0100 d3dx9/tests: Remove useless cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 0c3e001..1b9e120 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2026,7 +2026,7 @@ static void D3DXVector2Test(void) D3DXVec2TransformCoord(&gotvec, &u, &mat); expect_vec2(&expectedvec, &gotvec, 1); gotvec.x = u.x; gotvec.y = u.y; - D3DXVec2TransformCoord(&gotvec, (D3DXVECTOR2 *)&gotvec, &mat); + D3DXVec2TransformCoord(&gotvec, &gotvec, &mat); expect_vec2(&expectedvec, &gotvec, 1); /*_______________D3DXVec2TransformNormal______________________*/

1 0

Józef Kucia : wined3d: Avoid passing gl_info to compile_state_table().
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: a2954a712154272b2baa578dfb25ea62764d7f76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2954a712154272b2baa578d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Mar 3 19:55:25 2019 +0100 wined3d: Avoid passing gl_info to compile_state_table(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4caa1e8..61896a2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5358,7 +5358,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, if (vertex_pipeline->vp_states && fragment_pipeline->states && FAILED(hr = compile_state_table(device->StateTable, device->multistate_funcs, - &adapter->gl_info, &adapter->d3d_info, vertex_pipeline, + &adapter->d3d_info, adapter->gl_info.supported, vertex_pipeline, fragment_pipeline, misc_state_template))) { ERR("Failed to compile state table, hr %#x.\n", hr); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 7952579..969dfc2 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5520,7 +5520,7 @@ static void validate_state_table(struct StateEntry *state_table) } HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs, - const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, + const struct wined3d_d3d_info *d3d_info, const BOOL *supported_extensions, const struct wined3d_vertex_pipe_ops *vertex, const struct fragment_pipeline *fragment, const struct StateEntryTemplate *misc) { @@ -5563,7 +5563,7 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ */ if(set[cur[i].state]) continue; /* Skip state lines depending on unsupported extensions */ - if (!gl_info->supported[cur[i].extension]) continue; + if (!supported_extensions[cur[i].extension]) continue; set[cur[i].state] = TRUE; /* In some cases having an extension means that nothing has to be * done for a state, e.g. if GL_ARB_texture_non_power_of_two is diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3d51a90..51b86a7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2037,7 +2037,7 @@ struct StateEntryTemplate { DWORD state; struct StateEntry content; - enum wined3d_gl_extension extension; + unsigned int extension; }; #define WINED3D_FRAGMENT_CAP_PROJ_CONTROL 0x00000001 @@ -2108,7 +2108,7 @@ extern const struct wined3d_vertex_pipe_ops glsl_vertex_pipe DECLSPEC_HIDDEN; /* "Base" state table */ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs, - const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, + const struct wined3d_d3d_info *d3d_info, const BOOL *supported_extensions, const struct wined3d_vertex_pipe_ops *vertex, const struct fragment_pipeline *fragment, const struct StateEntryTemplate *misc) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Add IHTMLDOMImplementation2 stub implementation.
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: bd0c7c7af43fbeef2c28fc6fe7537cce9e5898fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd0c7c7af43fbeef2c28fc6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 4 18:14:10 2019 +0100 mshtml: Add IHTMLDOMImplementation2 stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/omnavigator.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index e0b8f73..0f44004 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -47,6 +47,7 @@ typedef struct { typedef struct { DispatchEx dispex; IHTMLDOMImplementation IHTMLDOMImplementation_iface; + IHTMLDOMImplementation2 IHTMLDOMImplementation2_iface; LONG ref; } HTMLDOMImplementation; @@ -64,6 +65,8 @@ static HRESULT WINAPI HTMLDOMImplementation_QueryInterface(IHTMLDOMImplementatio if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IHTMLDOMImplementation, riid)) { *ppv = &This->IHTMLDOMImplementation_iface; + }else if(IsEqualGUID(&IID_IHTMLDOMImplementation2, riid)) { + *ppv = &This->IHTMLDOMImplementation2_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { @@ -157,6 +160,110 @@ static const IHTMLDOMImplementationVtbl HTMLDOMImplementationVtbl = { HTMLDOMImplementation_hasFeature }; +static inline HTMLDOMImplementation *impl_from_IHTMLDOMImplementation2(IHTMLDOMImplementation2 *iface) +{ + return CONTAINING_RECORD(iface, HTMLDOMImplementation, IHTMLDOMImplementation2_iface); +} + +static HRESULT WINAPI HTMLDOMImplementation2_QueryInterface(IHTMLDOMImplementation2 *iface, REFIID riid, void **ppv) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + return IHTMLDOMImplementation_QueryInterface(&This->IHTMLDOMImplementation_iface, riid, ppv); +} + +static ULONG WINAPI HTMLDOMImplementation2_AddRef(IHTMLDOMImplementation2 *iface) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + return IHTMLDOMImplementation_AddRef(&This->IHTMLDOMImplementation_iface); +} + +static ULONG WINAPI HTMLDOMImplementation2_Release(IHTMLDOMImplementation2 *iface) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + return IHTMLDOMImplementation_Release(&This->IHTMLDOMImplementation_iface); +} + +static HRESULT WINAPI HTMLDOMImplementation2_GetTypeInfoCount(IHTMLDOMImplementation2 *iface, UINT *pctinfo) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLDOMImplementation2_GetTypeInfo(IHTMLDOMImplementation2 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLDOMImplementation2_GetIDsOfNames(IHTMLDOMImplementation2 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, + cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLDOMImplementation2_Invoke(IHTMLDOMImplementation2 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLDOMImplementation2_createDocumentType(IHTMLDOMImplementation2 *iface, BSTR name, + VARIANT *public_id, VARIANT *system_id, IDOMDocumentType **new_type) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + FIXME("(%p)->(%s %s %s %p)\n", This, debugstr_w(name), debugstr_variant(public_id), + debugstr_variant(system_id), new_type); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMImplementation2_createDocument(IHTMLDOMImplementation2 *iface, VARIANT *ns, + VARIANT *tag_name, IDOMDocumentType *document_type, IHTMLDocument7 **new_document) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + FIXME("(%p)->(%s %s %p %p)\n", This, debugstr_variant(ns), debugstr_variant(tag_name), + document_type, new_document); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMImplementation2_createHTMLDocument(IHTMLDOMImplementation2 *iface, BSTR title, + IHTMLDocument7 **new_document) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(title), new_document); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMImplementation2_hasFeature(IHTMLDOMImplementation2 *iface, BSTR feature, + VARIANT version, VARIANT_BOOL *pfHasFeature) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + + FIXME("(%p)->(%s %s %p) returning false\n", This, debugstr_w(feature), debugstr_variant(&version), pfHasFeature); + + *pfHasFeature = VARIANT_FALSE; + return S_OK; +} + +static const IHTMLDOMImplementation2Vtbl HTMLDOMImplementation2Vtbl = { + HTMLDOMImplementation2_QueryInterface, + HTMLDOMImplementation2_AddRef, + HTMLDOMImplementation2_Release, + HTMLDOMImplementation2_GetTypeInfoCount, + HTMLDOMImplementation2_GetTypeInfo, + HTMLDOMImplementation2_GetIDsOfNames, + HTMLDOMImplementation2_Invoke, + HTMLDOMImplementation2_createDocumentType, + HTMLDOMImplementation2_createDocument, + HTMLDOMImplementation2_createHTMLDocument, + HTMLDOMImplementation2_hasFeature +}; + static const tid_t HTMLDOMImplementation_iface_tids[] = { IHTMLDOMImplementation_tid, 0 @@ -176,6 +283,7 @@ HRESULT create_dom_implementation(IHTMLDOMImplementation **ret) return E_OUTOFMEMORY; dom_implementation->IHTMLDOMImplementation_iface.lpVtbl = &HTMLDOMImplementationVtbl; + dom_implementation->IHTMLDOMImplementation2_iface.lpVtbl = &HTMLDOMImplementation2Vtbl; dom_implementation->ref = 1; init_dispex(&dom_implementation->dispex, (IUnknown*)&dom_implementation->IHTMLDOMImplementation_iface,

1 0

Józef Kucia : wined3d: Rename state entry structures.
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: 32c54006d275b75b9861e1180ace8abb3a0b3cc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32c54006d275b75b9861e118… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Mar 3 19:55:27 2019 +0100 wined3d: Rename state entry structures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ati_fragment_shader.c | 3 ++- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/state.c | 16 ++++++++-------- dlls/wined3d/wined3d_private.h | 26 +++++++++++++------------- 7 files changed, 29 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=32c54006d275b75b9861…

1 0

Józef Kucia : wined3d: Rename StateTable.
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: 1d1511f66d19e93a2d62da88c17ae810467e6977 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d1511f66d19e93a2d62da88… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Mar 3 19:55:26 2019 +0100 wined3d: Rename StateTable. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 10 ++++----- dlls/wined3d/state.c | 49 +++++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 34 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 122ed70..37264a0 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1953,7 +1953,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, context->win_handle = swapchain->win_handle; context->gl_info = &device->adapter->gl_info; context->d3d_info = &device->adapter->d3d_info; - context->state_table = device->StateTable; + context->state_table = device->state_table; /* Mark all states dirty to force a proper initialization of the states on * the first use of the context. Compute states do not need initialization. */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 61896a2..79a5b68 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5357,7 +5357,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, wine_rb_init(&device->samplers, wined3d_sampler_compare); if (vertex_pipeline->vp_states && fragment_pipeline->states - && FAILED(hr = compile_state_table(device->StateTable, device->multistate_funcs, + && FAILED(hr = compile_state_table(device->state_table, device->multistate_funcs, &adapter->d3d_info, adapter->gl_info.supported, vertex_pipeline, fragment_pipeline, misc_state_template))) { @@ -5396,11 +5396,9 @@ err: void device_invalidate_state(const struct wined3d_device *device, DWORD state) { - DWORD rep = device->StateTable[state].representative; + DWORD rep = device->state_table[state].representative; struct wined3d_context *context; - DWORD idx; - BYTE shift; - UINT i; + unsigned int i, idx, shift; wined3d_from_cs(device->cs); @@ -5414,7 +5412,7 @@ void device_invalidate_state(const struct wined3d_device *device, DWORD state) for (i = 0; i < device->context_count; ++i) { context = device->contexts[i]; - if(isStateDirty(context, rep)) continue; + if (isStateDirty(context, rep)) continue; context->dirtyArray[context->numDirtyEntries++] = rep; idx = rep / (sizeof(*context->isStateDirty) * CHAR_BIT); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 969dfc2..9dc9804 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5519,39 +5519,43 @@ static void validate_state_table(struct StateEntry *state_table) } } -HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs, +HRESULT compile_state_table(struct StateEntry *state_table, APPLYSTATEFUNC **dev_multistate_funcs, const struct wined3d_d3d_info *d3d_info, const BOOL *supported_extensions, const struct wined3d_vertex_pipe_ops *vertex, const struct fragment_pipeline *fragment, const struct StateEntryTemplate *misc) { - unsigned int i, type, handlers; APPLYSTATEFUNC multistate_funcs[STATE_HIGHEST + 1][3]; const struct StateEntryTemplate *cur; + unsigned int i, type, handlers; BOOL set[STATE_HIGHEST + 1]; memset(multistate_funcs, 0, sizeof(multistate_funcs)); - for(i = 0; i < STATE_HIGHEST + 1; i++) { - StateTable[i].representative = 0; - StateTable[i].apply = state_undefined; + for (i = 0; i < STATE_HIGHEST + 1; ++i) + { + state_table[i].representative = 0; + state_table[i].apply = state_undefined; } - for(type = 0; type < 3; type++) { + for (type = 0; type < 3; ++type) + { /* This switch decides the order in which the states are applied */ - switch(type) { + switch (type) + { case 0: cur = misc; break; case 1: cur = fragment->states; break; case 2: cur = vertex->vp_states; break; default: cur = NULL; /* Stupid compiler */ } - if(!cur) continue; + if (!cur) continue; /* GL extension filtering should not prevent multiple handlers being applied from different * pipeline parts */ memset(set, 0, sizeof(set)); - for(i = 0; cur[i].state; i++) { + for (i = 0; cur[i].state; ++i) + { APPLYSTATEFUNC *funcs_array; /* Only use the first matching state with the available extension from one template. @@ -5561,7 +5565,7 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ * * if GL_XYZ_fancy is supported, ignore the 2nd line */ - if(set[cur[i].state]) continue; + if (set[cur[i].state]) continue; /* Skip state lines depending on unsupported extensions */ if (!supported_extensions[cur[i].extension]) continue; set[cur[i].state] = TRUE; @@ -5576,12 +5580,13 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ handlers = num_handlers(multistate_funcs[cur[i].state]); multistate_funcs[cur[i].state][handlers] = cur[i].content.apply; - switch(handlers) { + switch (handlers) + { case 0: - StateTable[cur[i].state].apply = cur[i].content.apply; + state_table[cur[i].state].apply = cur[i].content.apply; break; case 1: - StateTable[cur[i].state].apply = multistate_apply_2; + state_table[cur[i].state].apply = multistate_apply_2; if (!(dev_multistate_funcs[cur[i].state] = heap_calloc(2, sizeof(**dev_multistate_funcs)))) goto out_of_mem; @@ -5589,7 +5594,7 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ dev_multistate_funcs[cur[i].state][1] = multistate_funcs[cur[i].state][1]; break; case 2: - StateTable[cur[i].state].apply = multistate_apply_3; + state_table[cur[i].state].apply = multistate_apply_3; if (!(funcs_array = heap_realloc(dev_multistate_funcs[cur[i].state], sizeof(**dev_multistate_funcs) * 3))) goto out_of_mem; @@ -5598,22 +5603,22 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ dev_multistate_funcs[cur[i].state][2] = multistate_funcs[cur[i].state][2]; break; default: - ERR("Unexpected amount of state handlers for state %u: %u\n", - cur[i].state, handlers + 1); + ERR("Unexpected amount of state handlers for state %u: %u.\n", + cur[i].state, handlers + 1); } - if (StateTable[cur[i].state].representative - && StateTable[cur[i].state].representative != cur[i].content.representative) + if (state_table[cur[i].state].representative + && state_table[cur[i].state].representative != cur[i].content.representative) { FIXME("State %s (%#x) has different representatives in different pipeline parts.\n", debug_d3dstate(cur[i].state), cur[i].state); } - StateTable[cur[i].state].representative = cur[i].content.representative; + state_table[cur[i].state].representative = cur[i].content.representative; } } - prune_invalid_states(StateTable, d3d_info); - validate_state_table(StateTable); + prune_invalid_states(state_table, d3d_info); + validate_state_table(state_table); return WINED3D_OK; @@ -5623,7 +5628,7 @@ out_of_mem: heap_free(dev_multistate_funcs[i]); } - memset(dev_multistate_funcs, 0, (STATE_HIGHEST + 1)*sizeof(*dev_multistate_funcs)); + memset(dev_multistate_funcs, 0, (STATE_HIGHEST + 1) * sizeof(*dev_multistate_funcs)); return E_OUTOFMEMORY; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 51b86a7..8fe3310 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2107,7 +2107,7 @@ extern const struct wined3d_vertex_pipe_ops ffp_vertex_pipe DECLSPEC_HIDDEN; extern const struct wined3d_vertex_pipe_ops glsl_vertex_pipe DECLSPEC_HIDDEN; /* "Base" state table */ -HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs, +HRESULT compile_state_table(struct StateEntry *state_table, APPLYSTATEFUNC **dev_multistate_funcs, const struct wined3d_d3d_info *d3d_info, const BOOL *supported_extensions, const struct wined3d_vertex_pipe_ops *vertex, const struct fragment_pipeline *fragment, const struct StateEntryTemplate *misc) DECLSPEC_HIDDEN; @@ -3038,7 +3038,7 @@ struct wined3d_device void *shader_priv; void *fragment_priv; void *vertex_priv; - struct StateEntry StateTable[STATE_HIGHEST + 1]; + struct StateEntry state_table[STATE_HIGHEST + 1]; /* Array of functions for states which are handled by more than one pipeline part */ APPLYSTATEFUNC *multistate_funcs[STATE_HIGHEST + 1]; struct wined3d_blitter *blitter;

1 0

Józef Kucia : wined3d: Store base vertex draw capabilities in struct wined3d_d3d_info.
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: 243f289149b02eebf505299c538f0dfaf923c552 URL: https://source.winehq.org/git/wine.git/?a=commit;h=243f289149b02eebf505299c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Mar 3 19:55:21 2019 +0100 wined3d: Store base vertex draw capabilities in struct wined3d_d3d_info. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 ++ dlls/wined3d/cs.c | 5 ++--- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 538e0c1..086d046 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3736,6 +3736,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->texture_npot_conditional = gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] || gl_info->supported[ARB_TEXTURE_RECTANGLE]; + d3d_info->draw_base_vertex_offset = !!gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]; + TRACE("Max texture stages: %u.\n", d3d_info->limits.ffp_blend_stages); if (!d3d_info->shader_color_key) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3de29d5..47b23de 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -842,7 +842,6 @@ void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; - const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; const struct wined3d_shader *geometry_shader; struct wined3d_device *device = cs->device; int base_vertex_idx, load_base_vertex_idx; @@ -855,14 +854,14 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { const struct wined3d_direct_draw_parameters *direct = &op->parameters.u.direct; - if (op->parameters.indexed && gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) + if (op->parameters.indexed && d3d_info->draw_base_vertex_offset) base_vertex_idx = direct->base_vertex_idx; else if (!op->parameters.indexed) base_vertex_idx = direct->start_idx; } /* ARB_draw_indirect always supports a base vertex offset. */ - if (!op->parameters.indirect && !gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) + if (!op->parameters.indirect && !d3d_info->draw_base_vertex_offset) load_base_vertex_idx = op->parameters.u.direct.base_vertex_idx; else load_base_vertex_idx = 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 125efeb..25a74dc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -205,6 +205,7 @@ struct wined3d_d3d_info unsigned int viewport_array_index_any_shader : 1; unsigned int texture_npot : 1; unsigned int texture_npot_conditional : 1; + unsigned int draw_base_vertex_offset : 1; enum wined3d_feature_level feature_level; };

1 0

Jacek Caban : mshtml.idl: Add IHTMLDOMImplementation2 and IDOMDocumentType declarations.
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: d30e6c96c64b5532d1cb01261818ac0f57fab4aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=d30e6c96c64b5532d1cb0126… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 4 18:14:00 2019 +0100 mshtml.idl: Add IHTMLDOMImplementation2 and IDOMDocumentType declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 15 ++++++++ include/mshtml.idl | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 01a2f5a..e16bf9e 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -119,6 +119,7 @@ #define DISPID_DOMRANGE DISPID_NORMAL_FIRST #define DISPID_MEDIA DISPID_NORMAL_FIRST #define DISPID_STYLEMEDIA DISPID_NORMAL_FIRST +#define DISPID_DOCUMENTTYPE DISPID_NORMAL_FIRST #define DISPID_DOMEVENT DISPID_NORMAL_FIRST #define DISPID_DOMUIEVENT (DISPID_DOMEVENT+25) @@ -3203,9 +3204,23 @@ #define DISPID_IHTMLRENDERSTYLE_DEFAULTTEXTSELECTION DISPID_A_DEFAULTTEXTSELECTION #define DISPID_IHTMLRENDERSTYLE_TEXTDECORATION DISPID_A_STYLETEXTDECORATION +/* IDOMDocumentType */ +#define DISPID_IDOMDOCUMENTTYPE_NAME DISPID_DOCUMENTTYPE +#define DISPID_IDOMDOCUMENTTYPE_ENTITIES DISPID_DOCUMENTTYPE+1 +#define DISPID_IDOMDOCUMENTTYPE_NOTATIONS DISPID_DOCUMENTTYPE+2 +#define DISPID_IDOMDOCUMENTTYPE_PUBLICID DISPID_DOCUMENTTYPE+3 +#define DISPID_IDOMDOCUMENTTYPE_SYSTEMID DISPID_DOCUMENTTYPE+4 +#define DISPID_IDOMDOCUMENTTYPE_INTERNALSUBSET DISPID_DOCUMENTTYPE+5 + /* IHTMLDOMImplementation */ #define DISPID_IHTMLDOMIMPLEMENTATION_HASFEATURE DISPID_DOMIMPLEMENTATION +/* IHTMLDOMImplementation2 */ +#define DISPID_IHTMLDOMIMPLEMENTATION2_CREATEDOCUMENTTYPE DISPID_DOMIMPLEMENTATION+1 +#define DISPID_IHTMLDOMIMPLEMENTATION2_CREATEDOCUMENT DISPID_DOMIMPLEMENTATION+2 +#define DISPID_IHTMLDOMIMPLEMENTATION2_CREATEHTMLDOCUMENT DISPID_DOMIMPLEMENTATION+3 +#define DISPID_IHTMLDOMIMPLEMENTATION2_IE9_HASFEATURE DISPID_DOMIMPLEMENTATION+4 + /* IHTMLDOMAttribute */ #define DISPID_IHTMLDOMATTRIBUTE_NODENAME DISPID_DOMATTRIBUTE #define DISPID_IHTMLDOMATTRIBUTE_NODEVALUE DISPID_DOMATTRIBUTE+2 diff --git a/include/mshtml.idl b/include/mshtml.idl index b92955c..cb80073 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -246,6 +246,7 @@ interface IHTMLDOMConstructor : IDispatch IDispatch *constructor() interface IHTMLDocument2; +interface IHTMLDocument7; interface IHTMLElement2; interface IHTMLStyleSheetsCollection; interface IHTMLFrameBase; @@ -5988,6 +5989,36 @@ coclass HTMLDOMTextNode } /***************************************************************************** + * IDOMDocumentType interface + */ +[ + odl, + oleautomation, + dual, + uuid(30510738-98b5-11cf-bb82-00aa00bdce0b) + ] +interface IDOMDocumentType : IDispatch +{ + [propget, id(DISPID_IDOMDOCUMENTTYPE_NAME)] + HRESULT name([out, retval] BSTR *p); + + [propget, id(DISPID_IDOMDOCUMENTTYPE_ENTITIES)] + HRESULT entities([out, retval] IDispatch **p); + + [propget, id(DISPID_IDOMDOCUMENTTYPE_NOTATIONS)] + HRESULT notations([out, retval] IDispatch **p); + + [propget, id(DISPID_IDOMDOCUMENTTYPE_PUBLICID)] + HRESULT publicId([out, retval] VARIANT *p); + + [propget, id(DISPID_IDOMDOCUMENTTYPE_SYSTEMID)] + HRESULT systemId([out, retval] VARIANT *p); + + [propget, id(DISPID_IDOMDOCUMENTTYPE_INTERNALSUBSET)] + HRESULT internalSubset([out, retval] VARIANT *p); +} + +/***************************************************************************** * IHTMLDOMImplementation interface */ [ @@ -6006,6 +6037,83 @@ interface IHTMLDOMImplementation : IDispatch } /***************************************************************************** + * IHTMLDOMImplementation2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3051073c-98b5-11cf-bb82-00aa00bdce0b) + ] +interface IHTMLDOMImplementation2 : IDispatch +{ + [id(DISPID_IHTMLDOMIMPLEMENTATION2_CREATEDOCUMENTTYPE)] + HRESULT createDocumentType( + [in] BSTR bstrQualifiedName, + [in] VARIANT *pvarPublicId, + [in] VARIANT *pvarSystemId, + [out, retval] IDOMDocumentType **newDocumentType); + + [id(DISPID_IHTMLDOMIMPLEMENTATION2_CREATEDOCUMENT)] + HRESULT createDocument( + [in] VARIANT *pvarNS, + [in] VARIANT *pvarTagName, + [in] IDOMDocumentType *pDocumentType, + [out, retval] IHTMLDocument7 **ppnewDocument); + + [id(DISPID_IHTMLDOMIMPLEMENTATION2_CREATEHTMLDOCUMENT)] + HRESULT createHTMLDocument( + [in] BSTR bstrTitle, + [out, retval] IHTMLDocument7 **ppnewDocument); + + [id(DISPID_IHTMLDOMIMPLEMENTATION2_IE9_HASFEATURE)] + HRESULT hasFeature( + [in] BSTR bstrfeature, + [in, optional] VARIANT version, + [out, retval] VARIANT_BOOL *pfHasFeature); +} + +/***************************************************************************** + * DispHTMLDOMImplementation dispinterface + */ +[ + hidden, + uuid(3050f58f-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLDOMImplementation +{ +properties: +methods: + [id(DISPID_IHTMLDOMIMPLEMENTATION_HASFEATURE)] + VARIANT_BOOL hasFeature( + [in] BSTR bstrfeature, + [in, optional] VARIANT version); + + [id(DISPID_IHTMLDOMIMPLEMENTATION2_CREATEDOCUMENTTYPE)] + IDOMDocumentType *createDocumentType( + [in] BSTR bstrQualifiedName, + [in] VARIANT *pvarPublicId, + [in] VARIANT *pvarSystemId); + + [id(DISPID_IHTMLDOMIMPLEMENTATION2_CREATEDOCUMENT)] + IHTMLDocument7 *createDocument( + [in] VARIANT *pvarNS, + [in] VARIANT *pvarTagName, + [in] IDOMDocumentType *pDocumentType); + + [id(DISPID_IHTMLDOMIMPLEMENTATION2_CREATEHTMLDOCUMENT)] + IHTMLDocument7 *createHTMLDocument([in] BSTR bstrTitle); + + [id(DISPID_IHTMLDOMIMPLEMENTATION2_IE9_HASFEATURE)] + VARIANT_BOOL ie9_hasFeature( + [in] BSTR bstrfeature, + [in, optional] VARIANT version); + + [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] + IDispatch *constructor(); +} + +/***************************************************************************** * DispHTMLDOMAttribute dispinterface */ [

1 0

Gijs Vermeulen : d3d8: Improve ValidatePixelShader().
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: 740102f33256c0274f6dfb4a357e2127705c487e URL: https://source.winehq.org/git/wine.git/?a=commit;h=740102f33256c0274f6dfb4a… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Mar 4 22:18:06 2019 +0330 d3d8: Improve ValidatePixelShader(). Based largely on a patch by Sebastian Lackner. Adapted from "Improve ValidateVertexShader()" by Henri Verbeet. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_main.c | 72 +++++++++++++++++++++------------------ dlls/d3d8/tests/device.c | 87 ++++++++++++++++++++++++++++++++++-------------- 2 files changed, 102 insertions(+), 57 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 17f35c9..62e8d31 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -103,41 +103,49 @@ done: return hr; } -/*********************************************************************** - * ValidatePixelShader (D3D8.@) - * - * PARAMS - * toto result? - */ -HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, BOOL boolean, DWORD* toto) +HRESULT WINAPI ValidatePixelShader(const DWORD *ps_code, + const D3DCAPS8 *caps, BOOL return_error, char **errors) { - HRESULT ret; - static BOOL warned; - - if (TRACE_ON(d3d8) || !warned) { - FIXME("(%p %p %d %p): stub\n", pixelshader, reserved1, boolean, toto); - warned = TRUE; - } - - if (!pixelshader) - return E_FAIL; - - if (reserved1) - return E_FAIL; - - switch(*pixelshader) { - case 0xFFFF0100: - case 0xFFFF0101: - case 0xFFFF0102: - case 0xFFFF0103: - case 0xFFFF0104: - ret=S_OK; + const char *message = ""; + SIZE_T message_size; + HRESULT hr = E_FAIL; + + TRACE("ps_code %p, caps %p, return_error %#x, errors %p.\n", + ps_code, caps, return_error, errors); + + if (!ps_code) + return E_FAIL; + + switch (*ps_code) + { + case D3DPS_VERSION(1, 4): + case D3DPS_VERSION(1, 3): + case D3DPS_VERSION(1, 2): + case D3DPS_VERSION(1, 1): + case D3DPS_VERSION(1, 0): break; + default: - WARN("Invalid shader version token %#x.\n", *pixelshader); - ret=E_FAIL; - } - return ret; + message = "Unsupported shader version.\n"; + goto done; + } + + if (caps && *ps_code > caps->PixelShaderVersion) + { + message = "Shader version not supported by caps.\n"; + goto done; + } + + hr = S_OK; + +done: + if (!return_error) + message = ""; + message_size = strlen(message) + 1; + if (errors && (*errors = heap_alloc(message_size))) + memcpy(*errors, message, message_size); + + return hr; } void d3d8_resource_cleanup(struct d3d8_resource *resource) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a647369..51dd3ae 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -53,7 +53,7 @@ struct device_desc static DEVMODEW registry_mode; static HRESULT (WINAPI *ValidateVertexShader)(const DWORD *, const DWORD *, const D3DCAPS8 *, BOOL, char **); -static HRESULT (WINAPI *ValidatePixelShader)(DWORD *, DWORD *, int, DWORD *); +static HRESULT (WINAPI *ValidatePixelShader)(const DWORD *, const D3DCAPS8 *, BOOL, char **); static BOOL (WINAPI *pGetCursorInfo)(PCURSORINFO); @@ -4506,43 +4506,80 @@ static void test_validate_vs(void) static void test_validate_ps(void) { - static DWORD ps[] = + static DWORD ps_1_1_code[] = { 0xffff0101, /* ps_1_1 */ - 0x00000051, 0xa00f0001, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, /* def c1 = 1.0, 0.0, 0.0, 0.0 */ - 0x00000042, 0xb00f0000, /* tex t0 */ - 0x00000008, 0x800f0000, 0xa0e40001, 0xa0e40000, /* dp3 r0, c1, c0 */ - 0x00000005, 0x800f0000, 0x90e40000, 0x80e40000, /* mul r0, v0, r0 */ - 0x00000005, 0x800f0000, 0xb0e40000, 0x80e40000, /* mul r0, t0, r0 */ - 0x0000ffff, /* end */ + 0x00000001, 0x800f0001, 0xa0e40001, /* mov r1, c1 */ + 0x00000002, 0x800f0000, 0x80e40001, 0xa0e40002, /* add r0, r1, c2 */ + 0x0000ffff /* end */ + }; + static const DWORD ps_2_0_code[] = + { + 0xffff0200, /* ps_2_0 */ + 0x02000001, 0x800f0001, 0xa0e40001, /* mov r1, c1 */ + 0x03000002, 0x800f0000, 0x80e40001, 0xa0e40002, /* add r0, r1, c2 */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff /* end */ }; + D3DCAPS8 caps; + char *errors; HRESULT hr; - hr = ValidatePixelShader(0, 0, 0, 0); + hr = ValidatePixelShader(NULL, NULL, FALSE, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = ValidatePixelShader(NULL, NULL, TRUE, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + errors = (void *)0xcafeface; + hr = ValidatePixelShader(NULL, NULL, FALSE, &errors); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - hr = ValidatePixelShader(0, 0, 1, 0); + ok(errors == (void *)0xcafeface, "Got unexpected errors %p.\n", errors); + errors = (void *)0xcafeface; + hr = ValidatePixelShader(NULL, NULL, TRUE, &errors); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - hr = ValidatePixelShader(ps, 0, 0, 0); + ok(errors == (void *)0xcafeface, "Got unexpected errors %p.\n", errors); + + hr = ValidatePixelShader(ps_1_1_code, NULL, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ValidatePixelShader(ps_1_1_code, NULL, TRUE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ValidatePixelShader(ps_1_1_code, NULL, TRUE, &errors); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!*errors, "Got unexpected string \"%s\".\n", errors); + heap_free(errors); - hr = ValidatePixelShader(ps, 0, 1, 0); + memset(&caps, 0, sizeof(caps)); + caps.PixelShaderVersion = D3DPS_VERSION(1, 1); + hr = ValidatePixelShader(ps_1_1_code, &caps, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - /* Seems to do some version checking. */ - *ps = 0xffff0105; /* bogus version */ - hr = ValidatePixelShader(ps, 0, 1, 0); + caps.PixelShaderVersion = D3DPS_VERSION(1, 0); + hr = ValidatePixelShader(ps_1_1_code, &caps, FALSE, NULL); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - /* I've seen that applications always pass the 2nd parameter as 0. - * Simple test with a non-zero parameter. */ - *ps = 0xffff0101; /* ps_1_1 */ - hr = ValidatePixelShader(ps, ps, 1, 0); - ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - /* I've seen the 3rd parameter always passed as either 0 or 1, but passing - * other values doesn't seem to hurt. */ - hr = ValidatePixelShader(ps, 0, 12345, 0); + caps.PixelShaderVersion = D3DPS_VERSION(1, 2); + hr = ValidatePixelShader(ps_1_1_code, &caps, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + caps.PixelShaderVersion = D3DPS_VERSION(8, 8); + hr = ValidatePixelShader(ps_1_1_code, &caps, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + *ps_1_1_code = D3DPS_VERSION(1, 0); + hr = ValidatePixelShader(ps_1_1_code, NULL, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - /* What is the 4th parameter? The following seems to work ok. */ - hr = ValidatePixelShader(ps, 0, 1, ps); + *ps_1_1_code = D3DPS_VERSION(1, 4); + hr = ValidatePixelShader(ps_1_1_code, NULL, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ValidatePixelShader(ps_2_0_code, NULL, FALSE, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + *ps_1_1_code = D3DPS_VERSION(1, 5); + hr = ValidatePixelShader(ps_1_1_code, NULL, TRUE, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = ValidatePixelShader(ps_1_1_code, NULL, FALSE, &errors); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!*errors, "Got unexpected string \"%s\".\n", errors); + heap_free(errors); + hr = ValidatePixelShader(ps_1_1_code, NULL, TRUE, &errors); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!!*errors, "Got unexpected empty string.\n"); + heap_free(errors); } static void test_volume_get_container(void)

1 0

Józef Kucia : wined3d: Get rid of valid_rt_mask.
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: dc2233ab4d05040f1b9497c574126d642f6ede5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc2233ab4d05040f1b9497c5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Mar 3 19:55:20 2019 +0100 wined3d: Get rid of valid_rt_mask. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 4 ---- dlls/wined3d/context.c | 9 +++++---- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 803ebda..538e0c1 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3738,10 +3738,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, TRACE("Max texture stages: %u.\n", d3d_info->limits.ffp_blend_stages); - d3d_info->valid_rt_mask = 0; - for (i = 0; i < gl_info->limits.buffers; ++i) - d3d_info->valid_rt_mask |= (1u << i); - if (!d3d_info->shader_color_key) { /* We do not want to deal with re-creating immutable texture storage diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 393b336..122ed70 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3147,11 +3147,12 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win return TRUE; } -static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const struct wined3d_state *state) +static unsigned int find_draw_buffers_mask(const struct wined3d_context *context, const struct wined3d_state *state) { struct wined3d_rendertarget_view * const *rts = state->fb->render_targets; struct wined3d_shader *ps = state->shader[WINED3D_SHADER_TYPE_PIXEL]; - DWORD rt_mask, mask; + const struct wined3d_gl_info *gl_info = context->gl_info; + unsigned int rt_mask, mask; unsigned int i; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) @@ -3160,7 +3161,7 @@ static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const return context_generate_rt_mask_from_resource(rts[0]->resource); rt_mask = ps ? ps->reg_maps.rt_mask : 1; - rt_mask &= context->d3d_info->valid_rt_mask; + rt_mask &= (1u << gl_info->limits.buffers) - 1; mask = rt_mask; while (mask) @@ -3176,7 +3177,7 @@ static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const /* Context activation is done by the caller. */ void context_state_fb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - DWORD rt_mask = find_draw_buffers_mask(context, state); + unsigned int rt_mask = find_draw_buffers_mask(context, state); const struct wined3d_fb_state *fb = state->fb; DWORD color_location = 0; DWORD *cur_mask; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1b70582..125efeb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -195,7 +195,6 @@ struct wined3d_d3d_info { struct wined3d_d3d_limits limits; struct wined3d_ffp_attrib_ops ffp_attrib_ops; - DWORD valid_rt_mask; DWORD wined3d_creation_flags; unsigned int xyzrhw : 1; unsigned int emulated_flatshading : 1;

1 0

Nikolay Sivov : mfplat: Move media type object code to separate file.
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: f4e849468e26deef7657dfd10a8bc70020848ecb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4e849468e26deef7657dfd1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 4 13:33:45 2019 +0300 mfplat: Move media type object code to separate file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/Makefile.in | 1 + dlls/mfplat/main.c | 366 +------------------------------------------ dlls/mfplat/mediatype.c | 366 +++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat_private.h | 10 ++ dlls/mfplat/queue.c | 1 - 5 files changed, 378 insertions(+), 366 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f4e849468e26deef7657…

1 0