November 2019 - Wine-Commits

Alexandre Julliard : ntdll: Initialize FPU context on ARM64.
by Alexandre Julliard Nov. 4, 2019

Nov. 4, 2019

Module: wine Branch: master Commit: 6a0e0001ef9583f06266e4f611aaa0dc2e4c2b04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a0e0001ef9583f06266e4f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 4 09:45:21 2019 +0100 ntdll: Initialize FPU context on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 96b20d8ff6..687219ec40 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1974,6 +1974,26 @@ __ASM_GLOBAL_FUNC( start_thread, "bl " __ASM_NAME("virtual_clear_thread_stack") "\n\t" /* switch to the initial context */ "mov x0, sp\n\t" + "ldp q0, q1, [x0, #0x110]\n\t" /* context->V[0,1] */ + "ldp q2, q3, [x0, #0x130]\n\t" /* context->V[2,3] */ + "ldp q4, q5, [x0, #0x150]\n\t" /* context->V[4,5] */ + "ldp q6, q7, [x0, #0x170]\n\t" /* context->V[6,7] */ + "ldp q8, q9, [x0, #0x190]\n\t" /* context->V[8,9] */ + "ldp q10, q11, [x0, #0x1b0]\n\t" /* context->V[10,11] */ + "ldp q12, q13, [x0, #0x1d0]\n\t" /* context->V[12,13] */ + "ldp q14, q15, [x0, #0x1f0]\n\t" /* context->V[14,15] */ + "ldp q16, q17, [x0, #0x210]\n\t" /* context->V[16,17] */ + "ldp q18, q19, [x0, #0x230]\n\t" /* context->V[18,19] */ + "ldp q20, q21, [x0, #0x250]\n\t" /* context->V[20,21] */ + "ldp q22, q23, [x0, #0x270]\n\t" /* context->V[22,23] */ + "ldp q24, q25, [x0, #0x290]\n\t" /* context->V[24,25] */ + "ldp q26, q27, [x0, #0x2b0]\n\t" /* context->V[26,27] */ + "ldp q28, q29, [x0, #0x2d0]\n\t" /* context->V[28,29] */ + "ldp q30, q31, [x0, #0x2f0]\n\t" /* context->V[30,31] */ + "ldr w1, [x0, #0x310]\n\t" /* context->Fpcr */ + "msr fpcr, x1\n\t" + "ldr w1, [x0, #0x314]\n\t" /* context->Fpsr */ + "msr fpsr, x1\n\t" "ldp x1, x2, [x0, #0x10]\n\t" /* context->X1,2 */ "ldp x3, x4, [x0, #0x20]\n\t" /* context->X3,4 */ "ldp x5, x6, [x0, #0x30]\n\t" /* context->X5,6 */

1 0

Alexandre Julliard : server: Clarify naming of ARM64 floating-point registers.
by Alexandre Julliard Nov. 4, 2019

Nov. 4, 2019

Module: wine Branch: master Commit: 85f1fbdb7eb02069319dd67a4615871f5abb9bbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=85f1fbdb7eb02069319dd67a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 4 09:45:04 2019 +0100 server: Clarify naming of ARM64 floating-point registers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 12 ++++++++++-- include/wine/server_protocol.h | 2 +- server/protocol.def | 2 +- server/trace.c | 8 +++++--- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 17af494e29..96b20d8ff6 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -369,7 +369,11 @@ NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) if (flags & CONTEXT_FLOATING_POINT) { to->flags |= SERVER_CTX_FLOATING_POINT; - for (i = 0; i < 64; i++) to->fp.arm64_regs.d[i] = from->V[i / 2].D[i % 2]; + for (i = 0; i < 32; i++) + { + to->fp.arm64_regs.q[i].low = from->V[i].s.Low; + to->fp.arm64_regs.q[i].high = from->V[i].s.High; + } to->fp.arm64_regs.fpcr = from->Fpcr; to->fp.arm64_regs.fpsr = from->Fpsr; } @@ -414,7 +418,11 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) if (from->flags & SERVER_CTX_FLOATING_POINT) { to->ContextFlags |= CONTEXT_FLOATING_POINT; - for (i = 0; i < 64; i++) to->V[i / 2].D[i % 2] = from->fp.arm64_regs.d[i]; + for (i = 0; i < 32; i++) + { + to->V[i].s.Low = from->fp.arm64_regs.q[i].low; + to->V[i].s.High = from->fp.arm64_regs.q[i].high; + } to->Fpcr = from->fp.arm64_regs.fpcr; to->Fpsr = from->fp.arm64_regs.fpsr; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 4f35047241..83ce56ca25 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -156,7 +156,7 @@ typedef struct struct { struct { unsigned __int64 low, high; } fpregs[32]; } x86_64_regs; struct { double fpr[32], fpscr; } powerpc_regs; struct { unsigned __int64 d[32]; unsigned int fpscr; } arm_regs; - struct { unsigned __int64 d[64]; unsigned int fpcr, fpsr; } arm64_regs; + struct { struct { unsigned __int64 low, high; } q[32]; unsigned int fpcr, fpsr; } arm64_regs; } fp; union { diff --git a/server/protocol.def b/server/protocol.def index 6af0ae0cff..984f2a10fd 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -172,7 +172,7 @@ typedef struct struct { struct { unsigned __int64 low, high; } fpregs[32]; } x86_64_regs; struct { double fpr[32], fpscr; } powerpc_regs; struct { unsigned __int64 d[32]; unsigned int fpscr; } arm_regs; - struct { unsigned __int64 d[64]; unsigned int fpcr, fpsr; } arm64_regs; + struct { struct { unsigned __int64 low, high; } q[32]; unsigned int fpcr, fpsr; } arm64_regs; } fp; /* selected by SERVER_CTX_FLOATING_POINT */ union { diff --git a/server/trace.c b/server/trace.c index 615542cff5..0acfc92b27 100644 --- a/server/trace.c +++ b/server/trace.c @@ -727,10 +727,11 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) } if (ctx.flags & SERVER_CTX_FLOATING_POINT) { - for (i = 0; i < 64; i++) + for (i = 0; i < 32; i++) { - fprintf( stderr, ",d%u=", i ); - dump_uint64( "", &ctx.fp.arm64_regs.d[i] ); + fprintf( stderr, ",q%u=", i ); + dump_uint64( "", &ctx.fp.arm64_regs.q[i].high ); + dump_uint64( "", &ctx.fp.arm64_regs.q[i].low ); } fprintf( stderr, ",fpcr=%08x,fpsr=%08x", ctx.fp.arm64_regs.fpcr, ctx.fp.arm64_regs.fpsr ); } @@ -5602,6 +5603,7 @@ static const struct { "PIPE_CLOSING", STATUS_PIPE_CLOSING }, { "PIPE_CONNECTED", STATUS_PIPE_CONNECTED }, { "PIPE_DISCONNECTED", STATUS_PIPE_DISCONNECTED }, + { "PIPE_EMPTY", STATUS_PIPE_EMPTY }, { "PIPE_LISTENING", STATUS_PIPE_LISTENING }, { "PIPE_NOT_AVAILABLE", STATUS_PIPE_NOT_AVAILABLE }, { "PRIVILEGE_NOT_HELD", STATUS_PRIVILEGE_NOT_HELD },

1 0

Alexandre Julliard : makefiles: Pass --nostdinc also to widl.
by Alexandre Julliard Nov. 4, 2019

Nov. 4, 2019

Module: wine Branch: master Commit: 42cf6cce4bfdb1f4eb0b9b1b086310204a3bbb3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=42cf6cce4bfdb1f4eb0b9b1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 2 13:47:32 2019 +0100 makefiles: Pass --nostdinc also to widl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/makedep.c b/tools/makedep.c index 67dfea43bb..13c2bd2342 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2786,6 +2786,7 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, output( ": %s\n", tools_path( make, "widl" )); output( "\t%s -o $@", tools_path( make, "widl" ) ); output_filenames( target_flags ); + output_filename( "--nostdinc" ); output_filenames( defines ); output_filenames( get_expanded_make_var_array( make, "EXTRAIDLFLAGS" )); output_filenames( get_expanded_file_local_var( make, obj, "EXTRAIDLFLAGS" ));

1 0

Alexandre Julliard : ntdll: Initialize MxCsr for new threads on x86.
by Alexandre Julliard Nov. 4, 2019

Nov. 4, 2019

Module: wine Branch: master Commit: 1b3fa021909fcb13d1517a8df0b84b6a225e6b98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b3fa021909fcb13d1517a8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 2 14:34:17 2019 +0100 ntdll: Initialize MxCsr for new threads on x86. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index fd761246c5..e9dd0de2fc 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2716,6 +2716,7 @@ static void init_thread_context( CONTEXT *context, LPTHREAD_START_ROUTINE entry, context->Eip = (DWORD)relay; context->FloatSave.ControlWord = 0x27f; ((XMM_SAVE_AREA32 *)context->ExtendedRegisters)->ControlWord = 0x27f; + ((XMM_SAVE_AREA32 *)context->ExtendedRegisters)->MxCsr = 0x1f80; } @@ -2741,7 +2742,7 @@ PCONTEXT DECLSPEC_HIDDEN attach_thread( LPTHREAD_START_ROUTINE entry, void *arg, ctx = (CONTEXT *)((char *)NtCurrentTeb()->Tib.StackBase - 16) - 1; init_thread_context( ctx, entry, arg, relay ); } - ctx->ContextFlags = CONTEXT_FULL; + ctx->ContextFlags = CONTEXT_FULL | CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS; LdrInitializeThunk( ctx, (void **)&ctx->Eax, 0, 0 ); return ctx; }

1 0

Piotr Caban : msvcrt: Enable printf %z, %t and %j formats.
by Alexandre Julliard Nov. 4, 2019

Nov. 4, 2019

Module: wine Branch: master Commit: 97557ae168109492e73b5d47b005a3e6c466a954 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97557ae168109492e73b5d47… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Nov 2 14:39:28 2019 +0100 msvcrt: Enable printf %z, %t and %j formats. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 10 ++++++---- dlls/msvcrt/tests/printf.c | 11 ++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 20bd77e792..d7f3b6f225 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -515,15 +515,17 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API break; } else if(*p == 'w') flags.WideString = *p++; -#if _MSVCR_VER >= 140 - else if(*p == 'z' || *p == 't') +#if _MSVCR_VER == 0 || _MSVCR_VER >= 140 + else if((*p == 'z' || *p == 't') && p[1] && strchr("diouxX", p[1])) flags.IntegerNative = *p++; - else if(*p == 'T') - flags.NaturalString = *p++; else if(*p == 'j') { flags.IntegerDouble++; p++; } +#endif +#if _MSVCR_VER >= 140 + else if(*p == 'T') + flags.NaturalString = *p++; #endif else if((*p == 'F' || *p == 'N') && legacy_msvcrt_compat) p++; /* ignore */ diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index d1fe292143..4c153dab9e 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -163,8 +163,10 @@ static void test_sprintf( void ) { "%Ihd", "Ihd", 0, INT_ARG, 1 }, { "%I0d", "I0d", 0, INT_ARG, 1 }, { "%I64D", "D", 0, ULONGLONG_ARG, 0, -1 }, - { "%zx", "1", "zx", TODO_FLAG | INT_ARG, 1 }, - { "%z", "1", "z", TODO_FLAG | INT_ARG, 1 }, + { "%zx", "1", "zx", INT_ARG, 1 }, + { "%z", "z", 0, INT_ARG, 1 }, + { "%tx", "1", "tx", INT_ARG, 1 }, + { "%t", "t", 0, INT_ARG, 1 }, { "% d", " 1", 0, INT_ARG, 1 }, { "%+ d", "+1", 0, INT_ARG, 1 }, { "%S", "wide", 0, PTR_ARG, 0, 0, 0, L"wide" }, @@ -216,9 +218,8 @@ static void test_sprintf( void ) { "%u", "4294967295", 0, INT_ARG, -1 }, { "%w", "", 0, INT_ARG, -1 }, { "%h", "", 0, INT_ARG, -1 }, - { "%z", "z", 0, INT_ARG, -1 }, - { "%j", "", "j", TODO_FLAG | ULONGLONG_ARG, 0, -1 }, - { "%jd", "-1", "jd", TODO_FLAG | ULONGLONG_ARG, 0, -1 }, + { "%j", "", "j", ULONGLONG_ARG, 0, -1 }, + { "%jd", "-1", "jd", ULONGLONG_ARG, 0, -1 }, { "%F", "", 0, INT_ARG, -1 }, { "%N", "", 0, INT_ARG, -1 }, { "%H", "H", 0, INT_ARG, -1 },

1 0

Nikolay Sivov : comsvcs/tests: Rename test file.
by Alexandre Julliard Nov. 4, 2019

Nov. 4, 2019

Module: wine Branch: master Commit: a3bf974aeeac21f205f99555a08d98ad3770479e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3bf974aeeac21f205f99555… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 3 22:30:55 2019 +0300 comsvcs/tests: Rename test file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/tests/Makefile.in | 2 +- dlls/comsvcs/tests/{dispenser.c => comsvcs.c} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comsvcs/tests/Makefile.in b/dlls/comsvcs/tests/Makefile.in index 9a7047ebaf..86da9fda66 100644 --- a/dlls/comsvcs/tests/Makefile.in +++ b/dlls/comsvcs/tests/Makefile.in @@ -2,4 +2,4 @@ TESTDLL = comsvcs.dll IMPORTS = uuid oleaut32 ole32 C_SRCS = \ - dispenser.c + comsvcs.c diff --git a/dlls/comsvcs/tests/dispenser.c b/dlls/comsvcs/tests/comsvcs.c similarity index 99% rename from dlls/comsvcs/tests/dispenser.c rename to dlls/comsvcs/tests/comsvcs.c index 10bce8e849..77d3224366 100644 --- a/dlls/comsvcs/tests/dispenser.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -268,7 +268,7 @@ static void create_dispenser(void) } -START_TEST(dispenser) +START_TEST(comsvcs) { HRESULT hr;

1 0

Alexandre Julliard : widl: Add strmake() helper.
by Alexandre Julliard Nov. 4, 2019

Nov. 4, 2019

Module: wine Branch: master Commit: 264d8884d5d3c6ee4cfd5df5650293d841364166 URL: https://source.winehq.org/git/wine.git/?a=commit;h=264d8884d5d3c6ee4cfd5df5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 2 13:34:01 2019 +0100 widl: Add strmake() helper. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 24 ++++-------------------- tools/widl/register.c | 3 +-- tools/widl/utils.c | 19 +++++++++++++++++++ tools/widl/utils.h | 1 + 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 59875a5b16..5f6eb50878 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2038,11 +2038,8 @@ var_t *find_const(const char *name, int f) char *gen_name(void) { - static const char format[] = "__WIDL_%s_generated_name_%08lX"; static unsigned long n = 0; static const char *file_id; - static size_t size; - char *name; if (! file_id) { @@ -2052,13 +2049,8 @@ char *gen_name(void) for (; *dst; ++dst) if (! isalnum((unsigned char) *dst)) *dst = '_'; - - size = sizeof format - 7 + strlen(file_id) + 8; } - - name = xmalloc(size); - sprintf(name, format, file_id, n++); - return name; + return strmake("__WIDL_%s_generated_name_%08lX", file_id, n++); } struct allowed_attr @@ -2727,14 +2719,6 @@ static void check_functions(const type_t *iface, int is_inside_library) } } -static char *concat_str(const char *prefix, const char *str) -{ - char *ret = xmalloc(strlen(prefix) + strlen(str) + 1); - strcpy(ret, prefix); - strcat(ret, str); - return ret; -} - static int async_iface_attrs(attr_list_t *attrs, const attr_t *attr) { switch(attr->type) @@ -2774,7 +2758,7 @@ static void check_async_uuid(type_t *iface) if (!inherit) error_loc("async_uuid applied to an interface with incompatible parent\n"); - async_iface = get_type(TYPE_INTERFACE, concat_str("Async", iface->name), iface->namespace, 0); + async_iface = get_type(TYPE_INTERFACE, strmake("Async%s", iface->name), iface->namespace, 0); async_iface->attrs = map_attrs(iface->attrs, async_iface_attrs); STATEMENTS_FOR_EACH_FUNC( stmt, type_iface_get_stmts(iface) ) @@ -2791,13 +2775,13 @@ static void check_async_uuid(type_t *iface) finish_args = append_var(finish_args, copy_var(arg, strdup(arg->name), arg_out_attrs)); } - begin_func = copy_var(func, concat_str("Begin_", func->name), NULL); + begin_func = copy_var(func, strmake("Begin_%s", func->name), NULL); begin_func->declspec.type = type_new_function(begin_args); begin_func->declspec.type->attrs = func->attrs; begin_func->declspec.type->details.function->retval = func->declspec.type->details.function->retval; stmts = append_statement(stmts, make_statement_declaration(begin_func)); - finish_func = copy_var(func, concat_str("Finish_", func->name), NULL); + finish_func = copy_var(func, strmake("Finish_%s", func->name), NULL); finish_func->declspec.type = type_new_function(finish_args); finish_func->declspec.type->attrs = func->attrs; finish_func->declspec.type->details.function->retval = func->declspec.type->details.function->retval; diff --git a/tools/widl/register.c b/tools/widl/register.c index 1c369e7c5e..f65cbddf53 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -321,8 +321,7 @@ void output_typelib_regscript( const typelib_t *typelib ) if (expr) { sprintf(id_part, "\\%d", expr->cval); - resname = xmalloc( strlen(typelib_name) + 20 ); - sprintf(resname, "%s\\%d", typelib_name, expr->cval); + resname = strmake("%s\\%d", typelib_name, expr->cval); } put_str( indent, "'%x' { %s = s '%%MODULE%%%s' }\n", lcid_expr ? lcid_expr->cval : 0, pointer_size == 8 ? "win64" : "win32", id_part ); diff --git a/tools/widl/utils.c b/tools/widl/utils.c index 20c63064c7..ea92372c8c 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -226,6 +226,25 @@ void *xrealloc(void *p, size_t size) return res; } +char *strmake( const char* fmt, ... ) +{ + int n; + size_t size = 100; + va_list ap; + + for (;;) + { + char *p = xmalloc( size ); + va_start( ap, fmt ); + n = vsnprintf( p, size, fmt, ap ); + va_end( ap ); + if (n == -1) size *= 2; + else if ((size_t)n >= size) size = n + 1; + else return p; + free( p ); + } +} + char *xstrdup(const char *str) { char *s; diff --git a/tools/widl/utils.h b/tools/widl/utils.h index 74dba11d3c..3740665650 100644 --- a/tools/widl/utils.h +++ b/tools/widl/utils.h @@ -44,6 +44,7 @@ void error_loc_info(const loc_info_t *, const char *s, ...) __attribute__((forma void warning(const char *s, ...) __attribute__((format (printf, 1, 2))); void warning_loc_info(const loc_info_t *, const char *s, ...) __attribute__((format (printf, 2, 3))); void chat(const char *s, ...) __attribute__((format (printf, 1, 2))); +char *strmake(const char* fmt, ...) __attribute__((__format__ (__printf__, 1, 2 ))); char *dup_basename(const char *name, const char *ext); size_t widl_getline(char **linep, size_t *lenp, FILE *fp);

1 0

Alexandre Julliard : widl: Add --sysroot and --nostdinc options.
by Alexandre Julliard Nov. 4, 2019

Nov. 4, 2019

Module: wine Branch: master Commit: 5f39d36a6c134bab77cea8f2e91c313e066eeffe URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f39d36a6c134bab77cea8f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 2 13:34:27 2019 +0100 widl: Add --sysroot and --nostdinc options. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/Makefile.in | 2 +- tools/widl/widl.c | 34 ++++++++++++++++++++++++++++------ tools/widl/widl.man.in | 5 +++++ 3 files changed, 34 insertions(+), 7 deletions(-) diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index e06d6cc5b3..80a12601de 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -19,7 +19,7 @@ C_SRCS = \ LEX_SRCS = parser.l BISON_SRCS = parser.y -widl_EXTRADEFS = -DDEFAULT_INCLUDE_DIR=\"${includedir}/wine/windows/\" +widl_EXTRADEFS = -DINCLUDEDIR=\"${includedir}\" EXTRALIBS = -lwpp diff --git a/tools/widl/widl.c b/tools/widl/widl.c index f5fa20c884..aa6697135b 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -60,6 +60,8 @@ static const char usage[] = " --local-stubs=file Write empty stubs for call_as/local methods to file\n" " -m32, -m64 Set the target architecture (Win32 or Win64)\n" " -N Do not preprocess input\n" +" --nostdinc Do not search the standard include path\n" +" --ns_prefix Prefix namespaces with ABI namespace\n" " --oldnames Use old naming conventions\n" " -o, --output=NAME Set the output file name\n" " -Otype Type of stubs to generate (-Os, -Oi, -Oif)\n" @@ -69,8 +71,7 @@ static const char usage[] = " --prefix-server=p Prefix names of server functions with 'p'\n" " -r Generate registration script\n" " -robust Ignored, present for midl compatibility\n" -" --winrt Enable Windows Runtime mode\n" -" --ns_prefix Prefix namespaces with ABI namespace\n" +" --sysroot=DIR Prefix include paths with DIR\n" " -s Generate server stub\n" " -t Generate typelib\n" " -u Generate interface identifiers file\n" @@ -79,6 +80,7 @@ static const char usage[] = " --win32, --win64 Set the target architecture (Win32 or Win64)\n" " --win32-align n Set win32 structure alignment to 'n'\n" " --win64-align n Set win64 structure alignment to 'n'\n" +" --winrt Enable Windows Runtime mode\n" "Debug level 'n' is a bitmask with following meaning:\n" " * 0x01 Tell which resource is parsed (verbose mode)\n" " * 0x02 Dump internal structures\n" @@ -125,6 +127,7 @@ int win32_packing = 8; int win64_packing = 8; int winrt_mode = 0; int use_abi_namespace = 0; +static int stdinc = 1; static enum stub_mode stub_mode = MODE_Os; char *input_name; @@ -163,6 +166,7 @@ enum { DLLDATA_OPTION, DLLDATA_ONLY_OPTION, LOCAL_STUBS_OPTION, + NOSTDINC_OPTION, PREFIX_ALL_OPTION, PREFIX_CLIENT_OPTION, PREFIX_SERVER_OPTION, @@ -170,6 +174,7 @@ enum { RT_NS_PREFIX, RT_OPTION, ROBUST_OPTION, + SYSROOT_OPTION, WIN32_OPTION, WIN64_OPTION, WIN32_ALIGN_OPTION, @@ -185,6 +190,7 @@ static const struct option long_options[] = { { "dlldata-only", 0, NULL, DLLDATA_ONLY_OPTION }, { "help", 0, NULL, PRINT_HELP }, { "local-stubs", 1, NULL, LOCAL_STUBS_OPTION }, + { "nostdinc", 0, NULL, NOSTDINC_OPTION }, { "ns_prefix", 0, NULL, RT_NS_PREFIX }, { "oldnames", 0, NULL, OLDNAMES_OPTION }, { "output", 0, NULL, 'o' }, @@ -192,6 +198,7 @@ static const struct option long_options[] = { { "prefix-client", 1, NULL, PREFIX_CLIENT_OPTION }, { "prefix-server", 1, NULL, PREFIX_SERVER_OPTION }, { "robust", 0, NULL, ROBUST_OPTION }, + { "sysroot", 1, NULL, SYSROOT_OPTION }, { "target", 0, NULL, 'b' }, { "winrt", 0, NULL, RT_OPTION }, { "win32", 0, NULL, WIN32_OPTION }, @@ -567,10 +574,11 @@ void write_id_data(const statement_list_t *stmts) int main(int argc,char *argv[]) { - int optc; + int i, optc; int ret = 0; int opti = 0; char *output_name = NULL; + const char *sysroot = ""; signal( SIGTERM, exit_on_signal ); signal( SIGINT, exit_on_signal ); @@ -593,6 +601,9 @@ int main(int argc,char *argv[]) do_everything = 0; local_stubs_name = xstrdup(optarg); break; + case NOSTDINC_OPTION: + stdinc = 0; + break; case OLDNAMES_OPTION: old_names = 1; break; @@ -615,6 +626,9 @@ int main(int argc,char *argv[]) case RT_NS_PREFIX: use_abi_namespace = 1; break; + case SYSROOT_OPTION: + sysroot = xstrdup(optarg); + break; case WIN32_OPTION: pointer_size = 4; break; @@ -733,9 +747,17 @@ int main(int argc,char *argv[]) } } -#ifdef DEFAULT_INCLUDE_DIR - wpp_add_include_path(DEFAULT_INCLUDE_DIR); -#endif + if (stdinc) + { + static const char *incl_dirs[] = { INCLUDEDIR, "/usr/include", "/usr/local/include" }; + + for (i = 0; i < ARRAY_SIZE(incl_dirs); i++) + { + if (i && !strcmp( incl_dirs[i], incl_dirs[0] )) continue; + wpp_add_include_path( strmake( "%s%s/wine/msvcrt", sysroot, incl_dirs[i] )); + wpp_add_include_path( strmake( "%s%s/wine/windows", sysroot, incl_dirs[i] )); + } + } switch (target_cpu) { diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index ec81488a0e..010b7f04e2 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -41,6 +41,11 @@ specification is in the standard autoconf format as returned by \fBconfig.sub\fR. .IP "\fB-m32, -m64, --win32, --win64\fR" Force the target architecture to 32-bit or 64-bit. +.IP \fB\-\-sysroot=\fIdir\fR +Prefix the standard include paths with \fIdir\fR. +.IP \fB\-\-nostdinc\fR +Do not search standard include paths like /usr/include and +/usr/local/include. .PP .B Header options: .IP "\fB-h\fR"

1 0

Alexandre Julliard : ntdll: Fix FPU initialization for new threads on x86-64.
by Alexandre Julliard Nov. 4, 2019

Nov. 4, 2019

Module: wine Branch: master Commit: 0b2e65f53aeb4fbda660828ad06bff554fccb1d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b2e65f53aeb4fbda660828a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 2 14:34:25 2019 +0100 ntdll: Fix FPU initialization for new threads on x86-64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48019 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 9645c5266c..c372f65b34 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -4195,12 +4195,13 @@ static void init_thread_context( CONTEXT *context, LPTHREAD_START_ROUTINE entry, { __asm__( "movw %%cs,%0" : "=m" (context->SegCs) ); __asm__( "movw %%ss,%0" : "=m" (context->SegSs) ); - __asm__( "fxsave %0" : "=m" (context->u.FltSave) ); context->Rcx = (ULONG_PTR)entry; context->Rdx = (ULONG_PTR)arg; context->Rsp = (ULONG_PTR)NtCurrentTeb()->Tib.StackBase - 0x28; context->Rip = (ULONG_PTR)relay; context->EFlags = 0x200; + context->u.FltSave.ControlWord = 0x27f; + context->u.FltSave.MxCsr = context->MxCsr = 0x1f80; }

1 0

Nikolay Sivov : comsvcs: Implement display name parsing for "new" moniker.
by Alexandre Julliard Nov. 4, 2019

Nov. 4, 2019

Module: wine Branch: master Commit: 51d90cb843266d4efbbb5337c58445b0d7cbb3a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51d90cb843266d4efbbb5337… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 3 22:30:57 2019 +0300 comsvcs: Implement display name parsing for "new" moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/main.c | 132 +++++++++++++++++++++++++++++++++++++------ dlls/comsvcs/tests/comsvcs.c | 9 ++- 2 files changed, 123 insertions(+), 18 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index ae09094d30..101af6f071 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -57,6 +57,8 @@ struct new_moniker LONG refcount; }; +static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG *eaten, IMoniker **ret); + static inline dispensermanager *impl_from_IDispenserManager(IDispenserManager *iface) { return CONTAINING_RECORD(iface, dispensermanager, IDispenserManager_iface); @@ -607,9 +609,9 @@ static HRESULT WINAPI new_moniker_GetDisplayName(IMoniker *iface, IBindCtx *pbc, static HRESULT WINAPI new_moniker_ParseDisplayName(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR name, ULONG *eaten, IMoniker **ret) { - FIXME("%p, %p, %p, %s, %p, %p.\n", iface, pbc, pmkToLeft, debugstr_w(name), eaten, ret); + TRACE("%p, %p, %p, %s, %p, %p.\n", iface, pbc, pmkToLeft, debugstr_w(name), eaten, ret); - return E_NOTIMPL; + return new_moniker_parse_displayname(pbc, name, eaten, ret); } static HRESULT WINAPI new_moniker_IsSystemMoniker(IMoniker *iface, DWORD *moniker_type) @@ -646,6 +648,115 @@ static const IMonikerVtbl new_moniker_vtbl = new_moniker_IsSystemMoniker }; +static const BYTE guid_conv_table[256] = +{ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x00 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x10 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x20 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, /* 0x30 */ + 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x50 */ + 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf /* 0x60 */ +}; + +static BOOL is_valid_hex(WCHAR c) +{ + return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || + (c >= 'A' && c <= 'F'); +} + +static HRESULT guid_from_string(const WCHAR *s, GUID *ret) +{ + BOOL has_brackets; + GUID guid = { 0 }; + int i; + + memset(ret, 0, sizeof(*ret)); + + /* Curly brackets are optional. */ + has_brackets = s[0] == '{'; + + if (has_brackets) + s++; + + for (i = 0; i < 8; i++) + { + if (!is_valid_hex(s[i])) return FALSE; + guid.Data1 = (guid.Data1 << 4) | guid_conv_table[s[i]]; + } + s += 8; + + if (s[0] != '-') return FALSE; + s++; + + for (i = 0; i < 4; i++) + { + if (!is_valid_hex(s[0])) return FALSE; + guid.Data2 = (guid.Data2 << 4) | guid_conv_table[s[i]]; + } + s += 4; + + if (s[0] != '-') return FALSE; + s++; + + for (i = 0; i < 4; i++) + { + if (!is_valid_hex(s[i])) return FALSE; + guid.Data3 = (guid.Data3 << 4) | guid_conv_table[s[i]]; + } + s += 4; + + if (s[0] != '-') return FALSE; + s++; + + for (i = 0; i < 17; i += 2) + { + if (i == 4) + { + if (s[i] != '-') return FALSE; + i++; + } + if (!is_valid_hex(s[i]) || !is_valid_hex(s[i+1])) return FALSE; + guid.Data4[i / 2] = guid_conv_table[s[i]] << 4 | guid_conv_table[s[i+1]]; + } + s += 17; + + if (has_brackets && s[0] != '}') + return FALSE; + + *ret = guid; + + return TRUE; +} + +static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG *eaten, IMoniker **ret) +{ + struct new_moniker *moniker; + GUID guid; + + *ret = NULL; + + if (wcsnicmp(name, L"new:", 4)) + return MK_E_SYNTAX; + + if (!guid_from_string(name + 4, &guid)) + return MK_E_SYNTAX; + + moniker = heap_alloc_zero(sizeof(*moniker)); + if (!moniker) + return E_OUTOFMEMORY; + + moniker->IMoniker_iface.lpVtbl = &new_moniker_vtbl; + moniker->refcount = 1; + + *ret = &moniker->IMoniker_iface; + + if (eaten) + *eaten = lstrlenW(name); + + return S_OK; +} + static HRESULT WINAPI new_moniker_parse_QueryInterface(IParseDisplayName *iface, REFIID riid, void **obj) { TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); @@ -676,22 +787,9 @@ static ULONG WINAPI new_moniker_parse_Release(IParseDisplayName *iface) static HRESULT WINAPI new_moniker_parse_ParseDisplayName(IParseDisplayName *iface, IBindCtx *pbc, LPOLESTR name, ULONG *eaten, IMoniker **ret) { - struct new_moniker *moniker; - - FIXME("%p, %p, %s, %p, %p.\n", iface, pbc, debugstr_w(name), eaten, ret); - - moniker = heap_alloc_zero(sizeof(*moniker)); - if (!moniker) - return E_OUTOFMEMORY; - - moniker->IMoniker_iface.lpVtbl = &new_moniker_vtbl; - moniker->refcount = 1; + TRACE("%p, %p, %s, %p, %p.\n", iface, pbc, debugstr_w(name), eaten, ret); - *ret = &moniker->IMoniker_iface; - - *eaten = lstrlenW(name); - - return S_OK; + return new_moniker_parse_displayname(pbc, name, eaten, ret); } static const IParseDisplayNameVtbl new_moniker_parse_vtbl = diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index 68760afd91..b377a9a515 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -269,7 +269,7 @@ static void create_dispenser(void) static void test_new_moniker(void) { - IMoniker *moniker, *inverse, *class_moniker; + IMoniker *moniker, *moniker2, *inverse, *class_moniker; DWORD moniker_type; IBindCtx *bindctx; FILETIME filetime; @@ -286,6 +286,13 @@ static void test_new_moniker(void) ok(hr == S_OK, "Failed to parse display name, hr %#x.\n", hr); ok(eaten == 40, "Unexpected eaten length %u.\n", eaten); + eaten = 0; + hr = IMoniker_ParseDisplayName(moniker, bindctx, NULL, (WCHAR *)L"new:20d04fe0-3aea-1069-a2d8-08002b30309d", + &eaten, &moniker2); + ok(hr == S_OK, "Failed to parse display name, hr %#x.\n", hr); + ok(eaten == 40, "Unexpected eaten length %u.\n", eaten); + IMoniker_Release(moniker2); + hr = IMoniker_QueryInterface(moniker, &IID_IParseDisplayName, (void **)&obj); ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr);

1 0