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

Jacek Caban : msvcrt: Avoid conflict with mingw __iob_func declaration.
by Alexandre Julliard 09 Aug '19

09 Aug '19

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: Add corecrt.h header.
by Alexandre Julliard 09 Aug '19

09 Aug '19

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

Jacek Caban : include/msvcrt: Include corecrt.h instead of crtdefs.h.
by Alexandre Julliard 09 Aug '19

09 Aug '19

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

Andrew Eikum : hid: Fix looking up report in HidP_GetValueCaps.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: 6563166142b60f5857e4341f926e9cff7cc4cec1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6563166142b60f5857e4341f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 9 11:50:56 2019 -0500 hid: Fix looking up report in HidP_GetValueCaps. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 8f4a474..59a4078 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -450,8 +450,8 @@ NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS { for (i = 0; i < report[j].elementCount && u < v_count; i++) { - if (elems[report->elementIdx + i].ElementType == ValueElement) - ValueCaps[u++] = elems[report->elementIdx + i].caps.value; + if (elems[report[j].elementIdx + i].ElementType == ValueElement) + ValueCaps[u++] = elems[report[j].elementIdx + i].caps.value; } }

1 0

Zebediah Figura : d3dcompiler: Get rid of the superfluous "variable" rule.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: f9f1e99099a03fff4e29991f8aebf2b84f2bcc99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9f1e99099a03fff4e29991f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Aug 9 09:52:44 2019 -0500 d3dcompiler: Get rid of the superfluous "variable" rule. 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 | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 4ece669..ba0fd5c 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -913,7 +913,6 @@ static const struct hlsl_ir_function_decl *get_overloaded_func(struct wine_rb_tr BOOL boolval; char *name; DWORD modifiers; - struct hlsl_ir_var *var; struct hlsl_ir_node *instr; struct list *list; struct parse_function function; @@ -1049,7 +1048,6 @@ static const struct hlsl_ir_function_decl *get_overloaded_func(struct wine_rb_tr %type <list> parameters %type <list> param_list %type <instr> expr -%type <var> variable %type <intval> array %type <list> statement %type <list> statement_list @@ -1910,10 +1908,19 @@ primary_expr: C_FLOAT c->v.value.b[0] = $1; $$ = &c->node; } - | variable + | VAR_IDENTIFIER { - struct hlsl_ir_deref *deref = new_var_deref($1); - if (deref) + struct hlsl_ir_deref *deref; + struct hlsl_ir_var *var; + + if (!(var = get_variable(hlsl_ctx.cur_scope, $1))) + { + hlsl_message("Line %d: variable '%s' not declared\n", + hlsl_ctx.line_no, $1); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + return 1; + } + if ((deref = new_var_deref(var))) { $$ = &deref->node; set_location(&$$->loc, &@1); @@ -1926,20 +1933,6 @@ primary_expr: C_FLOAT $$ = $2; } -variable: VAR_IDENTIFIER - { - struct hlsl_ir_var *var; - var = get_variable(hlsl_ctx.cur_scope, $1); - if (!var) - { - hlsl_message("Line %d: variable '%s' not declared\n", - hlsl_ctx.line_no, $1); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); - return 1; - } - $$ = var; - } - postfix_expr: primary_expr { $$ = $1;

1 0

Zebediah Figura : d3dcompiler: Store the arguments to a hlsl_ir_constructor as a fixed array.
by Alexandre Julliard 09 Aug '19

09 Aug '19

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

Zebediah Figura : d3dcompiler: Remove redundant components_count_expr_list () function.
by Alexandre Julliard 09 Aug '19

09 Aug '19

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

Zebediah Figura : d3dcompiler/tests: Simplify test_fail().
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: 9501c6e691ea8d6874dc088d721521eb17f0b827 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9501c6e691ea8d6874dc088d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Aug 9 09:52:47 2019 -0500 d3dcompiler/tests: Simplify test_fail(). 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 | 78 ++++++++++------------------------------ 1 file changed, 19 insertions(+), 59 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index e67e68c..cef9b4d 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -562,93 +562,53 @@ static void test_trig(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geo static void test_fail(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *qquad_geometry, IDirect3DVertexShader9 *vshader_passthru) { - static const char *undefined_variable_shader = + static const char *tests[] = + { "float4 test(float2 pos: TEXCOORD0) : COLOR\n" "{\n" " return y;\n" - "}"; + "}", - static const char *invalid_swizzle_shader = "float4 test(float2 pos: TEXCOORD0) : COLOR\n" "{\n" " float4 x = float4(0, 0, 0, 0);\n" " x.xzzx = float4(1, 2, 3, 4);\n" " return x;\n" - "}"; + "}", - static const char *invalid_conversion_shader = "float4 test(float2 pos: TEXCOORD0) : COLOR\n" "{\n" " float4 x = pos;\n" " return x;\n" - "}"; + "}", - static const char *invalid_syntax_shader = "float4 test(float2 pos, TEXCOORD0) ; COLOR\n" "{\n" " pos = float4 x;\n" " mul(float4(5, 4, 3, 2), mvp) = x;\n" " return float4;\n" - "}"; + "}", - static const char *invalid_identifiers_shader = "float4 563r(float2 45s: TEXCOORD0) : COLOR\n" "{\n" " float2 x = 45s;\n" " return float4(x.x, x.y, 0, 0);\n" - "}"; + "}", + }; - ID3D10Blob *compiled = NULL, *errors = NULL; + ID3D10Blob *compiled, *errors; + unsigned int i; HRESULT hr; - hr = ppD3DCompile(undefined_variable_shader, strlen(undefined_variable_shader), NULL, NULL, NULL, - "test", "ps_2_0", 0, 0, &compiled, &errors); - ok(hr != D3D_OK, "Pixel shader compilation succeeded on shader with undefined variable\n"); - ok(errors != NULL, "No errors returned for a shader with undefined variables\n"); - ok(compiled == NULL, "A shader blob was returned for a shader with undefined variables\n"); - - ID3D10Blob_Release(errors); - errors = NULL; - - hr = ppD3DCompile(invalid_swizzle_shader, strlen(invalid_swizzle_shader), NULL, NULL, NULL, - "test","ps_2_0", 0, 0, &compiled, &errors); - ok(hr != D3D_OK, "Pixel shader compilation succeeded on shader with an invalid swizzle mask\n"); - ok(errors != NULL, "No errors returned for a shader with an invalid swizzle mask\n"); - ok(compiled == NULL, "A shader blob was returned for a shader with an invalid swizzle mask\n"); - - ID3D10Blob_Release(errors); - errors = NULL; - - hr = ppD3DCompile(invalid_conversion_shader, strlen(invalid_conversion_shader), NULL, NULL, NULL, - "test", "ps_2_0", 0, 0, &compiled, &errors); - ok(hr != D3D_OK, "Pixel shader compilation succeeded on shader with an invalid type " - "conversion\n"); - ok(errors != NULL, "No errors returned for a shader with invalid type conversions\n"); - ok(compiled == NULL, "A shader blob was returned for a shader with invalid type conversions\n"); - - ID3D10Blob_Release(errors); - errors = NULL; - - hr = ppD3DCompile(invalid_syntax_shader, strlen(invalid_syntax_shader), NULL, NULL, NULL, "test", - "ps_2_0", 0, 0, &compiled, &errors); - ok(hr != D3D_OK, "Pixel shader compilation succeeded on shader with blatantly invalid " - "syntax\n"); - ok(errors != NULL, "No errors returned for a shader with invalid syntax\n"); - ok(compiled == NULL, "A shader blob was returned for a shader with invalid syntax\n"); - - ID3D10Blob_Release(errors); - errors = NULL; - - hr = ppD3DCompile(invalid_identifiers_shader, strlen(invalid_identifiers_shader), NULL, NULL, - NULL, "test", "ps_2_0", 0, 0, &compiled, &errors); - ok(hr != D3D_OK, "Pixel shader compilation successful on a shader with invalid variable and " - "function names\n"); - ok(errors != NULL, "No errors returned for a shader with invalid variable and function " - "names\n"); - ok(compiled == NULL, "A shader blob was returned for a shader with invalid variable and " - "function names\n"); - - ID3D10Blob_Release(errors); + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + compiled = errors = NULL; + hr = ppD3DCompile(tests[i], strlen(tests[i]), NULL, NULL, NULL, "test", "ps_2_0", 0, 0, &compiled, &errors); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!!errors, "Expected non-NULL error blob.\n"); + ok(!compiled, "Expected no compiled shader blob.\n"); + ID3D10Blob_Release(errors); + } } static BOOL load_d3dcompiler(void)

1 0

Zebediah Figura : d3dcompiler/tests: Add a couple more tests for complex initializers.
by Alexandre Julliard 09 Aug '19

09 Aug '19

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

Gijs Vermeulen : wmp: Fix memory leak in IWMP[Media|Playlist]::put_name.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: 8cacc16af85d0a2ad7e80513200f189220312273 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cacc16af85d0a2ad7e80513… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Fri Aug 9 19:09:49 2019 +0200 wmp: Fix memory leak in IWMP[Media|Playlist]::put_name. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 03a7d26..729cc81 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -1819,6 +1819,7 @@ static HRESULT WINAPI WMPMedia_put_name(IWMPMedia *iface, BSTR name) if (!name) return E_POINTER; + heap_free(This->name); This->name = heap_strdupW(name); return S_OK; } @@ -2063,6 +2064,7 @@ static HRESULT WINAPI WMPPlaylist_put_name(IWMPPlaylist *iface, BSTR name) if (!name) return E_POINTER; + heap_free(This->name); This->name = heap_strdupW(name); return S_OK; }

1 0