February 2022 - Wine-commits

Eric Pouech : imm32/tests: Enable compilation with long types.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: afd2e6c8404f3ce49f789edf19e7f5761759f3cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=afd2e6c8404f3ce49f789edf… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 28 08:26:39 2022 +0100 imm32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/tests/Makefile.in | 1 - dlls/imm32/tests/imm32.c | 206 +++++++++++++++++++++---------------------- 2 files changed, 103 insertions(+), 104 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=afd2e6c8404f3ce49f78…

1 0

Eric Pouech : inetcomm/tests: Enable compilation with long types.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: fb077b480bbce14edb087a897cafede3b54ead12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb077b480bbce14edb087a89… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 28 08:26:45 2022 +0100 inetcomm/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/Makefile.in | 1 - dlls/inetcomm/tests/mimeintl.c | 78 ++++---- dlls/inetcomm/tests/mimeole.c | 396 ++++++++++++++++++++-------------------- 3 files changed, 237 insertions(+), 238 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fb077b480bbce14edb08…

1 0

Eric Pouech : imagehlp/tests: Enable compilation with long types.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: a24f29cd37322acab8ddf9efaab4cc680f218a41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a24f29cd37322acab8ddf9ef… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 28 08:26:33 2022 +0100 imagehlp/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imagehlp/tests/Makefile.in | 1 - dlls/imagehlp/tests/image.c | 40 +++++++++++------------ dlls/imagehlp/tests/integrity.c | 70 ++++++++++++++++++++--------------------- 3 files changed, 55 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a24f29cd37322acab8dd…

1 0

Eric Pouech : hlink/tests: Enable compilation with long types.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: 47212b39393688cca34fcf8e56821fda904d0886 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47212b39393688cca34fcf8e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 28 08:26:08 2022 +0100 hlink/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/tests/Makefile.in | 1 - dlls/hlink/tests/browse_ctx.c | 52 +++--- dlls/hlink/tests/hlink.c | 368 +++++++++++++++++++++--------------------- 3 files changed, 210 insertions(+), 211 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=47212b39393688cca34f…

1 0

Eric Pouech : gdi32/tests: Enable compilation with long types.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: 5c637c228f4ec8cf41200b1635321cf378fd2cb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c637c228f4ec8cf41200b16… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 28 08:25:44 2022 +0100 gdi32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/Makefile.in | 1 - dlls/gdi32/tests/bitmap.c | 836 +++++++++++++++++++-------------------- dlls/gdi32/tests/brush.c | 56 +-- dlls/gdi32/tests/clipping.c | 40 +- dlls/gdi32/tests/dc.c | 80 ++-- dlls/gdi32/tests/dib.c | 90 ++--- dlls/gdi32/tests/driver.c | 154 ++++---- dlls/gdi32/tests/font.c | 618 ++++++++++++++--------------- dlls/gdi32/tests/gdiobj.c | 62 +-- dlls/gdi32/tests/icm.c | 52 +-- dlls/gdi32/tests/mapping.c | 132 ++++--- dlls/gdi32/tests/metafile.c | 912 +++++++++++++++++++++---------------------- dlls/gdi32/tests/palette.c | 6 +- dlls/gdi32/tests/path.c | 114 +++--- dlls/gdi32/tests/pen.c | 244 ++++++------ 15 files changed, 1703 insertions(+), 1694 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5c637c228f4ec8cf4120…

1 0

Eric Pouech : hnetcfg/tests: Enable compilation with long types.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: bcaecd5d81c67a9bb7609b305e992aed33792e63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcaecd5d81c67a9bb7609b30… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 28 08:26:14 2022 +0100 hnetcfg/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/tests/Makefile.in | 1 - dlls/hnetcfg/tests/policy.c | 102 ++++++++++++++++++++--------------------- 2 files changed, 51 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bcaecd5d81c67a9bb760…

1 0

Eric Pouech : hid/tests: Enable compilation with long types.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: 7576f6be575da56e8dbee2290b071b808f53e415 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7576f6be575da56e8dbee229… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 28 08:26:02 2022 +0100 hid/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/Makefile.in | 1 - dlls/hid/tests/device.c | 68 +++++++++++++++++++++++----------------------- 2 files changed, 34 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7576f6be575da56e8dbe…

1 0

Henri Verbeet : vkd3d-shader/hlsl: Properly compare integers in compare_function_decl_rb().
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: vkd3d Branch: master Commit: e2c942361109c15a1342c4f198cdbd1eb00d00c6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e2c942361109c15a1342c4f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 28 12:23:49 2022 +0100 vkd3d-shader/hlsl: Properly compare integers in compare_function_decl_rb(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 689b9da..00a374b 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -847,8 +847,8 @@ static int compare_function_decl_rb(const void *key, const struct rb_entry *entr struct list *p1cur, *p2cur; int r; - if (params_count != decl_params_count) - return params_count - decl_params_count; + if ((r = vkd3d_u32_compare(params_count, decl_params_count))) + return r; p1cur = params ? list_head(params) : NULL; p2cur = decl->parameters ? list_head(decl->parameters) : NULL;

1 0

Henri Verbeet : vkd3d-shader/spirv: Properly compare integers in vkd3d_spirv_declaration_compare().
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: vkd3d Branch: master Commit: 7e08773d4e0338e5daf99a93bb385b3eee182073 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7e08773d4e0338e5daf99a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 28 12:23:50 2022 +0100 vkd3d-shader/spirv: Properly compare integers in vkd3d_spirv_declaration_compare(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1ffce6a..cc8748d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -511,11 +511,12 @@ static int vkd3d_spirv_declaration_compare(const void *key, const struct rb_entr { const struct vkd3d_spirv_declaration *a = key; const struct vkd3d_spirv_declaration *b = RB_ENTRY_VALUE(e, const struct vkd3d_spirv_declaration, entry); + int ret; - if (a->op != b->op) - return a->op - b->op; - if (a->parameter_count != b->parameter_count) - return a->parameter_count - b->parameter_count; + if ((ret = vkd3d_u32_compare(a->op, b->op))) + return ret; + if ((ret = vkd3d_u32_compare(a->parameter_count, b->parameter_count))) + return ret; assert(a->parameter_count <= ARRAY_SIZE(a->parameters)); return memcmp(&a->parameters, &b->parameters, a->parameter_count * sizeof(*a->parameters)); }

1 0

Henri Verbeet : vkd3d-shader/spirv: Properly compare integers in vkd3d_symbol_compare().
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: vkd3d Branch: master Commit: beb6b8efc793835ce8284fa19fb41524cf22859e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=beb6b8efc793835ce8284fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 28 12:23:51 2022 +0100 vkd3d-shader/spirv: Properly compare integers in vkd3d_symbol_compare(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index cc8748d..0e3dbf0 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2046,9 +2046,10 @@ static int vkd3d_symbol_compare(const void *key, const struct rb_entry *entry) { const struct vkd3d_symbol *a = key; const struct vkd3d_symbol *b = RB_ENTRY_VALUE(entry, const struct vkd3d_symbol, entry); + int ret; - if (a->type != b->type) - return a->type - b->type; + if ((ret = vkd3d_u32_compare(a->type, b->type))) + return ret; return memcmp(&a->key, &b->key, sizeof(a->key)); }

1 0