March 2020 - Wine-commits - list.winehq.org

Zebediah Figura : d3dcompiler: Move modifer processing up out of the struct_spec rules.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: f9ce3c7c7aa9802bbbbdb108715770b066a8562a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9ce3c7c7aa9802bbbbdb108… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 15 16:25:10 2020 -0500 d3dcompiler: Move modifer processing up out of the struct_spec rules. So that storage classes will be stored in the relevant hlsl_ir_var instead of in the type. 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 | 62 ++++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index fca4ebc529..556c03b11f 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -771,7 +771,7 @@ static struct list *gen_struct_fields(struct hlsl_type *type, DWORD modifiers, s return list; } -static struct hlsl_type *new_struct_type(const char *name, DWORD modifiers, struct list *fields) +static struct hlsl_type *new_struct_type(const char *name, struct list *fields) { struct hlsl_type *type = d3dcompiler_alloc(sizeof(*type)); @@ -783,7 +783,6 @@ static struct hlsl_type *new_struct_type(const char *name, DWORD modifiers, stru type->type = HLSL_CLASS_STRUCT; type->name = name; type->dimx = type->dimy = 1; - type->modifiers = modifiers; type->e.elements = fields; list_add_tail(&hlsl_ctx.types, &type->entry); @@ -1127,6 +1126,8 @@ static unsigned int evaluate_array_dimension(struct hlsl_ir_node *node) %type <type> struct_spec %type <type> named_struct_spec %type <type> unnamed_struct_spec +%type <type> field_type +%type <type> typedef_type %type <list> type_specs %type <variable_def> type_spec %type <initializer> complex_initializer @@ -1248,56 +1249,60 @@ preproc_directive: PRE_LINE STRING } } -struct_declaration: struct_spec variables_def_optional ';' +struct_declaration: var_modifiers struct_spec variables_def_optional ';' { - if (!$2) + struct hlsl_type *type; + DWORD modifiers = $1; + + if (!$3) { - if (!$1->name) + if (!$2->name) { hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, "anonymous struct declaration with no variables"); } - if ($1->modifiers) + if (modifiers) { hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, "modifier not allowed on struct type declaration"); } } - $$ = declare_vars($1, 0, $2); + + if (!(type = apply_type_modifiers($2, &modifiers, get_location(&@1)))) + YYABORT; + $$ = declare_vars(type, modifiers, $3); } struct_spec: named_struct_spec | unnamed_struct_spec -named_struct_spec: var_modifiers KW_STRUCT any_identifier '{' fields_list '}' +named_struct_spec: KW_STRUCT any_identifier '{' fields_list '}' { BOOL ret; - TRACE("Structure %s declaration.\n", debugstr_a($3)); - check_invalid_matrix_modifiers($1, get_location(&@1)); - $$ = new_struct_type($3, $1, $5); + TRACE("Structure %s declaration.\n", debugstr_a($2)); + $$ = new_struct_type($2, $4); - if (get_variable(hlsl_ctx.cur_scope, $3)) + if (get_variable(hlsl_ctx.cur_scope, $2)) { - hlsl_report_message(get_location(&@3), - HLSL_LEVEL_ERROR, "redefinition of '%s'", $3); + hlsl_report_message(get_location(&@2), + HLSL_LEVEL_ERROR, "redefinition of '%s'", $2); YYABORT; } ret = add_type_to_scope(hlsl_ctx.cur_scope, $$); if (!ret) { - hlsl_report_message(get_location(&@3), - HLSL_LEVEL_ERROR, "redefinition of struct '%s'", $3); + hlsl_report_message(get_location(&@2), + HLSL_LEVEL_ERROR, "redefinition of struct '%s'", $2); YYABORT; } } -unnamed_struct_spec: var_modifiers KW_STRUCT '{' fields_list '}' +unnamed_struct_spec: KW_STRUCT '{' fields_list '}' { TRACE("Anonymous structure declaration.\n"); - check_invalid_matrix_modifiers($1, get_location(&@1)); - $$ = new_struct_type(NULL, $1, $4); + $$ = new_struct_type(NULL, $3); } any_identifier: VAR_IDENTIFIER @@ -1328,7 +1333,10 @@ fields_list: /* Empty */ d3dcompiler_free($2); } -field: var_modifiers type variables_def ';' +field_type: type + | unnamed_struct_spec + +field: var_modifiers field_type variables_def ';' { struct hlsl_type *type; DWORD modifiers = $1; @@ -1337,10 +1345,6 @@ field: var_modifiers type variables_def ';' YYABORT; $$ = gen_struct_fields(type, modifiers, $3); } - | unnamed_struct_spec variables_def ';' - { - $$ = gen_struct_fields($1, 0, $2); - } func_declaration: func_prototype compound_statement { @@ -1636,7 +1640,10 @@ declaration_statement: declaration list_init($$); } -typedef: KW_TYPEDEF var_modifiers type type_specs ';' +typedef_type: type + | struct_spec + +typedef: KW_TYPEDEF var_modifiers typedef_type type_specs ';' { if ($2 & ~HLSL_TYPE_MODIFIERS_MASK) { @@ -1651,11 +1658,6 @@ typedef: KW_TYPEDEF var_modifiers type type_specs ';' if (!add_typedef($2, $3, $4)) YYABORT; } - | KW_TYPEDEF struct_spec type_specs ';' - { - if (!add_typedef(0, $2, $3)) - YYABORT; - } type_specs: type_spec {

1 0

Zebediah Figura : d3dcompiler: Rename HLSL_MODIFIERS_COMPARISON_MASK to HLSL_MODIFIERS_MAJORITY_MASK and use it in more places.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: 8ea8eb20a4d2a81375a6ffd4d643e89c5444af40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ea8eb20a4d2a81375a6ffd4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 15 16:25:11 2020 -0500 d3dcompiler: Rename HLSL_MODIFIERS_COMPARISON_MASK to HLSL_MODIFIERS_MAJORITY_MASK and use it in more places. 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 | 2 +- dlls/d3dcompiler_43/hlsl.y | 5 ++--- dlls/d3dcompiler_43/utils.c | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 957fc24e20..1a9d68e720 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -741,7 +741,7 @@ struct hlsl_ir_node HLSL_MODIFIER_CONST | HLSL_MODIFIER_ROW_MAJOR | \ HLSL_MODIFIER_COLUMN_MAJOR) -#define HLSL_MODIFIERS_COMPARISON_MASK (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR) +#define HLSL_MODIFIERS_MAJORITY_MASK (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR) struct reg_reservation { diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 556c03b11f..4f5a7b1782 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -117,7 +117,7 @@ static void debug_dump_decl(struct hlsl_type *type, DWORD modifiers, const char static void check_invalid_matrix_modifiers(DWORD modifiers, struct source_location loc) { - if (modifiers & (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR)) + if (modifiers & HLSL_MODIFIERS_MAJORITY_MASK) { hlsl_report_message(loc, HLSL_LEVEL_ERROR, "'row_major' or 'column_major' modifiers are only allowed for matrices"); @@ -175,8 +175,7 @@ static DWORD add_modifiers(DWORD modifiers, DWORD mod, const struct source_locat hlsl_report_message(loc, HLSL_LEVEL_ERROR, "modifier '%s' already specified", debug_modifiers(mod)); return modifiers; } - if (mod & (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR) - && modifiers & (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR)) + if ((mod & HLSL_MODIFIERS_MAJORITY_MASK) && (modifiers & HLSL_MODIFIERS_MAJORITY_MASK)) { hlsl_report_message(loc, HLSL_LEVEL_ERROR, "more than one matrix majority keyword"); return modifiers; diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 3e8e229c8c..921ef7c2c7 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -892,8 +892,8 @@ BOOL compare_hlsl_types(const struct hlsl_type *t1, const struct hlsl_type *t2) return FALSE; if (t1->base_type == HLSL_TYPE_SAMPLER && t1->sampler_dim != t2->sampler_dim) return FALSE; - if ((t1->modifiers & HLSL_MODIFIERS_COMPARISON_MASK) - != (t2->modifiers & HLSL_MODIFIERS_COMPARISON_MASK)) + if ((t1->modifiers & HLSL_MODIFIERS_MAJORITY_MASK) + != (t2->modifiers & HLSL_MODIFIERS_MAJORITY_MASK)) return FALSE; if (t1->dimx != t2->dimx) return FALSE;

1 0

Zebediah Figura : d3dcompiler/tests: Add more tests for swizzles.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: 18b8393ff9a409656de52ef24d0717bab0e44712 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18b8393ff9a409656de52ef2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 15 16:25:12 2020 -0500 d3dcompiler/tests: Add more tests for swizzles. 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_d3d9.c | 167 +++++++++++++++++++++------------- 1 file changed, 106 insertions(+), 61 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index 3edee34d8d..b96ab16679 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -294,78 +294,123 @@ static void test_swizzle(void) ID3DXConstantTable *constants; ID3D10Blob *ps_code = NULL; IDirect3DDevice9 *device; + unsigned int i; struct vec4 v; HRESULT hr; - static const char ps_source[] = - "uniform float4 color;\n" - "float4 main() : COLOR\n" - "{\n" - " float4 ret = color;\n" - " ret.gb = ret.ra;\n" - " ret.ra = float2(0.0101, 0.0404);\n" - " return ret;\n" - "}"; - - static const char ps_multiple_lhs_source[] = - "float4 main() : COLOR\n" - "{\n" - " float4 ret = float4(0.1, 0.2, 0.3, 0.4);\n" - " ret.wyz.yx = float2(0.5, 0.6).yx;\n" - " return ret;\n" - "}"; - - static const char ps_multiple_rhs_source[] = - "float4 main() : COLOR\n" - "{\n" - " float4 ret = float4(0.1, 0.2, 0.3, 0.4).ywxz.zyyz;\n" - " return ret;\n" - "}"; - - if (!init_test_context(&test_context)) - return; - device = test_context.device; - - todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); - if (ps_code) + static const struct { - hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); - hr = ID3DXConstantTable_SetVector(constants, device, "color", &color); - ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); - ID3DXConstantTable_Release(constants); - - draw_quad(device, ps_code); - - v = get_color_vec4(device, 0, 0); - ok(compare_vec4(&v, 0.0101f, 0.0303f, 0.0202f, 0.0404f, 0), - "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); - - ID3D10Blob_Release(ps_code); + const char *source; + struct vec4 color; } - - todo_wine ps_code = compile_shader(ps_multiple_lhs_source, "ps_2_0"); - if (ps_code) + tests[] = { - draw_quad(device, ps_code); - - v = get_color_vec4(device, 0, 0); - ok(compare_vec4(&v, 0.1f, 0.6f, 0.3f, 0.5f, 0), - "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + { + "uniform float4 color;\n" + "float4 main() : COLOR\n" + "{\n" + " float4 ret = color;\n" + " ret.gb = ret.ra;\n" + " ret.ra = float2(0.0101, 0.0404);\n" + " return ret;\n" + "}", + {0.0101f, 0.0303f, 0.0202f, 0.0404f} + }, + { + "float4 main() : COLOR\n" + "{\n" + " float4 ret = float4(0.1, 0.2, 0.3, 0.4);\n" + " ret.wyz.yx = float2(0.5, 0.6).yx;\n" + " return ret;\n" + "}", + {0.1f, 0.6f, 0.3f, 0.5f} + }, + { + "float4 main() : COLOR\n" + "{\n" + " float4 ret;\n" + " ret.zwyx = float4(0.1, 0.2, 0.3, 0.4);\n" + " return ret;\n" + "}", + {0.4f, 0.3f, 0.1f, 0.2f} + }, + { + "float4 main() : COLOR\n" + "{\n" + " float4 ret;\n" + " ret.yw.y = 0.1;\n" + " ret.xzy.yz.y.x = 0.2;\n" + " ret.yzwx.yzwx.wz.y = 0.3;\n" + " ret.zxy.xyz.zxy.xy.y = 0.4;\n" + " return ret;\n" + "}", + {0.3f, 0.2f, 0.4f, 0.1f} + }, + { + "float4 main() : COLOR\n" + "{\n" + " float4 ret;\n" + " ret.yxz.yx = float2(0.1, 0.2);\n" + " ret.w.x = 0.3;\n" + " ret.wzyx.zyx.yx.x = 0.4;\n" + " return ret;\n" + "}", + {0.1f, 0.2f, 0.4f, 0.3f} + }, + { + "float4 main() : COLOR\n" + "{\n" + " float4 ret = float4(0.1, 0.2, 0.3, 0.4).ywxz.zyyz;\n" + " return ret;\n" + "}", + {0.1f, 0.4f, 0.4f, 0.1f} + }, + { + "float4 main() : COLOR\n" + "{\n" + " float4 ret = float4(0.1, 0.2, 0.3, 0.4);\n" + " ret.yxwz = ret;\n" + " ret = ret.wyzx;\n" + " return ret;\n" + "}", + {0.3f, 0.1f, 0.4f, 0.2f} + }, + { + "float4 main() : COLOR\n" + "{\n" + " float4 ret;\n" + " ret.xyzw.xyzw = float4(0.1, 0.2, 0.3, 0.4);\n" + " return ret;\n" + "}", + {0.1f, 0.2f, 0.3f, 0.4f} + }, + }; - ID3D10Blob_Release(ps_code); - } + if (!init_test_context(&test_context)) + return; + device = test_context.device; - todo_wine ps_code = compile_shader(ps_multiple_rhs_source, "ps_2_0"); - if (ps_code) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { - draw_quad(device, ps_code); + todo_wine ps_code = compile_shader(tests[i].source, "ps_2_0"); + if (ps_code) + { + if (i == 0) + { + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); + ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetVector(constants, device, "color", &color); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ID3DXConstantTable_Release(constants); + } + draw_quad(device, ps_code); - v = get_color_vec4(device, 0, 0); - ok(compare_vec4(&v, 0.1f, 0.4f, 0.4f, 0.1f, 0), - "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + v = get_color_vec4(device, 0, 0); + ok(compare_vec4(&v, tests[i].color.x, tests[i].color.y, tests[i].color.z, tests[i].color.w, 0), + "Test %u: Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", i, v.x, v.y, v.z, v.w); - ID3D10Blob_Release(ps_code); + ID3D10Blob_Release(ps_code); + } } release_test_context(&test_context);

1 0

Zebediah Figura : d3dcompiler: Ensure that the lhs of an assignment is reducible to a variable.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: aaa625217b202dc0a22d67e63e941b027146a456 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaa625217b202dc0a22d67e6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 15 16:25:13 2020 -0500 d3dcompiler: Ensure that the lhs of an assignment is reducible to a variable. 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/utils.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 921ef7c2c7..6e9bb593e0 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1456,6 +1456,29 @@ static unsigned int invert_swizzle(unsigned int *swizzle, unsigned int writemask return new_writemask; } +static BOOL validate_lhs_deref(const struct hlsl_ir_node *lhs) +{ + struct hlsl_ir_deref *deref; + + if (lhs->type != HLSL_IR_DEREF) + { + hlsl_report_message(lhs->loc, HLSL_LEVEL_ERROR, "invalid lvalue"); + return FALSE; + } + + deref = deref_from_node(lhs); + + if (deref->src.type == HLSL_IR_DEREF_VAR) + return TRUE; + if (deref->src.type == HLSL_IR_DEREF_ARRAY) + return validate_lhs_deref(deref->src.v.array.array); + if (deref->src.type == HLSL_IR_DEREF_RECORD) + return validate_lhs_deref(deref->src.v.record.record); + + assert(0); + return FALSE; +} + struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign_op assign_op, struct hlsl_ir_node *rhs) { @@ -1509,6 +1532,12 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign lhs = lhs_inner; } + if (!validate_lhs_deref(lhs)) + { + d3dcompiler_free(assign); + return NULL; + } + TRACE("Creating proper assignment expression.\n"); if (writemask == BWRITERSP_WRITEMASK_ALL) type = lhs->data_type;

1 0

Jacek Caban : include: Add fenv.h header.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: ec4b4c33f3b46328c886ef96343082c92bb3285d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec4b4c33f3b46328c886ef96… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 19 15:40:26 2020 +0100 include: Add fenv.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/fenv.h | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index a3b8774dc0..dc79d2ca24 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -444,6 +444,7 @@ SOURCES = \ msvcrt/eh.h \ msvcrt/errno.h \ msvcrt/fcntl.h \ + msvcrt/fenv.h \ msvcrt/float.h \ msvcrt/fpieee.h \ msvcrt/inttypes.h \ diff --git a/include/msvcrt/fenv.h b/include/msvcrt/fenv.h new file mode 100644 index 0000000000..20906f38e2 --- /dev/null +++ b/include/msvcrt/fenv.h @@ -0,0 +1,26 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the Wine project. + */ + +#ifndef _INC_FENV +#define _INC_FENV + +#include <float.h> + +#define FE_TONEAREST _RC_NEAR +#define FE_UPWARD _RC_UP +#define FE_DOWNWARD _RC_DOWN +#define FE_TOWARDZERO _RC_CHOP + +#ifdef __cplusplus +extern "C" { +#endif + +_ACRTIMP int __cdecl fesetround(int); + +#ifdef __cplusplus +} +#endif + +#endif /* _INC_FENV */

1 0

Jacek Caban : corecrt_startup.h: Add more declarations.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: 4713675f9cfa9512dbbc8034a8e5ebfcfc744e0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4713675f9cfa9512dbbc8034… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 19 15:40:42 2020 +0100 corecrt_startup.h: Add more declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_startup.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/msvcrt/corecrt_startup.h b/include/msvcrt/corecrt_startup.h index fd238b9757..064f6fca27 100644 --- a/include/msvcrt/corecrt_startup.h +++ b/include/msvcrt/corecrt_startup.h @@ -34,6 +34,9 @@ typedef struct _onexit_table_t { typedef int (__cdecl *_onexit_t)(void); +struct _exception; +typedef int (__cdecl *_UserMathErrorFunctionPointer)(struct _exception *); + #ifdef __cplusplus extern "C" { #endif @@ -44,11 +47,16 @@ _ACRTIMP void __cdecl __wgetmainargs(int *, wchar_t ***, wchar_t ***, int, int * #define _set_app_type __set_app_type #endif /* _UCRT */ +_ACRTIMP void __cdecl __setusermatherr(_UserMathErrorFunctionPointer); _ACRTIMP errno_t __cdecl _configure_narrow_argv(_crt_argv_mode); _ACRTIMP errno_t __cdecl _configure_wide_argv(_crt_argv_mode); +_ACRTIMP int __cdecl _crt_at_quick_exit(_PVFV); +_ACRTIMP int __cdecl _crt_atexit(_PVFV); _ACRTIMP int __cdecl _execute_onexit_table(_onexit_table_t*); _ACRTIMP char **__cdecl _get_initial_narrow_environment(void); _ACRTIMP wchar_t **__cdecl _get_initial_wide_environment(void); +_ACRTIMP char* __cdecl _get_narrow_winmain_command_line(void); +_ACRTIMP wchar_t* __cdecl _get_wide_winmain_command_line(void); _ACRTIMP int __cdecl _initialize_narrow_environment(void); _ACRTIMP int __cdecl _initialize_onexit_table(_onexit_table_t*); _ACRTIMP int __cdecl _initialize_wide_environment(void);

1 0

Jacek Caban : ctype.h: Add more declarations.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: 27e2c21bcf834c9674a181a2218625b922b5d9fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=27e2c21bcf834c9674a181a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 19 15:40:56 2020 +0100 ctype.h: Add more declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wctype.h | 3 +++ include/msvcrt/ctype.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/include/msvcrt/corecrt_wctype.h b/include/msvcrt/corecrt_wctype.h index b9929383d0..af44e86772 100644 --- a/include/msvcrt/corecrt_wctype.h +++ b/include/msvcrt/corecrt_wctype.h @@ -24,6 +24,8 @@ extern "C" { #define _LEADBYTE 0x8000 #define _ALPHA (0x0100|_UPPER|_LOWER) /* (C1_ALPHA|_UPPER|_LOWER) */ +int __cdecl _iswblank_l(wint_t,_locale_t); +int __cdecl _iswctype_l(wint_t,wctype_t,_locale_t); wchar_t __cdecl _towlower_l(wchar_t,_locale_t); wchar_t __cdecl _towupper_l(wchar_t,_locale_t); int __cdecl is_wctype(wint_t,wctype_t); @@ -31,6 +33,7 @@ int __cdecl isleadbyte(int); int __cdecl iswalnum(wint_t); int __cdecl iswalpha(wint_t); int __cdecl iswascii(wint_t); +int __cdecl iswblank(wint_t); int __cdecl iswcntrl(wint_t); int __cdecl iswctype(wint_t,wctype_t); int __cdecl iswdigit(wint_t); diff --git a/include/msvcrt/ctype.h b/include/msvcrt/ctype.h index 6b6cf07cd9..872afb3e74 100644 --- a/include/msvcrt/ctype.h +++ b/include/msvcrt/ctype.h @@ -22,6 +22,7 @@ int __cdecl __isascii(int); int __cdecl __iscsym(int); int __cdecl __iscsymf(int); int __cdecl __toascii(int); +int __cdecl _isblank_l(int,_locale_t); int __cdecl _isctype(int,int); int __cdecl _tolower(int); int __cdecl _tolower_l(int,_locale_t); @@ -29,6 +30,7 @@ int __cdecl _toupper(int); int __cdecl _toupper_l(int,_locale_t); int __cdecl isalnum(int); int __cdecl isalpha(int); +int __cdecl isblank(int); int __cdecl iscntrl(int); int __cdecl isdigit(int); int __cdecl isgraph(int);

1 0

Jacek Caban : float.h: Add __fpe_flt_rounds declaration.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: 311cb41702e4bca0739934eb089de159170675d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=311cb41702e4bca0739934eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 19 15:41:09 2020 +0100 float.h: Add __fpe_flt_rounds declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/float.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/float.h b/include/msvcrt/float.h index 3b8e5ed7e6..97b2fbee13 100644 --- a/include/msvcrt/float.h +++ b/include/msvcrt/float.h @@ -134,6 +134,7 @@ extern "C" { #define _CW_DEFAULT (_RC_NEAR + _PC_64 + _EM_INVALID + _EM_ZERODIVIDE + _EM_OVERFLOW + _EM_UNDERFLOW + _EM_INEXACT + _EM_DENORMAL) #endif +_ACRTIMP int __cdecl __fpe_flt_rounds(void); unsigned int __cdecl _control87(unsigned int, unsigned int); unsigned int __cdecl _controlfp(unsigned int, unsigned int); errno_t __cdecl _controlfp_s(unsigned int *, unsigned int, unsigned int);

1 0

Jacek Caban : io.h: Add _sopen_dispatch and _sopen_s declarations.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: e52a44c4059886bed4412061df332d207a988a1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e52a44c4059886bed4412061… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 19 15:41:19 2020 +0100 io.h: Add _sopen_dispatch and _sopen_s declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/io.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/msvcrt/io.h b/include/msvcrt/io.h index b5e84490ae..fb23a214ea 100644 --- a/include/msvcrt/io.h +++ b/include/msvcrt/io.h @@ -91,6 +91,8 @@ int __cdecl _pipe(int*,unsigned int,int); int __cdecl _read(int,void*,unsigned int); int __cdecl _setmode(int,int); int WINAPIV _sopen(const char*,int,int,...); +errno_t __cdecl _sopen_dispatch(const char*,int,int,int,int*,int); +errno_t __cdecl _sopen_s(int*,const char*,int,int,int); __msvcrt_long __cdecl _tell(int); __int64 __cdecl _telli64(int); int __cdecl _umask(int);

1 0

Jacek Caban : locale.h: Add _Strftime declaration.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: cef21392074915e9d05cfbd9ad39f292e8340e9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cef21392074915e9d05cfbd9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 19 15:41:32 2020 +0100 locale.h: Add _Strftime declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 2 -- include/msvcrt/locale.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 7b84874425..9293e0c9ac 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -55,8 +55,6 @@ unsigned int __cdecl ___lc_codepage_func(void); int __cdecl ___lc_collate_cp_func(void); const unsigned short* __cdecl __pctype_func(void); const locale_facet* __thiscall locale__Getfacet(const locale*, MSVCP_size_t); -MSVCP_size_t __cdecl _Strftime(char*, MSVCP_size_t, const char*, - const struct tm*, struct __lc_time_data*); const locale* __cdecl locale_classic(void); #if _MSVCP_VER >= 110 diff --git a/include/msvcrt/locale.h b/include/msvcrt/locale.h index c6262c2c31..120f39c2fc 100644 --- a/include/msvcrt/locale.h +++ b/include/msvcrt/locale.h @@ -56,6 +56,7 @@ struct lconv }; #endif /* _LCONV_DEFINED */ +struct tm; #ifdef __cplusplus extern "C" { @@ -63,6 +64,7 @@ extern "C" { char* __cdecl setlocale(int,const char*); struct lconv* __cdecl localeconv(void); +size_t __cdecl _Strftime(char*,size_t,const char*,const struct tm*,void*); int __cdecl _configthreadlocale(int); _locale_t __cdecl _get_current_locale(void); _locale_t __cdecl _create_locale(int, const char*);

1 0