June 2021 - Wine-commits - list.winehq.org

Jacek Caban : winepulse: Use syscall interface to call unix lib.
by Alexandre Julliard 01 Jun '21

01 Jun '21

Module: wine Branch: master Commit: 2e64d91428757eaa88475b49bf50922cda603b59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e64d91428757eaa88475b49… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 28 19:05:17 2021 +0200 winepulse: Use syscall interface to call unix lib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/Makefile.in | 2 +- dlls/winepulse.drv/mmdevdrv.c | 56 ++++++++------- dlls/winepulse.drv/pulse.c | 150 +++++++++++++++++++++++++++-------------- dlls/winepulse.drv/unixlib.h | 46 ++++++------- 4 files changed, 156 insertions(+), 98 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2e64d91428757eaa8847…

1 0

Matteo Bruni : d3dcompiler: Fix typo in struct d3dcompiler_shader_reflection.
by Alexandre Julliard 01 Jun '21

01 Jun '21

Module: wine Branch: master Commit: 749da353c985201797b00c7b8735727968758168 URL: https://source.winehq.org/git/wine.git/?a=commit;h=749da353c985201797b00c7b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon May 31 21:12:51 2021 +0200 d3dcompiler: Fix typo in struct d3dcompiler_shader_reflection. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 4415399793d..bd064793587 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -140,7 +140,7 @@ struct d3dcompiler_shader_reflection UINT dynamic_flow_control_count; UINT c_control_points; D3D_TESSELLATOR_OUTPUT_PRIMITIVE hs_output_primitive; - D3D_TESSELLATOR_PARTITIONING hs_prtitioning; + D3D_TESSELLATOR_PARTITIONING hs_partitioning; D3D_TESSELLATOR_DOMAIN tessellator_domain; struct d3dcompiler_shader_signature *isgn; @@ -428,7 +428,7 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetDesc(ID3D11Sha desc->cGSInstanceCount = 0; desc->cControlPoints = This->c_control_points; desc->HSOutputPrimitive = This->hs_output_primitive; - desc->HSPartitioning = This->hs_prtitioning; + desc->HSPartitioning = This->hs_partitioning; desc->TessellatorDomain = This->tessellator_domain; desc->cBarrierInstructions = 0; desc->cInterlockedInstructions = 0; @@ -1184,8 +1184,8 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c r->hs_output_primitive = read_dword(&ptr); TRACE("HSOutputPrimitive: %x\n", r->hs_output_primitive); - r->hs_prtitioning = read_dword(&ptr); - TRACE("HSPartitioning: %x\n", r->hs_prtitioning); + r->hs_partitioning = read_dword(&ptr); + TRACE("HSPartitioning: %x\n", r->hs_partitioning); r->tessellator_domain = read_dword(&ptr); TRACE("TessellatorDomain: %x\n", r->tessellator_domain);

1 0

Ziqing Hui : windowscodecs/tests: Call SetParameters in create_and_init_encoder.
by Alexandre Julliard 01 Jun '21

01 Jun '21

Module: wine Branch: master Commit: 738c594bf623c1106cf32f24c39bcd78a258ac55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=738c594bf623c1106cf32f24… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat May 29 08:26:43 2021 +0800 windowscodecs/tests: Call SetParameters in create_and_init_encoder. Also make dds_encoder optional. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index d530e65eb2d..d5e2be03389 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -553,9 +553,10 @@ static void release_encoder(IWICBitmapEncoder *encoder, IWICDdsEncoder *dds_enco if (encoder) IWICBitmapEncoder_Release(encoder); } -static HRESULT create_and_init_encoder(BYTE *image_buffer, UINT buffer_size, +static HRESULT create_and_init_encoder(BYTE *image_buffer, UINT buffer_size, WICDdsParameters *params, IWICBitmapEncoder **encoder, IWICDdsEncoder **dds_encoder, IWICStream **stream) { + IWICDdsEncoder *dds = NULL; HRESULT hr; *encoder = create_encoder(); @@ -568,14 +569,31 @@ static HRESULT create_and_init_encoder(BYTE *image_buffer, UINT buffer_size, ok(hr == S_OK, "Initialize failed, hr %#x\n", hr); if (hr != S_OK) goto fail; - hr = IWICBitmapEncoder_QueryInterface(*encoder, &IID_IWICDdsEncoder, (void **)dds_encoder); + hr = IWICBitmapEncoder_QueryInterface(*encoder, &IID_IWICDdsEncoder, (void **)&dds); ok(hr == S_OK, "QueryInterface failed, hr %#x\n", hr); if (hr != S_OK) goto fail; + if (params) + { + hr = IWICDdsEncoder_SetParameters(dds, params); + ok(hr == S_OK, "SetParameters failed, hr %#x\n", hr); + if (hr != S_OK) goto fail; + } + + if (dds_encoder) + { + *dds_encoder = dds; + } + else + { + IWICDdsEncoder_Release(dds); + dds = NULL; + } + return S_OK; fail: - release_encoder(*encoder, *dds_encoder, *stream); + release_encoder(*encoder, dds, *stream); return E_FAIL; } @@ -1354,7 +1372,7 @@ static void test_dds_encoder_params(void) HRESULT hr; UINT i; - hr = create_and_init_encoder(buffer, sizeof(buffer), &encoder, &dds_encoder, &stream); + hr = create_and_init_encoder(buffer, sizeof(buffer), NULL, &encoder, &dds_encoder, &stream); if (hr != S_OK) goto end; hr = IWICDdsEncoder_GetParameters(dds_encoder, NULL); @@ -1424,9 +1442,8 @@ static void test_dds_encoder_create_frame(void) BYTE buffer[1024]; HRESULT hr; - hr = create_and_init_encoder(buffer, sizeof(buffer), &encoder, &dds_encoder, &stream); + hr = create_and_init_encoder(buffer, sizeof(buffer), &params, &encoder, &dds_encoder, &stream); if (hr != S_OK) goto end; - IWICDdsEncoder_SetParameters(dds_encoder, &params); hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frame0, NULL); ok(hr == S_OK, "CreateNewFrame failed, hr %#x\n", hr); @@ -1439,15 +1456,13 @@ static void test_dds_encoder_create_frame(void) release_encoder(encoder, dds_encoder, stream); - create_and_init_encoder(buffer, sizeof(buffer), &encoder, &dds_encoder, &stream); - IWICDdsEncoder_SetParameters(dds_encoder, &params); + create_and_init_encoder(buffer, sizeof(buffer), &params, &encoder, &dds_encoder, &stream); hr = IWICDdsEncoder_CreateNewFrame(dds_encoder, &frame0, &array_index, &mip_level, &slice_index); ok(hr == S_OK, "CreateNewFrame failed, hr %#x\n", hr); IWICBitmapFrameEncode_Release(frame0); release_encoder(encoder, dds_encoder, stream); - create_and_init_encoder(buffer, sizeof(buffer), &encoder, &dds_encoder, &stream); - IWICDdsEncoder_SetParameters(dds_encoder, &params); + create_and_init_encoder(buffer, sizeof(buffer), &params, &encoder, &dds_encoder, &stream); hr = IWICDdsEncoder_CreateNewFrame(dds_encoder, &frame0, NULL, NULL, NULL); ok(hr == S_OK, "CreateNewFrame failed, hr %#x\n", hr); IWICBitmapFrameEncode_Release(frame0);

1 0

Ziqing Hui : windowscodecs: Implement DdsFrameEncode_Initialize.
by Alexandre Julliard 01 Jun '21

01 Jun '21

Module: wine Branch: master Commit: 984d9de828b81e551e6c4913a52e3ddbcb181753 URL: https://source.winehq.org/git/wine.git/?a=commit;h=984d9de828b81e551e6c4913… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat May 29 08:26:55 2021 +0800 windowscodecs: Implement DdsFrameEncode_Initialize. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 6dd7a01ff42..eea5235faba 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -1573,8 +1573,27 @@ static ULONG WINAPI DdsFrameEncode_Release(IWICBitmapFrameEncode *iface) static HRESULT WINAPI DdsFrameEncode_Initialize(IWICBitmapFrameEncode *iface, IPropertyBag2 *encoderOptions) { - FIXME("(%p,%p): stub\n", iface, encoderOptions); - return E_NOTIMPL; + DdsFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + HRESULT hr; + + TRACE("(%p,%p)\n", iface, encoderOptions); + if (encoderOptions) FIXME("encoder options are not supported for DDS.\n"); + + EnterCriticalSection(&This->parent->lock); + + if (This->initialized) + { + hr = WINCODEC_ERR_WRONGSTATE; + } + else + { + This->initialized = TRUE; + hr = S_OK; + } + + LeaveCriticalSection(&This->parent->lock); + + return hr; } static HRESULT WINAPI DdsFrameEncode_SetSize(IWICBitmapFrameEncode *iface,

1 0

Ziqing Hui : windowscodecs/tests: Test DDS encoder pixel format.
by Alexandre Julliard 01 Jun '21

01 Jun '21

Module: wine Branch: master Commit: 5506235cff6bf342ae09ef09dd52a2557c90eef4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5506235cff6bf342ae09ef09… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat May 29 08:27:03 2021 +0800 windowscodecs/tests: Test DDS encoder pixel format. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 70 ++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index d5e2be03389..182031f2d3a 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -1471,11 +1471,81 @@ end: release_encoder(encoder, dds_encoder, stream); } +static void test_dds_encoder_pixel_format(void) +{ + DXGI_FORMAT image_formats[] = { DXGI_FORMAT_BC1_UNORM, DXGI_FORMAT_BC2_UNORM, DXGI_FORMAT_BC3_UNORM }; + const WICPixelFormatGUID *test_formats[] = + { + &GUID_WICPixelFormat8bppIndexed, + &GUID_WICPixelFormatBlackWhite, + &GUID_WICPixelFormat16bppGray, + &GUID_WICPixelFormat8bppAlpha, + &GUID_WICPixelFormat16bppBGR555, + &GUID_WICPixelFormat16bppBGR565, + &GUID_WICPixelFormat24bppBGR, + &GUID_WICPixelFormat32bppBGR, + &GUID_WICPixelFormat32bppBGRA, + &GUID_WICPixelFormat32bppPBGRA, + &GUID_WICPixelFormat32bppRGB, + &GUID_WICPixelFormat32bppRGBA, + &GUID_WICPixelFormat32bppPRGBA, + &GUID_WICPixelFormat48bppRGB, + &GUID_WICPixelFormat64bppRGB, + &GUID_WICPixelFormat64bppRGBA + }; + IWICBitmapFrameEncode *frame = NULL; + IWICDdsEncoder *dds_encoder = NULL; + IWICBitmapEncoder *encoder = NULL; + IWICStream *stream = NULL; + WICPixelFormatGUID format; + WICDdsParameters params; + BYTE buffer[1]; + HRESULT hr; + UINT i, j; + + for (i = 0; i < ARRAY_SIZE(image_formats); ++i) + { + hr = create_and_init_encoder(buffer, sizeof(buffer), NULL, &encoder, &dds_encoder, &stream); + if (hr != S_OK) + { + release_encoder(encoder, dds_encoder, stream); + return; + } + + IWICDdsEncoder_GetParameters(dds_encoder, &params); + params.DxgiFormat = image_formats[i]; + IWICDdsEncoder_SetParameters(dds_encoder, &params); + + IWICBitmapEncoder_CreateNewFrame(encoder, &frame, NULL); + + hr = IWICBitmapFrameEncode_SetPixelFormat(frame, &format); + todo_wine + ok(hr == WINCODEC_ERR_NOTINITIALIZED, "SetPixelFormat got unexpected hr %#x\n", hr); + + IWICBitmapFrameEncode_Initialize(frame, NULL); + + for (j = 0; j < ARRAY_SIZE(test_formats); ++j) + { + format = *(test_formats[j]); + hr = IWICBitmapFrameEncode_SetPixelFormat(frame, &format); + todo_wine + ok(hr == S_OK, "Test %u: SetPixelFormat failed, hr %#x\n", j, hr); + if (hr == S_OK) + ok(IsEqualGUID(&format, &GUID_WICPixelFormat32bppBGRA), + "Test %u: Got unexpected GUID %s\n", j, debugstr_guid(&format)); + } + + IWICBitmapFrameEncode_Release(frame); + release_encoder(encoder, dds_encoder, stream); + } +} + static void test_dds_encoder(void) { test_dds_encoder_initialize(); test_dds_encoder_params(); test_dds_encoder_create_frame(); + test_dds_encoder_pixel_format(); } START_TEST(ddsformat)

1 0

Ziqing Hui : windowscodecs: Implement DdsFrameEncode_SetPixelFormat.
by Alexandre Julliard 01 Jun '21

01 Jun '21

Module: wine Branch: master Commit: 92ad4a18e3d27e4b065ce6cf1c2afcdadbc2936a URL: https://source.winehq.org/git/wine.git/?a=commit;h=92ad4a18e3d27e4b065ce6cf… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat May 29 08:27:13 2021 +0800 windowscodecs: Implement DdsFrameEncode_SetPixelFormat. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 26 ++++++++++++++++++++++++-- dlls/windowscodecs/tests/ddsformat.c | 7 ++----- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index eea5235faba..f94f6708c2b 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -1651,8 +1651,30 @@ static HRESULT WINAPI DdsFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, static HRESULT WINAPI DdsFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface, WICPixelFormatGUID *pixelFormat) { - FIXME("(%p,%s): stub\n", iface, debugstr_guid(pixelFormat)); - return E_NOTIMPL; + DdsFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + HRESULT hr; + + TRACE("(%p,%s)\n", iface, debugstr_guid(pixelFormat)); + + EnterCriticalSection(&This->parent->lock); + + if (!This->initialized) + { + hr = WINCODEC_ERR_NOTINITIALIZED; + } + else if (This->frame_created) + { + hr = WINCODEC_ERR_WRONGSTATE; + } + else + { + *pixelFormat = GUID_WICPixelFormat32bppBGRA; + hr = S_OK; + } + + LeaveCriticalSection(&This->parent->lock); + + return hr; } static HRESULT WINAPI DdsFrameEncode_SetColorContexts(IWICBitmapFrameEncode *iface, diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 182031f2d3a..06cd062e962 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -1519,7 +1519,6 @@ static void test_dds_encoder_pixel_format(void) IWICBitmapEncoder_CreateNewFrame(encoder, &frame, NULL); hr = IWICBitmapFrameEncode_SetPixelFormat(frame, &format); - todo_wine ok(hr == WINCODEC_ERR_NOTINITIALIZED, "SetPixelFormat got unexpected hr %#x\n", hr); IWICBitmapFrameEncode_Initialize(frame, NULL); @@ -1528,11 +1527,9 @@ static void test_dds_encoder_pixel_format(void) { format = *(test_formats[j]); hr = IWICBitmapFrameEncode_SetPixelFormat(frame, &format); - todo_wine ok(hr == S_OK, "Test %u: SetPixelFormat failed, hr %#x\n", j, hr); - if (hr == S_OK) - ok(IsEqualGUID(&format, &GUID_WICPixelFormat32bppBGRA), - "Test %u: Got unexpected GUID %s\n", j, debugstr_guid(&format)); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat32bppBGRA), + "Test %u: Got unexpected GUID %s\n", j, debugstr_guid(&format)); } IWICBitmapFrameEncode_Release(frame);

1 0

Matteo Bruni : wined3d: Don't skip FFP vertex pipeline state handlers when STATE_VDECL is dirty.
by Alexandre Julliard 01 Jun '21

01 Jun '21

Module: wine Branch: master Commit: e106bbdd39a5f27bce028ed992033eb0a5635f60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e106bbdd39a5f27bce028ed9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon May 31 21:12:53 2021 +0200 wined3d: Don't skip FFP vertex pipeline state handlers when STATE_VDECL is dirty. This fixes the non-default ARB shader backend, broken since 2ddb6b66a7cda0bf6aaddc0c6899e35cc92ceee9, although the fundamental issue was there long before that. Originally the STATE_VDECL handler did some bookkeeping (basically, computing what is now the stream info data) that's a prerequisite for running other state handlers. For this reason a somewhat complicated dance was put in place, with the dependent handlers returning right away until the STATE_VDECL handler could prepare everything up and the STATE_VDECL handler in turn explicitly calling these "downstream" handlers so that they could do their job. With the commit mentioned above the state dirty flags are cleared after the corresponding handlers are executed, which means that the relevant handlers are skipped twice and some stuff is never set up properly. Stream info is computed by context_apply_draw_state() before going through the state handler table for a long time now, getting rid of this obscure handler interdependency. So let's just get rid of the skipping altogether. 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/wined3d/state.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1194604e7dc..264a9974b40 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -278,11 +278,7 @@ static void state_lighting(struct wined3d_context *context, const struct wined3d /* Lighting is not enabled if transformed vertices are drawn, but lighting * does not affect the stream sources, so it is not grouped for - * performance reasons. This state reads the decoded vertex declaration, - * so if it is dirty don't do anything. The vertex declaration applying - * function calls this function for updating. */ - if (isStateDirty(context, STATE_VDECL)) - return; + * performance reasons. */ if (state->render_states[WINED3D_RS_LIGHTING] && !context->stream_info.position_transformed) @@ -1510,12 +1506,6 @@ static void state_colormat(struct wined3d_context *context, const struct wined3d const struct wined3d_gl_info *gl_info = context_gl->gl_info; GLenum Parm = 0; - /* Depends on the decoded vertex declaration to read the existence of - * diffuse data. The vertex declaration will call this function if the - * fixed function pipeline is used. */ - if (isStateDirty(&context_gl->c, STATE_VDECL)) - return; - context_gl->untracked_material_count = 0; if ((context_gl->c.stream_info.use_map & (1u << WINED3D_FFP_DIFFUSE)) && state->render_states[WINED3D_RS_COLORVERTEX]) @@ -1656,9 +1646,6 @@ static void state_normalize(struct wined3d_context *context, const struct wined3 { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; - if (isStateDirty(context, STATE_VDECL)) - return; - /* Without vertex normals, we set the current normal to 0/0/0 to remove the diffuse factor * from the opengl lighting equation, as d3d does. Normalization of 0/0/0 can lead to a division * by zero and is not properly defined in opengl, so avoid it @@ -3444,10 +3431,9 @@ static void transform_texture(struct wined3d_context *context, const struct wine unsigned int mapped_stage = context_gl->tex_unit_map[tex]; struct wined3d_matrix mat; - /* Ignore this when a vertex shader is used, or if the streams aren't sorted out yet */ - if (use_vs(state) || isStateDirty(context, STATE_VDECL)) + if (use_vs(state)) { - TRACE("Using a vertex shader, or stream sources not sorted out yet, skipping\n"); + TRACE("Using a vertex shader, skipping.\n"); return; } @@ -4013,8 +3999,6 @@ static void transform_projection(struct wined3d_context *context, const struct w static void streamsrc(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - if (isStateDirty(context, STATE_VDECL)) - return; wined3d_context_gl_update_stream_sources(wined3d_context_gl(context), state); }

1 0

Matteo Bruni : wined3d: Rename gen_ffp_frag_op().
by Alexandre Julliard 01 Jun '21

01 Jun '21

Module: wine Branch: master Commit: 7ab5f90396b0a4b2a0f145acf3b4f2ff9de72ee3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ab5f90396b0a4b2a0f145ac… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon May 31 21:12:54 2021 +0200 wined3d: Rename gen_ffp_frag_op(). 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/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7bec9d70d29..7bd68d615d6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6581,7 +6581,7 @@ static void fragment_prog_arbfp(struct wined3d_context *context, const struct wi { /* Find or create a shader implementing the fixed function pipeline * settings, then activate it. */ - gen_ffp_frag_op(context, state, &settings, FALSE); + wined3d_ffp_get_fs_settings(context, state, &settings, FALSE); desc = (const struct arbfp_ffp_desc *)find_ffp_frag_shader(&priv->fragment_shaders, &settings); if (!desc) { diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index ae2843db403..08fb2c81507 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1024,7 +1024,7 @@ static void set_tex_op_atifs(struct wined3d_context *context, const struct wined DWORD mapped_stage; unsigned int i; - gen_ffp_frag_op(context, state, &settings, TRUE); + wined3d_ffp_get_fs_settings(context, state, &settings, TRUE); desc = (const struct atifs_ffp_desc *)find_ffp_frag_shader(&priv->fragment_shaders, &settings); if (!desc) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3876e71af58..5a3cb4c8a69 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10321,7 +10321,7 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, struct glsl_ffp_fragment_shader *ffp_shader; struct ffp_frag_settings settings; - gen_ffp_frag_op(&context_gl->c, state, &settings, FALSE); + wined3d_ffp_get_fs_settings(&context_gl->c, state, &settings, FALSE); ffp_shader = shader_glsl_find_ffp_fragment_shader(priv, &settings, context_gl); ps_id = ffp_shader->id; ps_list = &ffp_shader->linked_programs; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index dc7823b9534..b39fb46cadc 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6053,7 +6053,7 @@ void multiply_matrix(struct wined3d_matrix *dst, const struct wined3d_matrix *sr *dst = tmp; } -void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d_state *state, +void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, const struct wined3d_state *state, struct ffp_frag_settings *settings, BOOL ignore_textype) { #define ARG1 0x01 diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8e3efccffc2..21f34a5895d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3528,7 +3528,7 @@ int wined3d_ffp_vertex_program_key_compare(const void *key, const struct wine_rb extern const struct wined3d_parent_ops wined3d_null_parent_ops DECLSPEC_HIDDEN; -void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d_state *state, +void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, const struct wined3d_state *state, struct ffp_frag_settings *settings, BOOL ignore_textype) DECLSPEC_HIDDEN; const struct ffp_frag_desc *find_ffp_frag_shader(const struct wine_rb_tree *fragment_shaders, const struct ffp_frag_settings *settings) DECLSPEC_HIDDEN;

1 0

Matteo Bruni : wined3d: Avoid Y correction on dFdy when using FBO ORM.
by Alexandre Julliard 01 Jun '21

01 Jun '21

Module: wine Branch: master Commit: 7c578c14db7c529d374371245ce0b0ee0728672c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c578c14db7c529d37437124… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon May 31 21:12:55 2021 +0200 wined3d: Avoid Y correction on dFdy when using FBO ORM. 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/wined3d/glsl_shader.c | 39 ++++++++++++++++++++------------------- dlls/wined3d/shader.c | 5 +++-- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5a3cb4c8a69..6a3aaabe39b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4036,6 +4036,9 @@ static void shader_glsl_pow(const struct wined3d_shader_instruction *ins) /* Map the opcode 1-to-1 to the GL code (arg->dst = instruction(src0, src1, ...) */ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) { + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + bool y_correction = ins->ctx->reg_maps->shader_version.type == WINED3D_SHADER_TYPE_PIXEL + ? !priv->cur_ps_args->render_offscreen : false; struct wined3d_string_buffer *buffer = ins->ctx->buffer; struct glsl_src_param src_param; const char *instruction; @@ -4052,9 +4055,9 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_DSX: instruction = "dFdx"; break; case WINED3DSIH_DSX_COARSE: instruction = "dFdxCoarse"; break; case WINED3DSIH_DSX_FINE: instruction = "dFdxFine"; break; - case WINED3DSIH_DSY: instruction = "ycorrection.y * dFdy"; break; - case WINED3DSIH_DSY_COARSE: instruction = "ycorrection.y * dFdyCoarse"; break; - case WINED3DSIH_DSY_FINE: instruction = "ycorrection.y * dFdyFine"; break; + case WINED3DSIH_DSY: instruction = y_correction ? "ycorrection.y * dFdy" : "dFdy"; break; + case WINED3DSIH_DSY_COARSE: instruction = y_correction ? "ycorrection.y * dFdyCoarse" : "dFdyCoarse"; break; + case WINED3DSIH_DSY_FINE: instruction = y_correction ? "ycorrection.y * dFdyFine" : "dFdyFine"; break; case WINED3DSIH_FIRSTBIT_HI: instruction = "findMSB"; break; case WINED3DSIH_FIRSTBIT_LO: instruction = "findLSB"; break; case WINED3DSIH_FIRSTBIT_SHI: instruction = "findMSB"; break; @@ -7773,25 +7776,23 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ shader_glsl_append_imm_vec(buffer, &wined3d_srgb_const[1].x, 4, gl_info); shader_addline(buffer, ";\n"); } - if (reg_maps->vpos || reg_maps->usesdsy) + if ((reg_maps->usesdsy && wined3d_settings.offscreen_rendering_mode != ORM_FBO) + || (reg_maps->vpos && !gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS])) { - if (reg_maps->usesdsy || !gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) - { - ++extra_constants_needed; - shader_addline(buffer, "uniform vec4 ycorrection;\n"); - } - if (reg_maps->vpos) + ++extra_constants_needed; + shader_addline(buffer, "uniform vec4 ycorrection;\n"); + } + if (reg_maps->vpos) + { + if (gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) { - if (gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) - { - if (context_gl->c.d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) - shader_addline(buffer, "layout(%spixel_center_integer) in vec4 gl_FragCoord;\n", - args->render_offscreen ? "" : "origin_upper_left, "); - else if (!args->render_offscreen) - shader_addline(buffer, "layout(origin_upper_left) in vec4 gl_FragCoord;\n"); - } - shader_addline(buffer, "vec4 vpos;\n"); + if (context_gl->c.d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) + shader_addline(buffer, "layout(%spixel_center_integer) in vec4 gl_FragCoord;\n", + args->render_offscreen ? "" : "origin_upper_left, "); + else if (!args->render_offscreen) + shader_addline(buffer, "layout(origin_upper_left) in vec4 gl_FragCoord;\n"); } + shader_addline(buffer, "vec4 vpos;\n"); } if (args->alpha_test_func + 1 != WINED3D_CMP_ALWAYS) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 42a3c108860..ae9b21defa1 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -4212,8 +4212,9 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 if (d3d_info->emulated_flatshading) args->flatshading = state->render_states[WINED3D_RS_SHADEMODE] == WINED3D_SHADE_FLAT; - args->render_offscreen = shader->reg_maps.vpos && gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS] - ? context->render_offscreen : 0; + args->render_offscreen = (shader->reg_maps.vpos && gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) + || (shader->reg_maps.usesdsy && wined3d_settings.offscreen_rendering_mode != ORM_FBO) + ? context->render_offscreen : 1; for (i = 0; i < ARRAY_SIZE(state->fb.render_targets); ++i) {

1 0

Jefferson Carpenter : msxml3: Null check newChild in DOMDocument insertBefore.
by Alexandre Julliard 01 Jun '21

01 Jun '21

Module: wine Branch: master Commit: ec867bc4287dc900ad5728fcd5b0b87f9a056051 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec867bc4287dc900ad5728fc… Author: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Date: Thu May 27 12:36:46 2021 +0000 msxml3: Null check newChild in DOMDocument insertBefore. Signed-off-by: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/domdoc.c | 2 ++ dlls/msxml3/tests/domdoc.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 45fbd6f43aa..61fbbf9f20b 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1210,6 +1210,8 @@ static HRESULT WINAPI domdoc_insertBefore( TRACE("(%p)->(%p %s %p)\n", This, newChild, debugstr_variant(&refChild), outNewChild); + if (!newChild) return E_INVALIDARG; + hr = IXMLDOMNode_get_nodeType(newChild, &type); if (hr != S_OK) return hr; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 12482962c4b..ea8a95252a1 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9235,6 +9235,13 @@ static void test_insertBefore(void) doc = create_document(&IID_IXMLDOMDocument); doc3 = create_document(&IID_IXMLDOMDocument); + /* NULL to document */ + V_VT(&v) = VT_NULL; + node = (void*)0xdeadbeef; + hr = IXMLDOMDocument_insertBefore(doc, NULL, v, &node); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(node == (void*)0xdeadbeef, "got %p\n", node); + /* document to document */ V_VT(&v) = VT_NULL; node = (void*)0xdeadbeef;

1 0