June 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : d3dcompiler: Rename make_simple_assignment() to new_simple_assignment().
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 56be9dde9273f13b6b73186e500ffa63674824dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=56be9dde9273f13b6b73186e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 22 17:47:20 2020 -0500 d3dcompiler: Rename make_simple_assignment() to new_simple_assignment(). 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 4e43a80275..2182833793 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -557,7 +557,7 @@ static struct hlsl_ir_assignment *new_assignment(struct hlsl_ir_var *var, struct return assign; } -static struct hlsl_ir_assignment *make_simple_assignment(struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs) +static struct hlsl_ir_assignment *new_simple_assignment(struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs) { return new_assignment(lhs, NULL, rhs, 0, rhs->loc); } @@ -575,7 +575,7 @@ static struct hlsl_ir_jump *add_return(struct list *instrs, if (!(return_value = add_implicit_conversion(instrs, return_value, return_type, &loc))) return NULL; - if (!(assignment = make_simple_assignment(hlsl_ctx.cur_function->return_var, return_value))) + if (!(assignment = new_simple_assignment(hlsl_ctx.cur_function->return_var, return_value))) return NULL; list_add_after(&return_value->entry, &assignment->node.entry); } @@ -681,7 +681,7 @@ static struct hlsl_ir_load *add_load(struct list *instrs, struct hlsl_ir_node *v TRACE("Synthesized variable %p for %s node.\n", var, debug_node_type(var_node->type)); - if (!(assign = make_simple_assignment(var, var_node))) + if (!(assign = new_simple_assignment(var, var_node))) return NULL; list_add_tail(instrs, &assign->node.entry);

1 0

Zebediah Figura : d3dcompiler: Print the data type when dumping IR.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: d60b126b24398d75e1781dc852a0f5b2d67a895f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d60b126b24398d75e1781dc8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 22 17:47:21 2020 -0500 d3dcompiler: Print the data type when dumping IR. 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 | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index aadad17691..30aa9de1dd 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1806,9 +1806,11 @@ static void debug_dump_ir_var(const struct hlsl_ir_var *var) static void debug_dump_deref(const struct hlsl_deref *deref) { - wine_dbg_printf("deref("); - debug_dump_ir_var(deref->var); - wine_dbg_printf(")"); + if (deref->offset) + /* Print the variable's type for convenience. */ + wine_dbg_printf("(%s %s)", debug_hlsl_type(deref->var->data_type), deref->var->name); + else + wine_dbg_printf("%s", deref->var->name); if (deref->offset) { wine_dbg_printf("["); @@ -2045,6 +2047,9 @@ static void debug_dump_instr(const struct hlsl_ir_node *instr) wine_dbg_printf("%4u: ", instr->index); else wine_dbg_printf("%p: ", instr); + + wine_dbg_printf("%10s | ", instr->data_type ? debug_hlsl_type(instr->data_type) : ""); + switch (instr->type) { case HLSL_IR_EXPR:

1 0

Sebastian Lackner : ntdll: Implement NtQueryInformationThread(ThreadTimes) using procfs.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 847b93c7400f82225057e8b71938eb8ccd5d23be URL: https://source.winehq.org/git/wine.git/?a=commit;h=847b93c7400f82225057e8b7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 28 20:43:17 2020 -0500 ntdll: Implement NtQueryInformationThread(ThreadTimes) using procfs. Based on a patch by Ray Hinchliffe <ray(a)pobox.co.uk>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20230 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/thread.c | 82 +++++++++++++++++++++++++++++++++--------- include/wine/server_protocol.h | 4 ++- server/protocol.def | 2 ++ server/request.h | 4 ++- server/thread.c | 2 ++ server/trace.c | 2 ++ 6 files changed, 77 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index f3dddd2b02..54483e1f99 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -29,6 +29,8 @@ #include <errno.h> #include <limits.h> #include <stdarg.h> +#include <stdio.h> +#include <string.h> #include <pthread.h> #include <signal.h> #include <sys/types.h> @@ -821,6 +823,59 @@ static void wow64_context_to_server( context_t *to, const WOW64_CONTEXT *from ) #endif /* __x86_64__ */ +#ifdef linux +static BOOL get_thread_times(int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, LARGE_INTEGER *user_time) +{ + unsigned long clocks_per_sec = sysconf( _SC_CLK_TCK ); + unsigned long usr, sys; + const char *pos; + char buf[512]; + FILE *f; + int i; + + sprintf( buf, "/proc/%u/task/%u/stat", unix_pid, unix_tid ); + if (!(f = fopen( buf, "r" ))) + { + ERR("Failed to open %s: %s\n", buf, strerror(errno)); + return FALSE; + } + + pos = fgets( buf, sizeof(buf), f ); + fclose( f ); + + /* the process name is printed unescaped, so we have to skip to the last ')' + * to avoid misinterpreting the string */ + if (pos) pos = strrchr( pos, ')' ); + if (pos) pos = strchr( pos + 1, ' ' ); + if (pos) pos++; + + /* skip over the following fields: state, ppid, pgid, sid, tty_nr, tty_pgrp, + * task->flags, min_flt, cmin_flt, maj_flt, cmaj_flt */ + for (i = 0; i < 11 && pos; i++) + { + pos = strchr( pos + 1, ' ' ); + if (pos) pos++; + } + + /* the next two values are user and system time */ + if (pos && (sscanf( pos, "%lu %lu", &usr, &sys ) == 2)) + { + kernel_time->QuadPart = (ULONGLONG)sys * 10000000 / clocks_per_sec; + user_time->QuadPart = (ULONGLONG)usr * 10000000 / clocks_per_sec; + return TRUE; + } + + ERR("Failed to parse %s\n", debugstr_a(buf)); + return FALSE; +} +#else +static BOOL get_thread_times(int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, LARGE_INTEGER *user_time) +{ + static int once; + if (!once++) FIXME("not implemented on this platform\n"); + return FALSE; +} +#endif /****************************************************************************** * NtQueryInformationThread (NTDLL.@) @@ -886,6 +941,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, case ThreadTimes: { KERNEL_USER_TIMES kusrt; + int unix_pid, unix_tid; SERVER_START_REQ( get_thread_times ) { @@ -895,15 +951,21 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, { kusrt.CreateTime.QuadPart = reply->creation_time; kusrt.ExitTime.QuadPart = reply->exit_time; + unix_pid = reply->unix_pid; + unix_tid = reply->unix_tid; } } SERVER_END_REQ; if (status == STATUS_SUCCESS) { - /* We call times(2) for kernel time or user time */ - /* We can only (portably) do this for the current thread */ - if (handle == GetCurrentThread()) + BOOL ret = FALSE; + + kusrt.KernelTime.QuadPart = kusrt.UserTime.QuadPart = 0; + if (unix_pid != -1 && unix_tid != -1) + ret = get_thread_times( unix_pid, unix_tid, &kusrt.KernelTime, &kusrt.UserTime ); + if (!ret && handle == GetCurrentThread()) { + /* fall back to process times */ struct tms time_buf; long clocks_per_sec = sysconf(_SC_CLK_TCK); @@ -911,20 +973,6 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, kusrt.KernelTime.QuadPart = (ULONGLONG)time_buf.tms_stime * 10000000 / clocks_per_sec; kusrt.UserTime.QuadPart = (ULONGLONG)time_buf.tms_utime * 10000000 / clocks_per_sec; } - else - { - static BOOL reported = FALSE; - - kusrt.KernelTime.QuadPart = 0; - kusrt.UserTime.QuadPart = 0; - if (reported) - TRACE("Cannot get kerneltime or usertime of other threads\n"); - else - { - FIXME("Cannot get kerneltime or usertime of other threads\n"); - reported = TRUE; - } - } if (data) memcpy( data, &kusrt, min( length, sizeof(kusrt) )); if (ret_len) *ret_len = min( length, sizeof(kusrt) ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1acaded199..0473c6a64a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1037,6 +1037,8 @@ struct get_thread_times_reply struct reply_header __header; timeout_t creation_time; timeout_t exit_time; + int unix_pid; + int unix_tid; }; @@ -6700,7 +6702,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 609 +#define SERVER_PROTOCOL_VERSION 610 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index d412889518..ed8ca3c478 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -967,6 +967,8 @@ struct rawinput_device @REPLY timeout_t creation_time; /* thread creation time */ timeout_t exit_time; /* thread exit time */ + int unix_pid; /* thread native pid */ + int unix_tid; /* thread native pid */ @END diff --git a/server/request.h b/server/request.h index 7c7c0fd92f..2a64643848 100644 --- a/server/request.h +++ b/server/request.h @@ -862,7 +862,9 @@ C_ASSERT( FIELD_OFFSET(struct get_thread_times_request, handle) == 12 ); C_ASSERT( sizeof(struct get_thread_times_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_thread_times_reply, creation_time) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_thread_times_reply, exit_time) == 16 ); -C_ASSERT( sizeof(struct get_thread_times_reply) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_times_reply, unix_pid) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_times_reply, unix_tid) == 28 ); +C_ASSERT( sizeof(struct get_thread_times_reply) == 32 ); C_ASSERT( FIELD_OFFSET(struct set_thread_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_thread_info_request, mask) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_thread_info_request, priority) == 20 ); diff --git a/server/thread.c b/server/thread.c index e2bfa50c7b..3cf447b1a0 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1554,6 +1554,8 @@ DECL_HANDLER(get_thread_times) { reply->creation_time = thread->creation_time; reply->exit_time = thread->exit_time; + reply->unix_pid = thread->unix_pid; + reply->unix_tid = thread->unix_tid; release_object( thread ); } diff --git a/server/trace.c b/server/trace.c index 6c7f3251db..2b22dc5207 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1442,6 +1442,8 @@ static void dump_get_thread_times_reply( const struct get_thread_times_reply *re { dump_timeout( " creation_time=", &req->creation_time ); dump_timeout( ", exit_time=", &req->exit_time ); + fprintf( stderr, ", unix_pid=%d", req->unix_pid ); + fprintf( stderr, ", unix_tid=%d", req->unix_tid ); } static void dump_set_thread_info_request( const struct set_thread_info_request *req )

1 0

Michael Müller : ntdll: Return thread times in NtQuerySystemInformation(SystemProcessInformation).
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 69e9651c1ae0542e52f5ea924b9e286584446607 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69e9651c1ae0542e52f5ea92… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Jun 28 20:43:18 2020 -0500 ntdll: Return thread times in NtQuerySystemInformation(SystemProcessInformation). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 40 +++++++++++++++++++++++++--------------- dlls/ntdll/unix/thread.c | 4 ++-- dlls/ntdll/unix/unix_private.h | 2 ++ include/wine/server_protocol.h | 4 ++-- server/protocol.def | 1 + server/request.h | 1 + server/snapshot.c | 1 + server/trace.c | 1 + 8 files changed, 35 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 5e2e763445..fd86ab874a 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2101,6 +2101,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, len = 0; while (ret == STATUS_SUCCESS) { + int unix_pid = -1; SERVER_START_REQ( next_process ) { req->handle = wine_server_obj_handle( handle ); @@ -2108,6 +2109,8 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, wine_server_set_reply( req, procname, sizeof(procname) - sizeof(WCHAR) ); if (!(ret = wine_server_call( req ))) { + unix_pid = reply->unix_pid; + /* Make sure procname is 0 terminated */ procname[wine_server_reply_size(reply) / sizeof(WCHAR)] = 0; @@ -2156,31 +2159,38 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, i = j = 0; while (ret == STATUS_SUCCESS) { + int unix_tid, pid, tid, base_pri, delta_pri; SERVER_START_REQ( next_thread ) { req->handle = wine_server_obj_handle( handle ); req->reset = (j == 0); if (!(ret = wine_server_call( req ))) { + unix_tid = reply->unix_tid; + pid = reply->pid; + tid = reply->tid; + base_pri = reply->base_pri; + delta_pri = reply->delta_pri; j++; - if (UlongToHandle(reply->pid) == spi->UniqueProcessId) - { - /* ftKernelTime, ftUserTime, ftCreateTime; - * dwTickCount, dwStartAddress - */ - - memset(&spi->ti[i], 0, sizeof(spi->ti)); - - spi->ti[i].CreateTime.QuadPart = 0xdeadbeef; - spi->ti[i].ClientId.UniqueProcess = UlongToHandle(reply->pid); - spi->ti[i].ClientId.UniqueThread = UlongToHandle(reply->tid); - spi->ti[i].dwCurrentPriority = reply->base_pri + reply->delta_pri; - spi->ti[i].dwBasePriority = reply->base_pri; - i++; - } } } SERVER_END_REQ; + + if (!ret) + { + if (UlongToHandle(pid) == spi->UniqueProcessId) + { + memset(&spi->ti[i], 0, sizeof(spi->ti)); + + spi->ti[i].CreateTime.QuadPart = 0xdeadbeef; + spi->ti[i].ClientId.UniqueProcess = UlongToHandle(pid); + spi->ti[i].ClientId.UniqueThread = UlongToHandle(tid); + spi->ti[i].dwCurrentPriority = base_pri + delta_pri; + spi->ti[i].dwBasePriority = base_pri; + get_thread_times(unix_pid, unix_tid, &spi->ti[i].KernelTime, &spi->ti[i].UserTime); + i++; + } + } } if (ret == STATUS_NO_MORE_FILES) ret = STATUS_SUCCESS; diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 54483e1f99..3655adf2db 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -824,7 +824,7 @@ static void wow64_context_to_server( context_t *to, const WOW64_CONTEXT *from ) #endif /* __x86_64__ */ #ifdef linux -static BOOL get_thread_times(int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, LARGE_INTEGER *user_time) +BOOL get_thread_times(int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, LARGE_INTEGER *user_time) { unsigned long clocks_per_sec = sysconf( _SC_CLK_TCK ); unsigned long usr, sys; @@ -869,7 +869,7 @@ static BOOL get_thread_times(int unix_pid, int unix_tid, LARGE_INTEGER *kernel_t return FALSE; } #else -static BOOL get_thread_times(int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, LARGE_INTEGER *user_time) +BOOL get_thread_times(int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, LARGE_INTEGER *user_time) { static int once; if (!once++) FIXME("not implemented on this platform\n"); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index ee6caaec8f..fe63606ed8 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -209,6 +209,8 @@ extern void virtual_fill_image_information( const pe_image_info_t *pe_info, SECTION_IMAGE_INFORMATION *info ) DECLSPEC_HIDDEN; extern NTSTATUS get_thread_ldt_entry( HANDLE handle, void *data, ULONG len, ULONG *ret_len ) DECLSPEC_HIDDEN; +extern BOOL get_thread_times( int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, + LARGE_INTEGER *user_time ) DECLSPEC_HIDDEN; extern void signal_init_threading(void) DECLSPEC_HIDDEN; extern NTSTATUS signal_alloc_thread( TEB *teb ) DECLSPEC_HIDDEN; extern void signal_free_thread( TEB *teb ) DECLSPEC_HIDDEN; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 0473c6a64a..13da55aded 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2493,7 +2493,7 @@ struct next_thread_reply thread_id_t tid; int base_pri; int delta_pri; - char __pad_28[4]; + int unix_tid; }; @@ -6702,7 +6702,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 610 +#define SERVER_PROTOCOL_VERSION 611 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index ed8ca3c478..38079f23da 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1913,6 +1913,7 @@ enum char_info_mode thread_id_t tid; /* thread id */ int base_pri; /* base priority */ int delta_pri; /* delta priority */ + int unix_tid; /* thread native pid */ @END diff --git a/server/request.h b/server/request.h index 2a64643848..3b7db3997b 100644 --- a/server/request.h +++ b/server/request.h @@ -1362,6 +1362,7 @@ C_ASSERT( FIELD_OFFSET(struct next_thread_reply, pid) == 12 ); C_ASSERT( FIELD_OFFSET(struct next_thread_reply, tid) == 16 ); C_ASSERT( FIELD_OFFSET(struct next_thread_reply, base_pri) == 20 ); C_ASSERT( FIELD_OFFSET(struct next_thread_reply, delta_pri) == 24 ); +C_ASSERT( FIELD_OFFSET(struct next_thread_reply, unix_tid) == 28 ); C_ASSERT( sizeof(struct next_thread_reply) == 32 ); C_ASSERT( FIELD_OFFSET(struct wait_debug_event_request, get_handle) == 12 ); C_ASSERT( sizeof(struct wait_debug_event_request) == 16 ); diff --git a/server/snapshot.c b/server/snapshot.c index a0f2ea17a3..bdceaef530 100644 --- a/server/snapshot.c +++ b/server/snapshot.c @@ -150,6 +150,7 @@ static int snapshot_next_thread( struct snapshot *snapshot, struct next_thread_r reply->tid = get_thread_id( ptr->thread ); reply->base_pri = ptr->priority; reply->delta_pri = 0; /* FIXME */ + reply->unix_tid = ptr->thread->unix_tid; return 1; } diff --git a/server/trace.c b/server/trace.c index 2b22dc5207..951ac44d9d 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2412,6 +2412,7 @@ static void dump_next_thread_reply( const struct next_thread_reply *req ) fprintf( stderr, ", tid=%04x", req->tid ); fprintf( stderr, ", base_pri=%d", req->base_pri ); fprintf( stderr, ", delta_pri=%d", req->delta_pri ); + fprintf( stderr, ", unix_tid=%d", req->unix_tid ); } static void dump_wait_debug_event_request( const struct wait_debug_event_request *req )

1 0

Alexandre Julliard : ntdll: Avoid some Unix dependencies.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 38c78a968259963d29559096dda575237039c561 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38c78a968259963d29559096… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 29 10:40:28 2020 +0200 ntdll: Avoid some Unix dependencies. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 4 +- dlls/ntdll/signal_arm.c | 16 +---- dlls/ntdll/signal_x86_64.c | 144 --------------------------------------------- dlls/ntdll/thread.c | 2 - 4 files changed, 4 insertions(+), 162 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=38c78a968259963d2955…

1 0

Alexandre Julliard : ntdll: Stop sharing the thread counter with the Unix library.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 2334f4e64582a518e4d5a7627472a0d817b147ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=2334f4e64582a518e4d5a762… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 29 12:09:25 2020 +0200 ntdll: Stop sharing the thread counter with the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 31 +++++++++++++++++++++++++++++++ dlls/ntdll/thread.c | 9 +++++---- dlls/ntdll/unix/thread.c | 18 +++++++++--------- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unixlib.h | 4 ++-- 5 files changed, 48 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index eaf2f1a45b..4de562b994 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2670,6 +2670,36 @@ static void test_thread_lookup(void) "NtOpenThread returned %#x\n", status); } +static void test_thread_info(void) +{ + NTSTATUS status; + ULONG len, data; + + len = 0xdeadbeef; + data = 0xcccccccc; + status = pNtQueryInformationThread( GetCurrentThread(), ThreadAmILastThread, + &data, sizeof(data), &len ); + ok( !status, "failed %x\n", status ); + ok( data == 0 || data == 1, "wrong data %x\n", data ); + ok( len == sizeof(data), "wrong len %u\n", len ); + + len = 0xdeadbeef; + data = 0xcccccccc; + status = pNtQueryInformationThread( GetCurrentThread(), ThreadAmILastThread, + &data, sizeof(data) - 1, &len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "failed %x\n", status ); + ok( data == 0xcccccccc, "wrong data %x\n", data ); + ok( len == 0xdeadbeef, "wrong len %u\n", len ); + + len = 0xdeadbeef; + data = 0xcccccccc; + status = pNtQueryInformationThread( GetCurrentThread(), ThreadAmILastThread, + &data, sizeof(data) + 1, &len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "failed %x\n", status ); + ok( data == 0xcccccccc, "wrong data %x\n", data ); + ok( len == 0xdeadbeef, "wrong len %u\n", len ); +} + START_TEST(info) { char **argv; @@ -2827,4 +2857,5 @@ START_TEST(info) test_query_data_alignment(); test_thread_lookup(); + test_thread_info(); } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index ec94338f3f..7b8a717241 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -45,7 +45,6 @@ static PEB_LDR_DATA ldr; static RTL_BITMAP tls_bitmap; static RTL_BITMAP tls_expansion_bitmap; static RTL_BITMAP fls_bitmap; -static int nb_threads = 1; struct ldt_copy *__wine_ldt_copy = NULL; @@ -105,7 +104,7 @@ int __cdecl __wine_dbg_output( const char *str ) TEB *thread_init( SIZE_T *info_size ) { ULONG_PTR val; - TEB *teb = unix_funcs->init_threading( &nb_threads, &__wine_ldt_copy, info_size ); + TEB *teb = unix_funcs->init_threading( &__wine_ldt_copy, info_size ); peb = teb->Peb; peb->FastPebLock = &peb_lock; @@ -147,6 +146,8 @@ TEB *thread_init( SIZE_T *info_size ) */ void WINAPI RtlExitUserThread( ULONG status ) { + ULONG last; + if (status) /* send the exit code to the server (0 is already the default) */ { SERVER_START_REQ( terminate_thread ) @@ -158,12 +159,12 @@ void WINAPI RtlExitUserThread( ULONG status ) SERVER_END_REQ; } - if (InterlockedDecrement( &nb_threads ) <= 0) + NtQueryInformationThread( GetCurrentThread(), ThreadAmILastThread, &last, sizeof(last), NULL ); + if (last) { LdrShutdownProcess(); unix_funcs->exit_process( status ); } - LdrShutdownThread(); RtlFreeThreadActivationContextStack(); for (;;) unix_funcs->exit_thread( status ); diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index c583a08c05..2be8d2d3e2 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -60,7 +60,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); #define PTHREAD_STACK_MIN 16384 #endif -static int *nb_threads; +static int nb_threads = 1; static inline int get_unix_exit_code( NTSTATUS status ) { @@ -86,7 +86,7 @@ static void pthread_exit_wrapper( int status ) /*********************************************************************** * init_threading */ -TEB * CDECL init_threading( int *nb_threads_ptr, struct ldt_copy **ldt_copy, SIZE_T *size ) +TEB * CDECL init_threading( struct ldt_copy **ldt_copy, SIZE_T *size ) { TEB *teb; BOOL suspend; @@ -95,7 +95,6 @@ TEB * CDECL init_threading( int *nb_threads_ptr, struct ldt_copy **ldt_copy, SIZ extern struct ldt_copy __wine_ldt_copy; *ldt_copy = &__wine_ldt_copy; #endif - nb_threads = nb_threads_ptr; teb = virtual_alloc_first_teb(); @@ -290,10 +289,10 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT (char *)teb->Tib.StackBase + extra_stack - (char *)teb->DeallocationStack ); pthread_attr_setguardsize( &pthread_attr, 0 ); pthread_attr_setscope( &pthread_attr, PTHREAD_SCOPE_SYSTEM ); /* force creating a kernel thread */ - InterlockedIncrement( nb_threads ); + InterlockedIncrement( &nb_threads ); if (pthread_create( &pthread_id, &pthread_attr, (void * (*)(void *))start_thread, teb )) { - InterlockedDecrement( nb_threads ); + InterlockedDecrement( &nb_threads ); virtual_free_teb( teb ); status = STATUS_NO_MEMORY; } @@ -319,7 +318,7 @@ done: void abort_thread( int status ) { pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); - if (InterlockedDecrement( nb_threads ) <= 0) abort_process( status ); + if (InterlockedDecrement( &nb_threads ) <= 0) abort_process( status ); signal_exit_thread( status, pthread_exit_wrapper ); } @@ -987,6 +986,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, case ThreadAmILastThread: { + if (length != sizeof(ULONG)) return STATUS_INFO_LENGTH_MISMATCH; SERVER_START_REQ( get_thread_info ) { req->handle = wine_server_obj_handle( handle ); @@ -994,9 +994,9 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, status = wine_server_call( req ); if (status == STATUS_SUCCESS) { - BOOLEAN last = reply->last; - if (data) memcpy( data, &last, min( length, sizeof(last) )); - if (ret_len) *ret_len = min( length, sizeof(last) ); + ULONG last = reply->last; + if (data) memcpy( data, &last, sizeof(last) ); + if (ret_len) *ret_len = sizeof(last); } } SERVER_END_REQ; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index d6a15d5f7b..1f4c2da0c6 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -117,7 +117,7 @@ extern NTSTATUS CDECL server_handle_to_fd( HANDLE handle, unsigned int access, i unsigned int *options ) DECLSPEC_HIDDEN; extern void CDECL server_release_fd( HANDLE handle, int unix_fd ) DECLSPEC_HIDDEN; extern void CDECL server_init_process_done( void *relay ) DECLSPEC_HIDDEN; -extern TEB * CDECL init_threading( int *nb_threads_ptr, struct ldt_copy **ldt_copy, SIZE_T *size ) DECLSPEC_HIDDEN; +extern TEB * CDECL init_threading( struct ldt_copy **ldt_copy, SIZE_T *size ) DECLSPEC_HIDDEN; extern void CDECL DECLSPEC_NORETURN exit_thread( int status ) DECLSPEC_HIDDEN; extern void CDECL DECLSPEC_NORETURN exit_process( int status ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL exec_process( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTSTATUS status ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 88010b695e..19e532da47 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -29,7 +29,7 @@ struct msghdr; struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 65 +#define NTDLL_UNIXLIB_VERSION 66 struct unix_funcs { @@ -319,7 +319,7 @@ struct unix_funcs void (CDECL *virtual_set_large_address_space)(void); /* thread/process functions */ - TEB * (CDECL *init_threading)( int *nb_threads_ptr, struct ldt_copy **ldt_copy, SIZE_T *size ); + TEB * (CDECL *init_threading)( struct ldt_copy **ldt_copy, SIZE_T *size ); void (CDECL *exit_thread)( int status ); void (CDECL *exit_process)( int status ); NTSTATUS (CDECL *exec_process)( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTSTATUS status );

1 0

Alexandre Julliard : ntdll: Update the __wine_ldt_copy pointer directly from the Unix library.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: f1ff598e2aca810c3a0540d6a764787d31890741 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1ff598e2aca810c3a0540d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 29 12:10:00 2020 +0200 ntdll: Update the __wine_ldt_copy pointer directly from the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 2 ++ dlls/ntdll/thread.c | 4 +--- dlls/ntdll/unix/loader.c | 7 +++++++ dlls/ntdll/unix/server.c | 3 --- dlls/ntdll/unix/thread.c | 6 +----- dlls/ntdll/unix/unix_private.h | 6 ++++-- dlls/ntdll/unixlib.h | 5 ++--- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index ac722bef55..7567a5e5d1 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -95,6 +95,8 @@ static inline struct x86_thread_data *x86_thread_data(void) return (struct x86_thread_data *)NtCurrentTeb()->SystemReserved2; } +struct ldt_copy *__wine_ldt_copy = NULL; + /* Exception record for handling exceptions happening inside exception handlers */ typedef struct { diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 7b8a717241..027b72d3be 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -46,8 +46,6 @@ static RTL_BITMAP tls_bitmap; static RTL_BITMAP tls_expansion_bitmap; static RTL_BITMAP fls_bitmap; -struct ldt_copy *__wine_ldt_copy = NULL; - static RTL_CRITICAL_SECTION peb_lock; static RTL_CRITICAL_SECTION_DEBUG critsect_debug = { @@ -104,7 +102,7 @@ int __cdecl __wine_dbg_output( const char *str ) TEB *thread_init( SIZE_T *info_size ) { ULONG_PTR val; - TEB *teb = unix_funcs->init_threading( &__wine_ldt_copy, info_size ); + TEB *teb = unix_funcs->init_threading( info_size ); peb = teb->Peb; peb->FastPebLock = &peb_lock; diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 892ff10c35..600a2b0e39 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -838,6 +838,13 @@ static void fixup_ntdll_imports( const IMAGE_NT_HEADERS *nt ) GET_FUNC( LdrInitializeThunk ); GET_FUNC( RtlUserThreadStart ); GET_FUNC( __wine_set_unix_funcs ); +#ifdef __i386__ + { + struct ldt_copy **p__wine_ldt_copy; + GET_FUNC( __wine_ldt_copy ); + *p__wine_ldt_copy = &__wine_ldt_copy; + } +#endif #undef GET_FUNC } diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index f02d1ed8a2..c311665267 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1461,9 +1461,6 @@ void server_init_process(void) */ void CDECL server_init_process_done( void *relay ) { -#ifdef __i386__ - extern struct ldt_copy __wine_ldt_copy; -#endif PEB *peb = NtCurrentTeb()->Peb; IMAGE_NT_HEADERS *nt = RtlImageNtHeader( peb->ImageBaseAddress ); void *entry = (char *)peb->ImageBaseAddress + nt->OptionalHeader.AddressOfEntryPoint; diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 2be8d2d3e2..129410f8d7 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -86,15 +86,11 @@ static void pthread_exit_wrapper( int status ) /*********************************************************************** * init_threading */ -TEB * CDECL init_threading( struct ldt_copy **ldt_copy, SIZE_T *size ) +TEB * CDECL init_threading( SIZE_T *size ) { TEB *teb; BOOL suspend; SIZE_T info_size; -#ifdef __i386__ - extern struct ldt_copy __wine_ldt_copy; - *ldt_copy = &__wine_ldt_copy; -#endif teb = virtual_alloc_first_teb(); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 1f4c2da0c6..54254632e7 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -73,7 +73,6 @@ extern void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) DECLSPEC_HIDDEN; extern void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PTR) DECLSPEC_HIDDEN; extern void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) DECLSPEC_HIDDEN; - extern NTSTATUS CDECL fast_RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit, int timeout ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) DECLSPEC_HIDDEN; @@ -117,7 +116,7 @@ extern NTSTATUS CDECL server_handle_to_fd( HANDLE handle, unsigned int access, i unsigned int *options ) DECLSPEC_HIDDEN; extern void CDECL server_release_fd( HANDLE handle, int unix_fd ) DECLSPEC_HIDDEN; extern void CDECL server_init_process_done( void *relay ) DECLSPEC_HIDDEN; -extern TEB * CDECL init_threading( struct ldt_copy **ldt_copy, SIZE_T *size ) DECLSPEC_HIDDEN; +extern TEB * CDECL init_threading( SIZE_T *size ) DECLSPEC_HIDDEN; extern void CDECL DECLSPEC_NORETURN exit_thread( int status ) DECLSPEC_HIDDEN; extern void CDECL DECLSPEC_NORETURN exit_process( int status ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL exec_process( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTSTATUS status ) DECLSPEC_HIDDEN; @@ -149,6 +148,9 @@ extern sigset_t server_block_set DECLSPEC_HIDDEN; extern SIZE_T signal_stack_size DECLSPEC_HIDDEN; extern SIZE_T signal_stack_mask DECLSPEC_HIDDEN; extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN; +#ifdef __i386__ +extern struct ldt_copy __wine_ldt_copy DECLSPEC_HIDDEN; +#endif extern void init_environment( int argc, char *argv[], char *envp[] ) DECLSPEC_HIDDEN; extern DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 19e532da47..c8bcac3836 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -24,12 +24,11 @@ #include "wine/server.h" #include "wine/debug.h" -struct ldt_copy; struct msghdr; struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 66 +#define NTDLL_UNIXLIB_VERSION 67 struct unix_funcs { @@ -319,7 +318,7 @@ struct unix_funcs void (CDECL *virtual_set_large_address_space)(void); /* thread/process functions */ - TEB * (CDECL *init_threading)( struct ldt_copy **ldt_copy, SIZE_T *size ); + TEB * (CDECL *init_threading)( SIZE_T *size ); void (CDECL *exit_thread)( int status ); void (CDECL *exit_process)( int status ); NTSTATUS (CDECL *exec_process)( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTSTATUS status );

1 0

Vijay Kiran Kamuju : qdvd: Register the DvdGraphBuilder coclass.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: f7164ccfd17da8d978dbabff6eff84ce6caf1c8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7164ccfd17da8d978dbabff… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Jun 28 17:33:45 2020 -0500 qdvd: Register the DvdGraphBuilder coclass. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49458 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qdvd/Makefile.in | 3 +++ dlls/qdvd/qdvd.spec | 4 ++-- dlls/qdvd/qdvd_classes.idl | 26 ++++++++++++++++++++++++++ dlls/qdvd/qdvd_main.c | 17 +++++++++++++++++ 4 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/qdvd/Makefile.in b/dlls/qdvd/Makefile.in index c4b7dcce1f..b3b13486ed 100644 --- a/dlls/qdvd/Makefile.in +++ b/dlls/qdvd/Makefile.in @@ -4,3 +4,6 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ qdvd_main.c + +IDL_SRCS = \ + qdvd_classes.idl diff --git a/dlls/qdvd/qdvd.spec b/dlls/qdvd/qdvd.spec index c534b4fbf4..b16365d0c9 100644 --- a/dlls/qdvd/qdvd.spec +++ b/dlls/qdvd/qdvd.spec @@ -1,4 +1,4 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/qdvd/qdvd_classes.idl b/dlls/qdvd/qdvd_classes.idl new file mode 100644 index 0000000000..7fd2a081ba --- /dev/null +++ b/dlls/qdvd/qdvd_classes.idl @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register + +[ + helpstring("DVD Graph Builder"), + threading(both), + uuid(fcc152b7-f372-11d0-8e00-00c04fd7c08b), +] +coclass DvdGraphBuilder {} diff --git a/dlls/qdvd/qdvd_main.c b/dlls/qdvd/qdvd_main.c index 5c7368ce90..72dcda7c91 100644 --- a/dlls/qdvd/qdvd_main.c +++ b/dlls/qdvd/qdvd_main.c @@ -21,17 +21,24 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "oleidl.h" +#include "rpcproxy.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(qdvd); +static HINSTANCE qdvd_instance; + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { if (reason == DLL_WINE_PREATTACH) return FALSE; /* prefer native version */ if (reason == DLL_PROCESS_ATTACH) + { + qdvd_instance = instance; DisableThreadLibraryCalls(instance); + } return TRUE; } @@ -41,6 +48,16 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) return CLASS_E_CLASSNOTAVAILABLE; } +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources(qdvd_instance); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources(qdvd_instance); +} + HRESULT WINAPI DllCanUnloadNow(void) { return S_FALSE;

1 0

Zebediah Figura : d3dcompiler: Create the expression in append_binop().
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 6083b1dd39d9946c35799272f780015e94a5260f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6083b1dd39d9946c35799272… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 22 17:47:18 2020 -0500 d3dcompiler: Create the expression in append_binop(). 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 | 139 ++++++++++++++++++++------------------------- 1 file changed, 63 insertions(+), 76 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 96a27d6a30..43ffa43a02 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1193,12 +1193,14 @@ static struct list *append_unop(struct list *list, struct hlsl_ir_node *node) return list; } -static struct list *append_binop(struct list *first, struct list *second, struct hlsl_ir_node *node) +static struct list *add_binary_expr(struct list *list1, struct list *list2, + enum hlsl_ir_expr_op op, struct source_location loc) { - list_move_tail(first, second); - d3dcompiler_free(second); - list_add_tail(first, &node->entry); - return first; + struct hlsl_ir_node *arg1 = node_from_list(list1), *arg2 = node_from_list(list2); + list_move_tail(list1, list2); + d3dcompiler_free(list2); + list_add_tail(list1, &new_binary_expr(op, arg1, arg2, loc)->entry); + return list1; } static struct list *make_list(struct hlsl_ir_node *node) @@ -2578,40 +2580,33 @@ unary_op: '+' $$ = UNARY_OP_BITNOT; } -mul_expr: unary_expr - { - $$ = $1; - } - | mul_expr '*' unary_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_MUL, - node_from_list($1), node_from_list($3), get_location(&@2))); - } - | mul_expr '/' unary_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_DIV, - node_from_list($1), node_from_list($3), get_location(&@2))); - } - | mul_expr '%' unary_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_MOD, - node_from_list($1), node_from_list($3), get_location(&@2))); - } +mul_expr: -add_expr: mul_expr - { - $$ = $1; - } - | add_expr '+' mul_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_ADD, - node_from_list($1), node_from_list($3), get_location(&@2))); - } - | add_expr '-' mul_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_SUB, - node_from_list($1), node_from_list($3), get_location(&@2))); - } + unary_expr + | mul_expr '*' unary_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_MUL, get_location(&@2)); + } + | mul_expr '/' unary_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_DIV, get_location(&@2)); + } + | mul_expr '%' unary_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_MOD, get_location(&@2)); + } + +add_expr: + + mul_expr + | add_expr '+' mul_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_ADD, get_location(&@2)); + } + | add_expr '-' mul_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_SUB, get_location(&@2)); + } shift_expr: add_expr { @@ -2626,45 +2621,37 @@ shift_expr: add_expr FIXME("Right shift\n"); } -relational_expr: shift_expr - { - $$ = $1; - } - | relational_expr '<' shift_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_LESS, - node_from_list($1), node_from_list($3), get_location(&@2))); - } - | relational_expr '>' shift_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_GREATER, - node_from_list($1), node_from_list($3), get_location(&@2))); - } - | relational_expr OP_LE shift_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_LEQUAL, - node_from_list($1), node_from_list($3), get_location(&@2))); - } - | relational_expr OP_GE shift_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_GEQUAL, - node_from_list($1), node_from_list($3), get_location(&@2))); - } +relational_expr: -equality_expr: relational_expr - { - $$ = $1; - } - | equality_expr OP_EQ relational_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_EQUAL, - node_from_list($1), node_from_list($3), get_location(&@2))); - } - | equality_expr OP_NE relational_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_NEQUAL, - node_from_list($1), node_from_list($3), get_location(&@2))); - } + shift_expr + | relational_expr '<' shift_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_LESS, get_location(&@2)); + } + | relational_expr '>' shift_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_GREATER, get_location(&@2)); + } + | relational_expr OP_LE shift_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_LEQUAL, get_location(&@2)); + } + | relational_expr OP_GE shift_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_GEQUAL, get_location(&@2)); + } + +equality_expr: + + relational_expr + | equality_expr OP_EQ relational_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_EQUAL, get_location(&@2)); + } + | equality_expr OP_NE relational_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_NEQUAL, get_location(&@2)); + } bitand_expr: equality_expr {

1 0

Jacek Caban : server: Remove no longer needed support for opening current console in open_console request.
by Alexandre Julliard June 26, 2020

June 26, 2020

Module: wine Branch: master Commit: 13b2587d4f55d64a1381c60ac34acf4abe6bb1e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13b2587d4f55d64a1381c60a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 25 22:28:05 2020 +0200 server: Remove no longer needed support for opening current console in open_console request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 1 - server/console.c | 15 ++------------- server/protocol.def | 3 +-- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 24bebb8f10..1acaded199 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1902,7 +1902,6 @@ struct open_console_request { struct request_header __header; obj_handle_t from; - unsigned int access; unsigned int attributes; int share; diff --git a/server/console.c b/server/console.c index 57592e6ab0..729cfa4061 100644 --- a/server/console.c +++ b/server/console.c @@ -1664,19 +1664,8 @@ DECL_HANDLER(open_console) { struct object *obj = NULL; - reply->handle = 0; - if (!req->from) - { - if (current->process->console) - obj = grab_object( (struct object*)current->process->console ); - } - else if (req->from == (obj_handle_t)1) - { - if (current->process->console && current->process->console->active) - obj = grab_object( (struct object*)current->process->console->active ); - } - else if ((obj = get_handle_obj( current->process, req->from, - FILE_READ_PROPERTIES|FILE_WRITE_PROPERTIES, &console_input_ops ))) + if ((obj = get_handle_obj( current->process, req->from, + FILE_READ_PROPERTIES|FILE_WRITE_PROPERTIES, &console_input_ops ))) { struct console_input *console = (struct console_input *)obj; obj = (console->active) ? grab_object( console->active ) : NULL; diff --git a/server/protocol.def b/server/protocol.def index c3442c06e9..d412889518 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1523,8 +1523,7 @@ struct console_renderer_event /* Open a handle to the process console */ @REQ(open_console) - obj_handle_t from; /* 0 (resp 1) input (resp output) of current process console */ - /* otherwise console_in handle to get active screen buffer? */ + obj_handle_t from; /* console_in handle to get active screen buffer */ unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ int share; /* share mask (only for output handles) */

1 0