December 2020 - Wine-commits

Zebediah Figura : vkd3d-utils: Initialize input parameters to ID3DInclude::Open().
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: vkd3d Branch: master Commit: d2f6ddba4972b8c03d2f9240876e426347901d69 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d2f6ddba4972b8c03d2f924… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 1 20:51:10 2020 -0600 vkd3d-utils: Initialize input parameters to ID3DInclude::Open(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-utils/vkd3d_utils_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 2bbedd8..9c968cc 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -129,11 +129,12 @@ static int open_include(const char *filename, bool local, const char *parent_dat struct vkd3d_shader_code *code) { ID3DInclude *iface = context; - unsigned int size; + unsigned int size = 0; if (!iface) return VKD3D_ERROR; + memset(code, 0, sizeof(*code)); if (FAILED(ID3DInclude_Open(iface, local ? D3D_INCLUDE_LOCAL : D3D_INCLUDE_SYSTEM, filename, parent_data, &code->code, &size))) return VKD3D_ERROR;

1 0

Zebediah Figura : tests: Add a test for macro invocation split across multiple files.
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: vkd3d Branch: master Commit: f4bbbb2975d056d4eb587b6e8293e8bc35ca7c26 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f4bbbb2975d056d4eb587b6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 1 20:51:11 2020 -0600 tests: Add a test for macro invocation split across multiple files. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/hlsl_d3d12.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 03a732c..4f4cc37 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -72,6 +72,14 @@ static const char test_include_file2[] = static const char test_include_file3[] = "#undef BRONTES"; +static const char test_include2_top[] = + "#define FUNC(a, b) a ## b\n" + "#include \"file4\"\n" + ",ss)"; + +static const char test_include2_file4[] = + "FUNC(pa"; + static unsigned int refcount_file1, refcount_file2, refcount_file3, include_count_file2; static HRESULT WINAPI test_include_Open(ID3DInclude *iface, D3D_INCLUDE_TYPE type, @@ -106,6 +114,13 @@ static HRESULT WINAPI test_include_Open(ID3DInclude *iface, D3D_INCLUDE_TYPE typ *size = strlen(test_include_file3); ++refcount_file3; } + else if (!strcmp(filename, "file4")) + { + ok(type == D3D_INCLUDE_LOCAL, "Got type %#x.\n", type); + ok(!parent_data, "Got parent data %p.\n", parent_data); + *code = test_include2_file4; + *size = strlen(test_include2_file4); + } else { ok(0, "Unexpected filename \"%s\".\n", filename); @@ -390,6 +405,9 @@ static void test_preprocess(void) ok(!refcount_file3, "Got %d references to file1.\n", refcount_file3); todo ok(include_count_file2 == 2, "file2 was included %u times.\n", include_count_file2); + /* Macro invocation spread across multiple files. */ + check_preprocess(test_include2_top, NULL, &test_include, "pass", NULL); + blob = errors = (ID3D10Blob *)0xdeadbeef; hr = D3DPreprocess(test_include_top, strlen(test_include_top), NULL, NULL, &test_include_fail, &blob, &errors); todo ok(hr == E_FAIL, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : vkd3d-shader: Validate "compile_info" in vkd3d_shader_preprocess().
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: vkd3d Branch: master Commit: 5065cb6c1f3298bf1cb4612de5b8643a34e00efa URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5065cb6c1f3298bf1cb4612… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 2 09:29:11 2020 -0600 vkd3d-shader: Validate "compile_info" in vkd3d_shader_preprocess(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 6289a18..1a02924 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -252,7 +252,8 @@ static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) free_shader_desc(&parser->shader_desc); } -static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_info *compile_info) +static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_info *compile_info, + bool validate_target_type) { const enum vkd3d_shader_source_type *source_types; const enum vkd3d_shader_target_type *target_types; @@ -276,16 +277,19 @@ static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_ return VKD3D_ERROR_INVALID_ARGUMENT; } - target_types = vkd3d_shader_get_supported_target_types(compile_info->source_type, &count); - for (i = 0; i < count; ++i) + if (validate_target_type) { - if (target_types[i] == compile_info->target_type) - break; - } - if (i == count) - { - WARN("Invalid shader target type %#x.\n", compile_info->target_type); - return VKD3D_ERROR_INVALID_ARGUMENT; + target_types = vkd3d_shader_get_supported_target_types(compile_info->source_type, &count); + for (i = 0; i < count; ++i) + { + if (target_types[i] == compile_info->target_type) + break; + } + if (i == count) + { + WARN("Invalid shader target type %#x.\n", compile_info->target_type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } } return VKD3D_OK; @@ -832,7 +836,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char if (messages) *messages = NULL; - if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) + if ((ret = vkd3d_shader_validate_compile_info(compile_info, true)) < 0) return ret; vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name); @@ -933,7 +937,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, if (messages) *messages = NULL; - if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) + if ((ret = vkd3d_shader_validate_compile_info(compile_info, true)) < 0) return ret; vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name); @@ -1150,10 +1154,15 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( int vkd3d_shader_preprocess(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages) { + int ret; + TRACE("compile_info %p, out %p, messages %p.\n", compile_info, out, messages); if (messages) *messages = NULL; + if ((ret = vkd3d_shader_validate_compile_info(compile_info, false)) < 0) + return ret; + return VKD3D_ERROR_NOT_IMPLEMENTED; }

1 0

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from ctype.c functions.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 176aebb0c568e75043012fb0e6d61d6862323993 URL: https://source.winehq.org/git/wine.git/?a=commit;h=176aebb0c568e75043012fb0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 1 13:52:34 2020 +0100 msvcrt: Remove MSVCRT_ prefix from ctype.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 44 ++++++------ dlls/msvcr100/msvcr100.spec | 78 +++++++++++----------- dlls/msvcr110/msvcr110.spec | 78 +++++++++++----------- dlls/msvcr120/msvcr120.spec | 82 +++++++++++------------ dlls/msvcr70/msvcr70.spec | 48 +++++++------- dlls/msvcr71/msvcr71.spec | 48 +++++++------- dlls/msvcr80/msvcr80.spec | 78 +++++++++++----------- dlls/msvcr90/msvcr90.spec | 78 +++++++++++----------- dlls/msvcrt/ctype.c | 144 ++++++++++++++++++++-------------------- dlls/msvcrt/file.c | 14 ++-- dlls/msvcrt/mbcs.c | 24 +++---- dlls/msvcrt/msvcrt.h | 10 --- dlls/msvcrt/msvcrt.spec | 76 ++++++++++----------- dlls/msvcrt/scanf.h | 2 +- dlls/msvcrt/string.c | 34 +++++----- dlls/msvcrt/time.c | 2 +- dlls/msvcrt/undname.c | 2 +- dlls/msvcrtd/msvcrtd.spec | 48 +++++++------- dlls/ucrtbase/ucrtbase.spec | 128 +++++++++++++++++------------------ include/msvcrt/corecrt_wctype.h | 1 + include/msvcrt/ctype.h | 2 + 21 files changed, 507 insertions(+), 514 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=176aebb0c568e7504301…

1 0

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from data.c functions.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 495f24ebb82af9864287f9cbc39aa4db108979d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=495f24ebb82af9864287f9cb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 1 13:52:43 2020 +0100 msvcrt: Remove MSVCRT_ prefix from data.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 30 +++++++++++++------------- dlls/msvcr110/msvcr110.spec | 30 +++++++++++++------------- dlls/msvcr120/msvcr120.spec | 30 +++++++++++++------------- dlls/msvcr70/msvcr70.spec | 26 +++++++++++------------ dlls/msvcr71/msvcr71.spec | 26 +++++++++++------------ dlls/msvcr80/msvcr80.spec | 38 ++++++++++++++++----------------- dlls/msvcr90/msvcr90.spec | 30 +++++++++++++------------- dlls/msvcrt/data.c | 38 ++++++++++++++++----------------- dlls/msvcrt/file.c | 10 ++++++--- dlls/msvcrt/msvcrt.h | 1 - dlls/msvcrt/msvcrt.spec | 38 ++++++++++++++++----------------- dlls/msvcrt/process.c | 5 +++-- dlls/msvcrtd/msvcrtd.spec | 22 +++++++++---------- dlls/ucrtbase/ucrtbase.spec | 52 ++++++++++++++++++++++----------------------- include/msvcrt/stdlib.h | 3 +++ 15 files changed, 193 insertions(+), 186 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=495f24ebb82af9864287…

1 0

Rémi Bernon : widl: Add abi_prefix parameter to format_namespace.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 13592f0cdbf6db9d99d86662ea993c0ba7c0b81c URL: https://source.winehq.org/git/wine.git/?a=commit;h=13592f0cdbf6db9d99d86662… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Dec 1 15:01:54 2020 +0100 widl: Add abi_prefix parameter to format_namespace. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 2 +- tools/widl/parser.y | 2 +- tools/widl/typetree.c | 18 +++++++++--------- tools/widl/widltypes.h | 3 ++- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 015bbe2ece7..a892243fb54 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -132,7 +132,7 @@ static void write_guid(FILE *f, const char *guid_prefix, const char *name, const static void write_uuid_decl(FILE *f, type_t *type, const UUID *uuid) { - char *name = format_namespace(type->namespace, "", "::", type->name); + char *name = format_namespace(type->namespace, "", "::", type->name, use_abi_namespace ? "ABI" : NULL); fprintf(f, "#ifdef __CRT_UUID_DECL\n"); fprintf(f, "__CRT_UUID_DECL(%s, 0x%08x, 0x%04x, 0x%04x, 0x%02x,0x%02x, 0x%02x," "0x%02x,0x%02x,0x%02x,0x%02x,0x%02x)\n", diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 160e4029a6e..1bbb2e78f7e 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1922,7 +1922,7 @@ type_t *reg_type(type_t *type, const char *name, struct namespace *namespace, in if (is_global_namespace(namespace)) type->c_name = name; else - type->c_name = format_namespace(namespace, "__x_", "_C", name); + type->c_name = format_namespace(namespace, "__x_", "_C", name, use_abi_namespace ? "ABI" : NULL); nt->type = type; nt->t = t; nt->next = namespace->type_hash[hash]; diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index c0547b36a96..df883576915 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -89,38 +89,38 @@ const char *type_get_name(const type_t *type, enum name_type name_type) return NULL; } -static char *append_namespace(char *ptr, struct namespace *namespace, const char *separator) +static char *append_namespace(char *ptr, struct namespace *namespace, const char *separator, const char *abi_prefix) { if(is_global_namespace(namespace)) { - if(!use_abi_namespace) - return ptr; - strcpy(ptr, "ABI"); + if(!abi_prefix) return ptr; + strcpy(ptr, abi_prefix); strcat(ptr, separator); return ptr + strlen(ptr); } - ptr = append_namespace(ptr, namespace->parent, separator); + ptr = append_namespace(ptr, namespace->parent, separator, abi_prefix); strcpy(ptr, namespace->name); strcat(ptr, separator); return ptr + strlen(ptr); } -char *format_namespace(struct namespace *namespace, const char *prefix, const char *separator, const char *suffix) +char *format_namespace(struct namespace *namespace, const char *prefix, const char *separator, const char *suffix, + const char *abi_prefix) { unsigned len = strlen(prefix) + strlen(suffix); unsigned sep_len = strlen(separator); struct namespace *iter; char *ret, *ptr; - if(use_abi_namespace && !is_global_namespace(namespace)) - len += 3 /* strlen("ABI") */ + sep_len; + if(abi_prefix) + len += strlen(abi_prefix) + sep_len; for(iter = namespace; !is_global_namespace(iter); iter = iter->parent) len += strlen(iter->name) + sep_len; ret = xmalloc(len+1); strcpy(ret, prefix); - ptr = append_namespace(ret + strlen(ret), namespace, separator); + ptr = append_namespace(ret + strlen(ret), namespace, separator, abi_prefix); strcpy(ptr, suffix); return ret; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index b02b80e122c..7a43e517698 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -613,7 +613,8 @@ var_list_t *append_var(var_list_t *list, var_t *var); void init_loc_info(loc_info_t *); -char *format_namespace(struct namespace *namespace, const char *prefix, const char *separator, const char *suffix); +char *format_namespace(struct namespace *namespace, const char *prefix, const char *separator, const char *suffix, + const char *abi_prefix); static inline enum type_type type_get_type_detect_alias(const type_t *type) {

1 0

Rémi Bernon : widl: Support WinRT contractversion attribute parsing.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 19b5f3e060808a5d356f2fc887e100da320fa73c URL: https://source.winehq.org/git/wine.git/?a=commit;h=19b5f3e060808a5d356f2fc8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Dec 1 15:01:55 2020 +0100 widl: Support WinRT contractversion attribute parsing. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 1 + tools/widl/parser.y | 12 +++++++++++- tools/widl/widltypes.h | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index d7d96702322..a4e1d0d2c47 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -338,6 +338,7 @@ static const struct keyword attr_keywords[] = {"context_handle", tCONTEXTHANDLE, 0}, {"context_handle_noserialize", tCONTEXTHANDLENOSERIALIZE, 0}, {"context_handle_serialize", tCONTEXTHANDLENOSERIALIZE, 0}, + {"contractversion", tCONTRACTVERSION, 1}, {"control", tCONTROL, 0}, {"custom", tCUSTOM, 0}, {"decode", tDECODE, 0}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 1bbb2e78f7e..3c4c8041a1c 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -177,7 +177,9 @@ static typelib_t *current_typelib; %token tAUTOHANDLE tBINDABLE tBOOLEAN tBROADCAST tBYTE tBYTECOUNT %token tCALLAS tCALLBACK tCASE tCDECL tCHAR tCOCLASS tCODE tCOMMSTATUS %token tCONST tCONTEXTHANDLE tCONTEXTHANDLENOSERIALIZE -%token tCONTEXTHANDLESERIALIZE tCONTROL tCPPQUOTE +%token tCONTEXTHANDLESERIALIZE +%token tCONTRACTVERSION +%token tCONTROL tCPPQUOTE %token tCUSTOM %token tDECODE tDEFAULT tDEFAULTBIND %token tDEFAULTCOLLELEM @@ -290,6 +292,7 @@ static typelib_t *current_typelib; %type <declarator> m_abstract_declarator abstract_declarator abstract_declarator_no_direct abstract_direct_declarator %type <declarator_list> declarator_list struct_declarator_list %type <type> coclass coclasshdr coclassdef +%type <num> contract_ver %type <num> pointer_type threading_type version %type <str> libraryhdr callconv cppquote importlib import t_ident %type <uuid> uuid_string @@ -492,6 +495,11 @@ str_list: aSTRING { $$ = append_str( NULL, $1 ); } | str_list ',' aSTRING { $$ = append_str( $1, $3 ); } ; +contract_ver: + aNUM { $$ = MAKEVERSION(0, $1); } + | aNUM '.' aNUM { $$ = MAKEVERSION($3, $1); } + ; + attribute: { $$ = NULL; } | tAGGREGATABLE { $$ = make_attr(ATTR_AGGREGATABLE); } | tANNOTATION '(' aSTRING ')' { $$ = make_attrp(ATTR_ANNOTATION, $3); } @@ -507,6 +515,7 @@ attribute: { $$ = NULL; } | tCONTEXTHANDLE { $$ = make_attrv(ATTR_CONTEXTHANDLE, 0); } | tCONTEXTHANDLENOSERIALIZE { $$ = make_attrv(ATTR_CONTEXTHANDLE, 0); /* RPC_CONTEXT_HANDLE_DONT_SERIALIZE */ } | tCONTEXTHANDLESERIALIZE { $$ = make_attrv(ATTR_CONTEXTHANDLE, 0); /* RPC_CONTEXT_HANDLE_SERIALIZE */ } + | tCONTRACTVERSION '(' contract_ver ')' { $$ = make_attrv(ATTR_CONTRACTVERSION, $3); } | tCONTROL { $$ = make_attr(ATTR_CONTROL); } | tCUSTOM '(' uuid_string ',' expr_const ')' { $$ = make_custom_attr($3, $5); } | tDECODE { $$ = make_attr(ATTR_DECODE); } @@ -2155,6 +2164,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_CODE */ { 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "code" }, /* ATTR_COMMSTATUS */ { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "comm_status" }, /* ATTR_CONTEXTHANDLE */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "context_handle" }, + /* ATTR_CONTRACTVERSION */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "contractversion" }, /* ATTR_CONTROL */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, "control" }, /* ATTR_CUSTOM */ { 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, "custom" }, /* ATTR_DECODE */ { 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "decode" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 7a43e517698..78401cf8278 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -84,6 +84,7 @@ enum attr_type ATTR_CODE, ATTR_COMMSTATUS, ATTR_CONTEXTHANDLE, + ATTR_CONTRACTVERSION, ATTR_CONTROL, ATTR_CUSTOM, ATTR_DECODE,

1 0

Rémi Bernon : widl: Support WinRT apicontract type.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: ee490ee26c40ce7556e8ed7d1ad20fb22f88f9a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee490ee26c40ce7556e8ed7d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Dec 1 15:01:56 2020 +0100 widl: Support WinRT apicontract type. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/windows.foundation.idl | 1 + include/windowscontracts.idl | 33 ++++++ tools/widl/expr.c | 1 + tools/widl/header.c | 27 +++++ tools/widl/parser.l | 1 + tools/widl/parser.y | 239 +++++++++++++++++++++++------------------ tools/widl/typegen.c | 6 ++ tools/widl/typelib.c | 3 +- tools/widl/typetree.h | 3 + tools/widl/widltypes.h | 1 + 11 files changed, 211 insertions(+), 105 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ee490ee26c40ce7556e8…

1 0

Rémi Bernon : widl: Support WinRT contract attribute.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 54035a2101e66fbadc011d82304f4999155c32ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=54035a2101e66fbadc011d82… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Dec 1 15:01:57 2020 +0100 widl: Support WinRT contract attribute. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.foundation.idl | 14 ++++---- tools/widl/header.c | 72 ++++++++++++++++++++++++++++++++++++++++-- tools/widl/parser.l | 1 + tools/widl/parser.y | 10 ++++++ tools/widl/widltypes.h | 1 + 5 files changed, 88 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54035a2101e66fbadc01…

1 0

Jacek Caban : cmd: Don't use WCMD_is_console_handle.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 2ecb8713109225db8e009bbf08e16716365c05e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ecb8713109225db8e009bbf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 1 17:25:25 2020 +0100 cmd: Don't use WCMD_is_console_handle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/batch.c | 5 ++--- programs/cmd/wcmd.h | 4 ---- programs/cmd/wcmdmain.c | 5 ++--- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 37cdff42188..2ff8e3ba9be 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -249,7 +249,7 @@ WCHAR *WCMD_fgets(WCHAR *buf, DWORD noChars, HANDLE h) /* We can't use the native f* functions because of the filename syntax differences between DOS and Unix. Also need to lose the LF (or CRLF) from the line. */ - if (!WCMD_is_console_handle(h)) { + if (!ReadConsoleW(h, buf, noChars, &charsRead, NULL)) { LARGE_INTEGER filepos; char *bufA; UINT cp; @@ -282,8 +282,7 @@ WCHAR *WCMD_fgets(WCHAR *buf, DWORD noChars, HANDLE h) heap_free(bufA); } else { - status = WCMD_ReadFile(h, buf, noChars, &charsRead); - if (!status || charsRead == 0) return NULL; + if (!charsRead) return NULL; /* Find first EOL */ for (i = 0; i < charsRead; i++) { diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 65a89ac26d7..468a29102d7 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -105,10 +105,6 @@ void WCMD_version (void); int WCMD_volume (BOOL set_label, const WCHAR *args); void WCMD_mklink(WCHAR *args); -static inline BOOL WCMD_is_console_handle(HANDLE h) -{ - return (((DWORD_PTR)h) & 3) == 3; -} WCHAR *WCMD_fgets (WCHAR *buf, DWORD n, HANDLE stream); WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, BOOL raw, BOOL wholecmdline); WCHAR *WCMD_parameter_with_delims (WCHAR *s, int n, WCHAR **start, BOOL raw, diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index cacb7ea7751..fbe8475d8a9 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -221,9 +221,8 @@ BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, LPDWO DWORD numRead; char *buffer; - if (WCMD_is_console_handle(hIn)) - /* Try to read from console as Unicode */ - return ReadConsoleW(hIn, intoBuf, maxChars, charsRead, NULL); + /* Try to read from console as Unicode */ + if (ReadConsoleW(hIn, intoBuf, maxChars, charsRead, NULL)) return TRUE; /* We assume it's a file handle and read then convert from assumed OEM codepage */ if (!(buffer = get_file_buffer()))

1 0