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

Zebediah Figura : d3dcompiler: Store the arguments to a hlsl_ir_constructor as a fixed array.
by Alexandre Julliard Aug. 9, 2019

Aug. 9, 2019

Module: wine Branch: master Commit: c22f64bcebeb4c5483429fd62dba01bf1c65b41c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c22f64bcebeb4c5483429fd6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Aug 9 09:52:45 2019 -0500 d3dcompiler: Store the arguments to a hlsl_ir_constructor as a fixed array. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 3 ++- dlls/d3dcompiler_43/hlsl.y | 8 +++++++- dlls/d3dcompiler_43/utils.c | 10 ++++++---- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index e165f21..d6db46b 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -952,7 +952,8 @@ struct hlsl_ir_constant struct hlsl_ir_constructor { struct hlsl_ir_node node; - struct list *arguments; + struct hlsl_ir_node *args[16]; + unsigned int args_count; }; struct hlsl_scope diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index ba0fd5c..0f98190 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -2092,6 +2092,7 @@ postfix_expr: primary_expr | var_modifiers type '(' initializer_expr_list ')' { struct hlsl_ir_constructor *constructor; + struct hlsl_ir_node *instr; TRACE("%s constructor.\n", debug_hlsl_type($2)); if ($1) @@ -2120,7 +2121,12 @@ postfix_expr: primary_expr constructor->node.type = HLSL_IR_CONSTRUCTOR; set_location(&constructor->node.loc, &@3); constructor->node.data_type = $2; - constructor->arguments = $4; + constructor->args_count = 0; + LIST_FOR_EACH_ENTRY(instr, $4, struct hlsl_ir_node, entry) + { + constructor->args[constructor->args_count++] = instr; + } + d3dcompiler_free($4); $$ = &constructor->node; } diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index a521eb6..742b262 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2122,12 +2122,12 @@ static void debug_dump_ir_expr(const struct hlsl_ir_expr *expr) static void debug_dump_ir_constructor(const struct hlsl_ir_constructor *constructor) { - struct hlsl_ir_node *arg; + unsigned int i; TRACE("%s (", debug_hlsl_type(constructor->node.data_type)); - LIST_FOR_EACH_ENTRY(arg, constructor->arguments, struct hlsl_ir_node, entry) + for (i = 0; i < constructor->args_count; ++i) { - debug_dump_instr(arg); + debug_dump_instr(constructor->args[i]); TRACE(" "); } TRACE(")"); @@ -2349,7 +2349,9 @@ static void free_ir_swizzle(struct hlsl_ir_swizzle *swizzle) static void free_ir_constructor(struct hlsl_ir_constructor *constructor) { - free_instr_list(constructor->arguments); + unsigned int i; + for (i = 0; i < constructor->args_count; ++i) + free_instr(constructor->args[i]); d3dcompiler_free(constructor); }

1 0

Matteo Bruni : d3dcompiler/tests: Get rid of redundant "failed" in test strings.
by Alexandre Julliard Aug. 9, 2019

Aug. 9, 2019

Module: wine Branch: master Commit: 7b2d82fa4f8a9b9b2291c4d0c639d9d625004105 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b2d82fa4f8a9b9b2291c4d0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Aug 9 20:09:43 2019 +0200 d3dcompiler/tests: Get rid of redundant "failed" in test strings. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl.c | 100 +++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index 9f696ee..84f3ba5 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -300,7 +300,7 @@ static void test_swizzle(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_ { static const struct hlsl_probe_info probes[] = { - {0, 0, {0.0101f, 0.0303f, 0.0202f, 0.0404f}, 0.0001f, "swizzle_test failed"} + {0, 0, {0.0101f, 0.0303f, 0.0202f, 0.0404f}, 0.0001f, "swizzle_test"} }; static const char *swizzle_test_shader = @@ -338,7 +338,7 @@ static void test_math(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geo static const struct hlsl_probe_info probes[] = { {0, 0, {-12.4300f, 9.8333f, 1.6000f, 34.9999f}, 0.0001f, - "order of operations test failed"} + "order of operations test"} }; static const char *order_of_operations_shader = @@ -377,12 +377,12 @@ static void test_conditionals(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 * { static const struct hlsl_probe_info if_greater_probes[] = { - { 0, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test failed"}, - { 5, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test failed"}, - {10, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test failed"}, - {15, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test failed"}, - {25, 0, {0.1f, 0.2f, 0.3f, 0.4f}, 0.0001f, "if greater test failed"}, - {30, 0, {0.1f, 0.2f, 0.3f, 0.4f}, 0.0001f, "if greater test failed"} + { 0, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test"}, + { 5, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test"}, + {10, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test"}, + {15, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test"}, + {25, 0, {0.1f, 0.2f, 0.3f, 0.4f}, 0.0001f, "if greater test"}, + {30, 0, {0.1f, 0.2f, 0.3f, 0.4f}, 0.0001f, "if greater test"} }; static const char *if_greater_shader = @@ -396,14 +396,14 @@ static void test_conditionals(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 * static const struct hlsl_probe_info ternary_operator_probes[] = { - {0, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test failed"}, - {1, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test failed"}, - {2, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test failed"}, - {3, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test failed"}, - {4, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test failed"}, - {5, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test failed"}, - {6, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test failed"}, - {7, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test failed"} + {0, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test"}, + {1, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test"}, + {2, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test"}, + {3, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test"}, + {4, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test"}, + {5, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test"}, + {6, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test"}, + {7, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test"} }; static const char *ternary_operator_shader = @@ -441,7 +441,7 @@ static void test_float_vectors(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 { static const struct hlsl_probe_info vec4_indexing_test1_probes[] = { - {0, 0, {0.020f, 0.245f, 0.351f, 1.000f}, 0.0001f, "vec4 indexing test 1 failed"} + {0, 0, {0.020f, 0.245f, 0.351f, 1.000f}, 0.0001f, "vec4 indexing test 1"} }; static const char *vec4_indexing_test1_shader = @@ -457,7 +457,7 @@ static void test_float_vectors(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 static const struct hlsl_probe_info vec4_indexing_test2_probes[] = { - {0, 0, {0.5f, 0.3f, 0.8f, 0.2f}, 0.0001f, "vec4 indexing test 2 failed"} + {0, 0, {0.5f, 0.3f, 0.8f, 0.2f}, 0.0001f, "vec4 indexing test 2"} }; /* We have this uniform i here so the compiler can't optimize */ @@ -502,38 +502,38 @@ static void test_trig(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geo { static const struct hlsl_probe_info sincos_probes[] = { - {0, 0, {0.5000f, 1.0000f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {1, 0, {0.5975f, 0.9904f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {2, 0, {0.6913f, 0.9620f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {3, 0, {0.7778f, 0.9160f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {4, 0, {0.8536f, 0.8536f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {5, 0, {0.9157f, 0.7778f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {6, 0, {0.9620f, 0.6913f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {7, 0, {0.9904f, 0.5975f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {8, 0, {1.0000f, 0.5000f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {9, 0, {0.9904f, 0.4025f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {10, 0, {0.9619f, 0.3087f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {11, 0, {0.9157f, 0.2222f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {12, 0, {0.8536f, 0.1464f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {13, 0, {0.7778f, 0.0843f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {14, 0, {0.6913f, 0.0381f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {15, 0, {0.5975f, 0.0096f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {16, 0, {0.5000f, 0.0000f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {17, 0, {0.4025f, 0.0096f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {18, 0, {0.3087f, 0.0381f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {19, 0, {0.2222f, 0.0843f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {20, 0, {0.1464f, 0.1464f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {21, 0, {0.0843f, 0.2222f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {22, 0, {0.0381f, 0.3087f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {23, 0, {0.0096f, 0.4025f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {24, 0, {0.0000f, 0.5000f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {25, 0, {0.0096f, 0.5975f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {26, 0, {0.0381f, 0.6913f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {27, 0, {0.0843f, 0.7778f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {28, 0, {0.1464f, 0.8536f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {29, 0, {0.2222f, 0.9157f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {30, 0, {0.3087f, 0.9619f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, - {31, 0, {0.4025f, 0.9904f, 0.0f, 0.0f}, 0.001f, "sin/cos test failed"}, + {0, 0, {0.5000f, 1.0000f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {1, 0, {0.5975f, 0.9904f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {2, 0, {0.6913f, 0.9620f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {3, 0, {0.7778f, 0.9160f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {4, 0, {0.8536f, 0.8536f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {5, 0, {0.9157f, 0.7778f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {6, 0, {0.9620f, 0.6913f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {7, 0, {0.9904f, 0.5975f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {8, 0, {1.0000f, 0.5000f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {9, 0, {0.9904f, 0.4025f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {10, 0, {0.9619f, 0.3087f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {11, 0, {0.9157f, 0.2222f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {12, 0, {0.8536f, 0.1464f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {13, 0, {0.7778f, 0.0843f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {14, 0, {0.6913f, 0.0381f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {15, 0, {0.5975f, 0.0096f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {16, 0, {0.5000f, 0.0000f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {17, 0, {0.4025f, 0.0096f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {18, 0, {0.3087f, 0.0381f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {19, 0, {0.2222f, 0.0843f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {20, 0, {0.1464f, 0.1464f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {21, 0, {0.0843f, 0.2222f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {22, 0, {0.0381f, 0.3087f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {23, 0, {0.0096f, 0.4025f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {24, 0, {0.0000f, 0.5000f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {25, 0, {0.0096f, 0.5975f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {26, 0, {0.0381f, 0.6913f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {27, 0, {0.0843f, 0.7778f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {28, 0, {0.1464f, 0.8536f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {29, 0, {0.2222f, 0.9157f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {30, 0, {0.3087f, 0.9619f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, + {31, 0, {0.4025f, 0.9904f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, }; static const char *sincos_shader =

1 0

Alexandre Julliard : kernel32: Move process/ thread attribute list functions to kernelbase.
by Alexandre Julliard Aug. 9, 2019

Aug. 9, 2019

Module: wine Branch: master Commit: d8582d97a09b88d62f8d2b547538770f47f59dfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8582d97a09b88d62f8d2b54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 9 13:44:17 2019 +0200 kernel32: Move process/thread attribute list functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 6 +- dlls/kernel32/process.c | 137 -------------------------------------- dlls/kernelbase/kernelbase.spec | 6 +- dlls/kernelbase/process.c | 141 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 147 insertions(+), 143 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d8582d97a09b88d62f8d…

1 0

Alexandre Julliard : kernel32: Move some process functions to kernelbase.
by Alexandre Julliard Aug. 9, 2019

Aug. 9, 2019

Module: wine Branch: master Commit: 09f588ee6909369b541398dd392d3ff77231e6a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09f588ee6909369b541398dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 9 13:37:26 2019 +0200 kernel32: Move some process functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/heap.c | 8 - dlls/kernel32/kernel32.spec | 42 ++--- dlls/kernel32/process.c | 364 ---------------------------------------- dlls/kernel32/thread.c | 8 - dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/kernelbase.spec | 48 +++--- dlls/kernelbase/process.c | 346 ++++++++++++++++++++++++++++++++++++++ include/winbase.h | 1 + 8 files changed, 393 insertions(+), 425 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=09f588ee6909369b5413…

1 0

Alexandre Julliard : kernel32: Move more thread functions to kernelbase.
by Alexandre Julliard Aug. 9, 2019

Aug. 9, 2019

Module: wine Branch: master Commit: f2e7e1658beb48480bbe453bff43155eac2c40f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2e7e1658beb48480bbe453b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 9 12:23:18 2019 +0200 kernel32: Move more thread functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 20 +++--- dlls/kernel32/process.c | 153 ---------------------------------------- dlls/kernel32/thread.c | 74 ------------------- dlls/kernelbase/kernelbase.spec | 14 ++-- dlls/kernelbase/thread.c | 138 ++++++++++++++++++++++++++++++++++++ 5 files changed, 155 insertions(+), 244 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f2e7e1658beb48480bbe…

1 0

Jacek Caban : msvcrt: Avoid conflict with mingw __iob_func declaration.
by Alexandre Julliard Aug. 9, 2019

Aug. 9, 2019

Module: wine Branch: master Commit: 873a90e6f36b9acc74eb637a230ffee491398cd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=873a90e6f36b9acc74eb637a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 9 15:59:45 2019 +0200 msvcrt: Avoid conflict with mingw __iob_func declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b5b51fc..18d69b7 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -29,6 +29,7 @@ #include "config.h" #include "wine/port.h" +#define __iob_func mingw___iob_func #include <stdarg.h> #include <stdio.h> #ifdef HAVE_UNISTD_H

1 0

Jacek Caban : include/msvcrt: Include corecrt.h instead of crtdefs.h.
by Alexandre Julliard Aug. 9, 2019

Aug. 9, 2019

Module: wine Branch: master Commit: 80e21548566d16e8c7692f914b064487374c717f URL: https://source.winehq.org/git/wine.git/?a=commit;h=80e21548566d16e8c7692f91… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 9 17:32:04 2019 +0200 include/msvcrt: Include corecrt.h instead of crtdefs.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/assert.h | 2 +- include/msvcrt/conio.h | 2 +- include/msvcrt/crtdbg.h | 2 +- include/msvcrt/ctype.h | 2 +- include/msvcrt/direct.h | 2 +- include/msvcrt/dos.h | 2 +- include/msvcrt/eh.h | 2 +- include/msvcrt/errno.h | 2 +- include/msvcrt/fcntl.h | 2 +- include/msvcrt/float.h | 2 +- include/msvcrt/fpieee.h | 2 +- include/msvcrt/inttypes.h | 2 +- include/msvcrt/io.h | 2 +- include/msvcrt/limits.h | 2 +- include/msvcrt/locale.h | 2 +- include/msvcrt/malloc.h | 2 +- include/msvcrt/math.h | 2 +- include/msvcrt/mbctype.h | 2 +- include/msvcrt/mbstring.h | 2 +- include/msvcrt/memory.h | 2 +- include/msvcrt/process.h | 2 +- include/msvcrt/search.h | 2 +- include/msvcrt/setjmp.h | 2 +- include/msvcrt/signal.h | 2 +- include/msvcrt/stddef.h | 2 +- include/msvcrt/stdint.h | 2 +- include/msvcrt/stdio.h | 2 +- include/msvcrt/stdlib.h | 2 +- include/msvcrt/string.h | 2 +- include/msvcrt/sys/stat.h | 2 +- include/msvcrt/sys/timeb.h | 2 +- include/msvcrt/sys/types.h | 2 +- include/msvcrt/sys/utime.h | 2 +- include/msvcrt/time.h | 2 +- include/msvcrt/wchar.h | 2 +- include/msvcrt/wctype.h | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=80e21548566d16e8c769…

1 0

Jacek Caban : include/msvcrt: Add corecrt.h header.
by Alexandre Julliard Aug. 9, 2019

Aug. 9, 2019

Module: wine Branch: master Commit: b512ae37dd20c5f306cce5bb28dd3955b6cb25c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b512ae37dd20c5f306cce5bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 9 17:31:52 2019 +0200 include/msvcrt: Add corecrt.h header. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/msvcrt/corecrt.h | 279 +++++++++++++++++++++++++++++++++++++++++++++++ include/msvcrt/crtdefs.h | 255 +------------------------------------------ 3 files changed, 281 insertions(+), 254 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b512ae37dd20c5f306cc…

1 0

Zebediah Figura : d3dcompiler/tests: Add a couple more tests for complex initializers.
by Alexandre Julliard Aug. 9, 2019

Aug. 9, 2019

Module: wine Branch: master Commit: bfe12dc5dde70855034ce4388c51a8cd017ee134 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfe12dc5dde70855034ce438… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Aug 9 09:52:48 2019 -0500 d3dcompiler/tests: Add a couple more tests for complex initializers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index cef9b4d..9f696ee 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -594,6 +594,18 @@ static void test_fail(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *qquad_ge " float2 x = 45s;\n" " return float4(x.x, x.y, 0, 0);\n" "}", + + "float4 test(float2 pos: TEXCOORD0) : COLOR\n" + "{\n" + " struct { int b,c; } x = {0};\n" + " return y;\n" + "}", + + "float4 test(float2 pos: TEXCOORD0) : COLOR\n" + "{\n" + " struct {} x = {};\n" + " return y;\n" + "}", }; ID3D10Blob *compiled, *errors;

1 0

Zebediah Figura : d3dcompiler: Remove redundant components_count_expr_list () function.
by Alexandre Julliard Aug. 9, 2019

Aug. 9, 2019

Module: wine Branch: master Commit: 79b7828894caed586215768b21bf2f165022a6b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79b7828894caed586215768b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Aug 9 09:52:46 2019 -0500 d3dcompiler: Remove redundant components_count_expr_list() function. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 0f98190..c18efcc 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -387,19 +387,7 @@ static unsigned int initializer_size(struct list *initializer) { count += components_count_type(node->data_type); } - TRACE("Initializer size = %u\n", count); - return count; -} - -static unsigned int components_count_expr_list(struct list *list) -{ - struct hlsl_ir_node *node; - unsigned int count = 0; - - LIST_FOR_EACH_ENTRY(node, list, struct hlsl_ir_node, entry) - { - count += components_count_type(node->data_type); - } + TRACE("Initializer size = %u.\n", count); return count; } @@ -2109,7 +2097,7 @@ postfix_expr: primary_expr set_parse_status(&hlsl_ctx.status, PARSE_ERR); return -1; } - if ($2->dimx * $2->dimy != components_count_expr_list($4)) + if ($2->dimx * $2->dimy != initializer_size($4)) { hlsl_message("Line %u: wrong number of components in constructor.\n", hlsl_ctx.line_no);

1 0