December 2022 - Wine-Commits

Tag wine-8.0-rc1 : Alexandre Julliard : Release 8.0-rc1
by Alexandre Julliard Dec. 9, 2022

Dec. 9, 2022

Module: wine Branch: refs/tags/wine-8.0-rc1 Tag: f2191e67d1223da8525399c32b172cb9e9fc8d09 URL: https://gitlab.winehq.org/wine/wine/-/tags/f2191e67d1223da8525399c32b172cb9… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 22:15:57 2022 +0100 Release 8.0-rc1

1 0

Alexandre Julliard : Release 8.0-rc1.
by Alexandre Julliard Dec. 9, 2022

Dec. 9, 2022

Module: wine Branch: master Commit: 772badd0d7f3286a7881a71f16fad417e2d7787d URL: https://gitlab.winehq.org/wine/wine/-/commit/772badd0d7f3286a7881a71f16fad4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 22:10:23 2022 +0100 Release 8.0-rc1. --- ANNOUNCE | 1280 ++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 686 insertions(+), 615 deletions(-)

1 0

Bartosz Kosiorek : gdiplus: Improve performance of GdipTranslateMatrix.
by Alexandre Julliard Dec. 9, 2022

Dec. 9, 2022

Module: wine Branch: master Commit: 82d94219cbf2c598f5a9d88c5bd5fc3e0b230bd0 URL: https://gitlab.winehq.org/wine/wine/-/commit/82d94219cbf2c598f5a9d88c5bd5fc… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Sat Dec 3 00:48:53 2022 +0100 gdiplus: Improve performance of GdipTranslateMatrix. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53947 --- dlls/gdiplus/matrix.c | 21 ++++++++++----------- dlls/gdiplus/tests/matrix.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index d790daab2af..d69672bddcf 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -417,24 +417,23 @@ GpStatus WINGDIPAPI GdipTransformMatrixPointsI(GpMatrix *matrix, GpPoint *pts, I GpStatus WINGDIPAPI GdipTranslateMatrix(GpMatrix *matrix, REAL offsetX, REAL offsetY, GpMatrixOrder order) { - REAL translate[6]; - TRACE("(%p, %.2f, %.2f, %d)\n", matrix, offsetX, offsetY, order); if(!matrix) return InvalidParameter; - translate[0] = 1.0; - translate[1] = 0.0; - translate[2] = 0.0; - translate[3] = 1.0; - translate[4] = offsetX; - translate[5] = offsetY; - if(order == MatrixOrderAppend) - matrix_multiply(matrix->matrix, translate, matrix->matrix); + { + matrix->matrix[4] += offsetX; + matrix->matrix[5] += offsetY; + } else if (order == MatrixOrderPrepend) - matrix_multiply(translate, matrix->matrix, matrix->matrix); + { + matrix->matrix[4] = offsetX * matrix->matrix[0] + offsetY * matrix->matrix[2] + + matrix->matrix[4]; + matrix->matrix[5] = offsetX * matrix->matrix[1] + offsetY * matrix->matrix[3] + + matrix->matrix[5]; + } else return InvalidParameter; diff --git a/dlls/gdiplus/tests/matrix.c b/dlls/gdiplus/tests/matrix.c index 53a57089bbc..dea08c13120 100644 --- a/dlls/gdiplus/tests/matrix.c +++ b/dlls/gdiplus/tests/matrix.c @@ -110,6 +110,45 @@ static void test_transform(void) GdipDeleteMatrix(matrix); } +static void test_translate(void) +{ + GpStatus status; + GpMatrix *matrix = NULL; + REAL elems[6]; + + static const REAL expected_elem_append[] = {1.0, -2.0, 30.0, 40.0, -470.0, 620.0}; + static const REAL expected_elem_prepend[] = {1.0, -2.0, 30.0, 40.0, 130.0, 1340.0}; + + GdipCreateMatrix2(1.0, -2.0, 30.0, 40.0, -500.0, 600.0, &matrix); + + status = GdipTranslateMatrix(NULL, 30.0, 20.0, MatrixOrderAppend); + expect(InvalidParameter, status); + status = GdipTranslateMatrix(matrix, 30.0, 20.0, MatrixOrderAppend); + expect(Ok, status); + + status = GdipGetMatrixElements(matrix, elems); + expect(Ok, status); + GdipDeleteMatrix(matrix); + + for(INT i = 0; i < 6; i++) + ok(expected_elem_append[i] == elems[i], "Expected #%d to be (%.1f) but got (%.1f)\n", i, + expected_elem_append[i], elems[i]); + + GdipCreateMatrix2(1.0, -2.0, 30.0, 40.0, -500.0, 600.0, &matrix); + + status = GdipTranslateMatrix(matrix, 30.0, 20.0, MatrixOrderPrepend); + expect(Ok, status); + + status = GdipGetMatrixElements(matrix, elems); + expect(Ok, status); + GdipDeleteMatrix(matrix); + + for(INT i = 0; i < 6; i++) + ok(expected_elem_prepend[i] == elems[i], "Expected #%d to be (%.1f) but got (%.1f)\n", i, + expected_elem_prepend[i], elems[i]); + +} + static void test_scale(void) { GpStatus status; @@ -430,6 +469,7 @@ START_TEST(matrix) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); test_constructor_destructor(); + test_translate(); test_scale(); test_transform(); test_isinvertible();

1 0

Rémi Bernon : uxtheme: Use bsearch and CompareStringOrdinal in MSSTYLES_LookupProperty.
by Alexandre Julliard Dec. 9, 2022

Dec. 9, 2022

Module: wine Branch: master Commit: ae0891eb64e1f7a8a17a07873f96558274e2a6d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae0891eb64e1f7a8a17a07873f9655… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 9 09:39:45 2022 +0100 uxtheme: Use bsearch and CompareStringOrdinal in MSSTYLES_LookupProperty. --- dlls/uxtheme/stylemap.c | 440 +++++++++++++++++++++++++----------------------- 1 file changed, 227 insertions(+), 213 deletions(-)

1 0

Eric Pouech : wined3d: Enable long types in arb_program_shader.c.
by Alexandre Julliard Dec. 9, 2022

Dec. 9, 2022

Module: wine Branch: master Commit: 2e37a51b8f1a36a0547531c35609b3888772c0a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/2e37a51b8f1a36a0547531c35609b3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Dec 8 10:44:57 2022 +0100 wined3d: Enable long types in arb_program_shader.c. --- dlls/wined3d/arb_program_shader.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 18866eaac00..b799e6c1e38 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -26,7 +26,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_NO_LONG_TYPES /* temporary */ #include <stdio.h> @@ -5955,7 +5954,7 @@ static void alpha_test_arbfp(struct wined3d_context *context, const struct wined int glParm; float ref; - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + TRACE("context %p, state %p, state_id %#lx.\n", context, state, state_id); if (state->render_states[WINED3D_RS_ALPHATESTENABLE]) { @@ -6566,7 +6565,7 @@ static void fragment_prog_arbfp(struct wined3d_context *context, const struct wi const struct arbfp_ffp_desc *desc; unsigned int i; - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + TRACE("context %p, state %p, state_id %#lx.\n", context, state, state_id); if (isStateDirty(context, STATE_RENDER(WINED3D_RS_FOGENABLE))) { @@ -6659,7 +6658,7 @@ static void state_arbfp_fog(struct wined3d_context *context, const struct wined3 DWORD fogstart = state->render_states[WINED3D_RS_FOGSTART]; DWORD fogend = state->render_states[WINED3D_RS_FOGEND]; - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + TRACE("context %p, state %p, state_id %#lx.\n", context, state, state_id); if (!isStateDirty(context, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL))) fragment_prog_arbfp(context, state, state_id); @@ -7865,7 +7864,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl if (FAILED(hr = wined3d_texture_create(device, &desc, 1, 1, 0, NULL, NULL, &wined3d_null_parent_ops, &staging_texture))) { - ERR("Failed to create staging texture, hr %#x.\n", hr); + ERR("Failed to create staging texture, hr %#lx.\n", hr); return dst_location; }

1 0

Eric Pouech : wined3d: Reduce usage of long integral types in arb_program_shader.c.
by Alexandre Julliard Dec. 9, 2022

Dec. 9, 2022

Module: wine Branch: master Commit: 279c1dbc3cf79a4996a1159ddda31c7221c8c570 URL: https://gitlab.winehq.org/wine/wine/-/commit/279c1dbc3cf79a4996a1159ddda31c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Dec 8 10:44:54 2022 +0100 wined3d: Reduce usage of long integral types in arb_program_shader.c. --- dlls/wined3d/arb_program_shader.c | 60 +++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 31 insertions(+), 31 deletions(-)

1 0

Eric Pouech : wined3d: Use proper enum type in arb_program_shader.c.
by Alexandre Julliard Dec. 9, 2022

Dec. 9, 2022

Module: wine Branch: master Commit: 5b5f7528b151e4af8bff6fbcde259d3b9c90777e URL: https://gitlab.winehq.org/wine/wine/-/commit/5b5f7528b151e4af8bff6fbcde259d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Dec 8 10:44:55 2022 +0100 wined3d: Use proper enum type in arb_program_shader.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/arb_program_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6e4acfb27ef..18866eaac00 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1647,7 +1647,7 @@ static void pshader_hw_bem(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "ADD %s, %s, TC;\n", dst_name, src_name[0]); } -static DWORD negate_modifiers(DWORD mod, char *extra_char) +static enum wined3d_shader_src_modifier negate_modifiers(enum wined3d_shader_src_modifier mod, char *extra_char) { *extra_char = ' '; switch(mod) @@ -1665,8 +1665,8 @@ static DWORD negate_modifiers(DWORD mod, char *extra_char) case WINED3DSPSM_DW: *extra_char = '-'; return WINED3DSPSM_DW; case WINED3DSPSM_ABS: return WINED3DSPSM_ABSNEG; case WINED3DSPSM_ABSNEG: return WINED3DSPSM_ABS; + case WINED3DSPSM_NOT: FIXME("Unknown modifier %u\n", mod); } - FIXME("Unknown modifier %u\n", mod); return mod; } @@ -2511,7 +2511,7 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) } } -static DWORD abs_modifier(DWORD mod, BOOL *need_abs) +static enum wined3d_shader_src_modifier abs_modifier(enum wined3d_shader_src_modifier mod, BOOL *need_abs) { *need_abs = FALSE; @@ -2530,8 +2530,8 @@ static DWORD abs_modifier(DWORD mod, BOOL *need_abs) case WINED3DSPSM_DW: *need_abs = TRUE; return WINED3DSPSM_DW; case WINED3DSPSM_ABS: return WINED3DSPSM_ABS; case WINED3DSPSM_ABSNEG: return WINED3DSPSM_ABS; + case WINED3DSPSM_NOT: FIXME("Unknown modifier %u\n", mod); } - FIXME("Unknown modifier %u\n", mod); return mod; }

1 0

Eric Pouech : wined3d: Reduce usage of long integral types in view.c.
by Alexandre Julliard Dec. 9, 2022

Dec. 9, 2022

Module: wine Branch: master Commit: 1c682aa2f424d6d66bfb7ce264c10b4402b80270 URL: https://gitlab.winehq.org/wine/wine/-/commit/1c682aa2f424d6d66bfb7ce264c10b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Dec 9 10:25:34 2022 +0100 wined3d: Reduce usage of long integral types in view.c. --- dlls/wined3d/view.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index a650ab4c4bd..cf17db62da8 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1800,7 +1800,7 @@ struct wined3d_uav_clear_constants_vk }; static VkPipeline create_uav_pipeline(struct wined3d_context_vk *context_vk, - struct wined3d_pipeline_layout_vk *layout, const DWORD *byte_code, size_t byte_code_size, + struct wined3d_pipeline_layout_vk *layout, const unsigned int *byte_code, size_t byte_code_size, enum wined3d_shader_resource_type resource_type) { VkComputePipelineCreateInfo pipeline_info; @@ -1815,7 +1815,7 @@ static VkPipeline create_uav_pipeline(struct wined3d_context_vk *context_vk, vk_info = context_vk->vk_info; context = &context_vk->c; - shader_desc.byte_code = byte_code; + shader_desc.byte_code = (const DWORD *)byte_code; shader_desc.byte_code_size = byte_code_size; shader_module = (VkShaderModule)context->device->adapter->shader_backend->shader_compile(context, &shader_desc,

1 0

Eric Pouech : wined3d: Enable long integral types in view.c.
by Alexandre Julliard Dec. 9, 2022

Dec. 9, 2022

Module: wine Branch: master Commit: d2009c7305283fdd56d99888633276cea351a023 URL: https://gitlab.winehq.org/wine/wine/-/commit/d2009c7305283fdd56d99888633276… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Dec 9 10:25:36 2022 +0100 wined3d: Enable long integral types in view.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/view.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index cf17db62da8..11f099b7ec5 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ -#define WINE_NO_LONG_TYPES /* temporary */ #include "wined3d_private.h" #include "wined3d_shaders.h"

1 0

Eric Pouech : wined3d: Enable long integral types in stateblock.c.
by Alexandre Julliard Dec. 9, 2022

Dec. 9, 2022

Module: wine Branch: master Commit: 4d4841832a7d418872bfb7ba32b9d500234c1a8f URL: https://gitlab.winehq.org/wine/wine/-/commit/4d4841832a7d418872bfb7ba32b9d5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Dec 9 10:25:30 2022 +0100 wined3d: Enable long integral types in stateblock.c. --- dlls/wined3d/stateblock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index f3a4d728c7b..16f58b726d0 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -21,7 +21,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_NO_LONG_TYPES /* temporary */ #include "wined3d_private.h" @@ -2065,7 +2064,7 @@ HRESULT CDECL wined3d_stateblock_create(struct wined3d_device *device, const str hr = stateblock_init(object, device_state, device, type); if (FAILED(hr)) { - WARN("Failed to initialize stateblock, hr %#x.\n", hr); + WARN("Failed to initialize stateblock, hr %#lx.\n", hr); heap_free(object); return hr; }

1 0