wine-commits July 2019

wine-commits@winehq.org

2 participants
228 discussions

Jacek Caban : server: Rename cpu_type_t to client_cpu_t.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: 5e0b0d35216bf261b956ec0364162d35a1a751e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e0b0d35216bf261b956ec03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 5 14:37:49 2019 +0200 server: Rename cpu_type_t to client_cpu_t. To avoid conflicts with mac headers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 2 +- dlls/ntdll/process.c | 2 +- include/wine/server_protocol.h | 16 ++++++++-------- server/protocol.def | 14 +++++++------- server/request.h | 2 +- server/trace.c | 14 +++++++------- tools/make_requests | 2 +- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 7c40c34..2dcd53b 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -174,7 +174,7 @@ static inline unsigned int is_path_prefix( const WCHAR *prefix, const WCHAR *fil /*********************************************************************** * is_64bit_arch */ -static inline BOOL is_64bit_arch( cpu_type_t cpu ) +static inline BOOL is_64bit_arch( client_cpu_t cpu ) { return (cpu == CPU_x86_64 || cpu == CPU_ARM64); } diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 8b9d5bc..e3c2ba5 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -62,7 +62,7 @@ static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); static const char * const cpu_names[] = { "x86", "x86_64", "PowerPC", "ARM", "ARM64" }; -static inline BOOL is_64bit_arch( cpu_type_t cpu ) +static inline BOOL is_64bit_arch( client_cpu_t cpu ) { return (cpu == CPU_x86_64 || cpu == CPU_ARM64); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d26f27c..392c944 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -119,12 +119,12 @@ enum cpu_type { CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64 }; -typedef int cpu_type_t; +typedef int client_cpu_t; typedef struct { - cpu_type_t cpu; + client_cpu_t cpu; unsigned int flags; union { @@ -743,7 +743,7 @@ typedef struct unsigned int header_size; unsigned int file_size; unsigned int checksum; - cpu_type_t cpu; + client_cpu_t cpu; int __pad; } pe_image_info_t; #define IMAGE_FLAGS_ComPlusNativeReady 0x01 @@ -774,7 +774,7 @@ struct new_process_request int socket_fd; obj_handle_t exe_file; unsigned int access; - cpu_type_t cpu; + client_cpu_t cpu; data_size_t info_size; /* VARARG(objattr,object_attributes); */ /* VARARG(info,startup_info,info_size); */ @@ -796,7 +796,7 @@ struct exec_process_request struct request_header __header; int socket_fd; obj_handle_t exe_file; - cpu_type_t cpu; + client_cpu_t cpu; }; struct exec_process_reply { @@ -881,7 +881,7 @@ struct init_thread_request client_ptr_t entry; int reply_fd; int wait_fd; - cpu_type_t cpu; + client_cpu_t cpu; char __pad_52[4]; }; struct init_thread_reply @@ -946,7 +946,7 @@ struct get_process_info_reply timeout_t end_time; int exit_code; int priority; - cpu_type_t cpu; + client_cpu_t cpu; short int debugger_present; short int debug_children; }; @@ -6691,6 +6691,6 @@ union generic_reply struct resume_process_reply resume_process_reply; }; -#define SERVER_PROTOCOL_VERSION 587 +#define SERVER_PROTOCOL_VERSION 588 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index b80a6d6..8157199 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -135,12 +135,12 @@ enum cpu_type { CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64 }; -typedef int cpu_type_t; +typedef int client_cpu_t; /* context data */ typedef struct { - cpu_type_t cpu; /* cpu type */ + client_cpu_t cpu; /* cpu type */ unsigned int flags; /* SERVER_CTX_* flags */ union { @@ -759,7 +759,7 @@ typedef struct unsigned int header_size; unsigned int file_size; unsigned int checksum; - cpu_type_t cpu; + client_cpu_t cpu; int __pad; } pe_image_info_t; #define IMAGE_FLAGS_ComPlusNativeReady 0x01 @@ -788,7 +788,7 @@ struct rawinput_device int socket_fd; /* file descriptor for process socket */ obj_handle_t exe_file; /* file handle for main exe */ unsigned int access; /* access rights for process object */ - cpu_type_t cpu; /* CPU that the new process will use */ + client_cpu_t cpu; /* CPU that the new process will use */ data_size_t info_size; /* size of startup info */ VARARG(objattr,object_attributes); /* object attributes */ VARARG(info,startup_info,info_size); /* startup information */ @@ -804,7 +804,7 @@ struct rawinput_device @REQ(exec_process) int socket_fd; /* file descriptor for process socket */ obj_handle_t exe_file; /* file handle for main exe */ - cpu_type_t cpu; /* CPU that the new process will use */ + client_cpu_t cpu; /* CPU that the new process will use */ @END @@ -859,7 +859,7 @@ struct rawinput_device client_ptr_t entry; /* entry point or PEB if initial thread (in thread address space) */ int reply_fd; /* fd for reply pipe */ int wait_fd; /* fd for blocking calls pipe */ - cpu_type_t cpu; /* CPU that this thread is running on */ + client_cpu_t cpu; /* CPU that this thread is running on */ @REPLY process_id_t pid; /* process id of the new thread's process */ thread_id_t tid; /* thread id of the new thread */ @@ -902,7 +902,7 @@ struct rawinput_device timeout_t end_time; /* process end time */ int exit_code; /* process exit code */ int priority; /* priority class */ - cpu_type_t cpu; /* CPU that this process is running on */ + client_cpu_t cpu; /* CPU that this process is running on */ short int debugger_present; /* process is being debugged */ short int debug_children; /* inherit debugger to child processes */ @END diff --git a/server/request.h b/server/request.h index 57f8937..be65a23 100644 --- a/server/request.h +++ b/server/request.h @@ -722,8 +722,8 @@ C_ASSERT( sizeof(async_data_t) == 40 ); C_ASSERT( sizeof(atom_t) == 4 ); C_ASSERT( sizeof(char) == 1 ); C_ASSERT( sizeof(char_info_t) == 4 ); +C_ASSERT( sizeof(client_cpu_t) == 4 ); C_ASSERT( sizeof(client_ptr_t) == 8 ); -C_ASSERT( sizeof(cpu_type_t) == 4 ); C_ASSERT( sizeof(data_size_t) == 4 ); C_ASSERT( sizeof(file_pos_t) == 8 ); C_ASSERT( sizeof(hw_input_t) == 32 ); diff --git a/server/trace.c b/server/trace.c index 3213490..0df649e 100644 --- a/server/trace.c +++ b/server/trace.c @@ -129,7 +129,7 @@ static void dump_ioctl_code( const char *prefix, const ioctl_code_t *code ) } } -static void dump_cpu_type( const char *prefix, const cpu_type_t *code ) +static void dump_client_cpu( const char *prefix, const client_cpu_t *code ) { switch (*code) { @@ -565,7 +565,7 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) memcpy( &ctx, context, size ); fprintf( stderr,"%s{", prefix ); - dump_cpu_type( "cpu=", &ctx.cpu ); + dump_client_cpu( "cpu=", &ctx.cpu ); switch (ctx.cpu) { case CPU_x86: @@ -1196,7 +1196,7 @@ static void dump_varargs_pe_image_info( const char *prefix, data_size_t size ) info.zerobits, info.subsystem, info.subsystem_low, info.subsystem_high, info.gp, info.image_charact, info.dll_charact, info.machine, info.contains_code, info.image_flags, info.loader_flags, info.header_size, info.file_size, info.checksum ); - dump_cpu_type( ",cpu=", &info.cpu ); + dump_client_cpu( ",cpu=", &info.cpu ); fputc( '}', stderr ); remove_data( size ); } @@ -1247,7 +1247,7 @@ static void dump_new_process_request( const struct new_process_request *req ) fprintf( stderr, ", socket_fd=%d", req->socket_fd ); fprintf( stderr, ", exe_file=%04x", req->exe_file ); fprintf( stderr, ", access=%08x", req->access ); - dump_cpu_type( ", cpu=", &req->cpu ); + dump_client_cpu( ", cpu=", &req->cpu ); fprintf( stderr, ", info_size=%u", req->info_size ); dump_varargs_object_attributes( ", objattr=", cur_size ); dump_varargs_startup_info( ", info=", min(cur_size,req->info_size) ); @@ -1265,7 +1265,7 @@ static void dump_exec_process_request( const struct exec_process_request *req ) { fprintf( stderr, " socket_fd=%d", req->socket_fd ); fprintf( stderr, ", exe_file=%04x", req->exe_file ); - dump_cpu_type( ", cpu=", &req->cpu ); + dump_client_cpu( ", cpu=", &req->cpu ); } static void dump_get_new_process_info_request( const struct get_new_process_info_request *req ) @@ -1327,7 +1327,7 @@ static void dump_init_thread_request( const struct init_thread_request *req ) dump_uint64( ", entry=", &req->entry ); fprintf( stderr, ", reply_fd=%d", req->reply_fd ); fprintf( stderr, ", wait_fd=%d", req->wait_fd ); - dump_cpu_type( ", cpu=", &req->cpu ); + dump_client_cpu( ", cpu=", &req->cpu ); } static void dump_init_thread_reply( const struct init_thread_reply *req ) @@ -1379,7 +1379,7 @@ static void dump_get_process_info_reply( const struct get_process_info_reply *re dump_timeout( ", end_time=", &req->end_time ); fprintf( stderr, ", exit_code=%d", req->exit_code ); fprintf( stderr, ", priority=%d", req->priority ); - dump_cpu_type( ", cpu=", &req->cpu ); + dump_client_cpu( ", cpu=", &req->cpu ); fprintf( stderr, ", debugger_present=%d", req->debugger_present ); fprintf( stderr, ", debug_children=%d", req->debug_children ); } diff --git a/tools/make_requests b/tools/make_requests index 405e130..faeabe5 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -51,7 +51,7 @@ my %formats = "irp_params_t" => [ 32, 8, "&dump_irp_params" ], "luid_t" => [ 8, 4, "&dump_luid" ], "ioctl_code_t" => [ 4, 4, "&dump_ioctl_code" ], - "cpu_type_t" => [ 4, 4, "&dump_cpu_type" ], + "client_cpu_t" => [ 4, 4, "&dump_client_cpu" ], "hw_input_t" => [ 32, 8, "&dump_hw_input" ], );

1 0

Jacek Caban : server: Remove no longer needed break_process.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: b0ae02bea6c905ba989bf2cc2c91130ea7eb53bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0ae02bea6c905ba989bf2cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 5 13:24:29 2019 +0200 server: Remove no longer needed break_process. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 22 ---------------------- server/process.h | 1 - server/thread.c | 35 ----------------------------------- server/thread.h | 2 -- server/trace.c | 1 - 5 files changed, 61 deletions(-) diff --git a/server/process.c b/server/process.c index beaa686..b67bd88 100644 --- a/server/process.c +++ b/server/process.c @@ -1041,28 +1041,6 @@ void kill_debugged_processes( struct thread *debugger, int exit_code ) } -/* trigger a breakpoint event in a given process */ -void break_process( struct process *process ) -{ - struct thread *thread; - - suspend_process( process ); - - LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) - { - if (thread->context) /* inside an exception event already */ - { - break_thread( thread ); - goto done; - } - } - if ((thread = get_process_first_thread( process ))) thread->debug_break = 1; - else set_error( STATUS_ACCESS_DENIED ); -done: - resume_process( process ); -} - - /* detach a debugger from all its debuggees */ void detach_debugged_processes( struct thread *debugger ) { diff --git a/server/process.h b/server/process.h index d9d29f0..20503a2 100644 --- a/server/process.h +++ b/server/process.h @@ -135,7 +135,6 @@ extern void resume_process( struct process *process ); extern void kill_process( struct process *process, int violent_death ); extern void kill_console_processes( struct thread *renderer, int exit_code ); extern void kill_debugged_processes( struct thread *debugger, int exit_code ); -extern void break_process( struct process *process ); extern void detach_debugged_processes( struct thread *debugger ); extern struct process_snapshot *process_snap( int *count ); extern void enum_processes( int (*cb)(struct process*, void*), void *user); diff --git a/server/thread.c b/server/thread.c index 63eea94..d5742a1 100644 --- a/server/thread.c +++ b/server/thread.c @@ -185,7 +185,6 @@ static inline void init_thread_structure( struct thread *thread ) thread->entry_point = 0; thread->debug_ctx = NULL; thread->debug_event = NULL; - thread->debug_break = 0; thread->system_regs = 0; thread->queue = NULL; thread->wait = NULL; @@ -1198,39 +1197,6 @@ static unsigned int get_context_system_regs( enum cpu_type cpu ) return 0; } -/* trigger a breakpoint event in a given thread */ -void break_thread( struct thread *thread ) -{ - debug_event_t data; - - assert( thread->context ); - - memset( &data, 0, sizeof(data) ); - data.exception.first = 1; - data.exception.exc_code = STATUS_BREAKPOINT; - data.exception.flags = EXCEPTION_CONTINUABLE; - switch (thread->context->cpu) - { - case CPU_x86: - data.exception.address = thread->context->ctl.i386_regs.eip; - break; - case CPU_x86_64: - data.exception.address = thread->context->ctl.x86_64_regs.rip; - break; - case CPU_POWERPC: - data.exception.address = thread->context->ctl.powerpc_regs.iar; - break; - case CPU_ARM: - data.exception.address = thread->context->ctl.arm_regs.pc; - break; - case CPU_ARM64: - data.exception.address = thread->context->ctl.arm64_regs.pc; - break; - } - generate_debug_event( thread, EXCEPTION_DEBUG_EVENT, &data ); - thread->debug_break = 0; -} - /* take a snapshot of currently running threads */ struct thread_snapshot *thread_snap( int *count ) { @@ -1829,7 +1795,6 @@ DECL_HANDLER(set_suspend_context) memcpy( current->suspend_context, get_req_data(), sizeof(context_t) ); current->suspend_context->flags = 0; /* to keep track of what is modified */ current->context = current->suspend_context; - if (current->debug_break) break_thread( current ); } } diff --git a/server/thread.h b/server/thread.h index 8bf7d73..40f0eec 100644 --- a/server/thread.h +++ b/server/thread.h @@ -56,7 +56,6 @@ struct thread struct list mutex_list; /* list of currently owned mutexes */ struct debug_ctx *debug_ctx; /* debugger context if this thread is a debugger */ struct debug_event *debug_event; /* debug event being sent to debugger */ - int debug_break; /* debug breakpoint pending? */ unsigned int system_regs; /* which system regs have been set */ struct msg_queue *queue; /* message queue */ struct thread_wait *wait; /* current wait condition if sleeping */ @@ -120,7 +119,6 @@ extern int wake_thread_queue_entry( struct wait_queue_entry *entry ); extern int add_queue( struct object *obj, struct wait_queue_entry *entry ); extern void remove_queue( struct object *obj, struct wait_queue_entry *entry ); extern void kill_thread( struct thread *thread, int violent_death ); -extern void break_thread( struct thread *thread ); extern void wake_up( struct object *obj, int max ); extern int thread_queue_apc( struct process *process, struct thread *thread, struct object *owner, const apc_call_t *call_data ); extern void thread_cancel_apc( struct thread *thread, struct object *owner, enum apc_type type ); diff --git a/server/trace.c b/server/trace.c index af87a5d..3213490 100644 --- a/server/trace.c +++ b/server/trace.c @@ -5510,7 +5510,6 @@ static const struct { "ALIAS_EXISTS", STATUS_ALIAS_EXISTS }, { "BAD_DEVICE_TYPE", STATUS_BAD_DEVICE_TYPE }, { "BAD_IMPERSONATION_LEVEL", STATUS_BAD_IMPERSONATION_LEVEL }, - { "BREAKPOINT", STATUS_BREAKPOINT }, { "BUFFER_OVERFLOW", STATUS_BUFFER_OVERFLOW }, { "BUFFER_TOO_SMALL", STATUS_BUFFER_TOO_SMALL }, { "CANCELLED", STATUS_CANCELLED },

1 0

Jacek Caban : kernel32: Use DebugBreakProcess in DebugActiveProcess.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: 4ee629a3bafb1408a4e567908fef949837a39f10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ee629a3bafb1408a4e56790… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 5 13:24:14 2019 +0200 kernel32: Use DebugBreakProcess in DebugActiveProcess. Fixes attaching to a process with VS remote debugger. It expects the first break exception address to be DbgBreakPoint. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/debugger.c | 6 ++++++ dlls/kernel32/tests/debugger.c | 2 -- server/debugger.c | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index d439475..d78b083 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -199,6 +199,7 @@ BOOL WINAPI ContinueDebugEvent( */ BOOL WINAPI DebugActiveProcess( DWORD pid ) { + HANDLE process; BOOL ret; SERVER_START_REQ( debug_process ) { @@ -207,6 +208,11 @@ BOOL WINAPI DebugActiveProcess( DWORD pid ) ret = !wine_server_call_err( req ); } SERVER_END_REQ; + if (!ret) return FALSE; + if (!(process = OpenProcess( PROCESS_CREATE_THREAD, FALSE, pid ))) return FALSE; + ret = DebugBreakProcess( process ); + NtClose( process ); + if (!ret) DebugActiveProcessStop( pid ); return ret; } diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index ff25c21..bc12ea8 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -308,7 +308,6 @@ static void process_attach_events(struct debugger_context *ctx) ok(ctx->dll_cnt > 2, "dll_cnt = %d\n", ctx->dll_cnt); /* a new thread is created and it executes DbgBreakPoint, which causes the exception */ - todo_wine ok(ctx->ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx->ev.dwDebugEventCode); if (ctx->ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT) { @@ -320,7 +319,6 @@ static void process_attach_events(struct debugger_context *ctx) ok(ctx->ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx->ev.dwDebugEventCode); ok(ctx->ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %x\n", ctx->ev.u.Exception.ExceptionRecord.ExceptionCode); - todo_wine ok(ctx->ev.u.Exception.ExceptionRecord.ExceptionAddress == pDbgBreakPoint, "ExceptionAddres != DbgBreakPoint\n"); /* flush debug events */ diff --git a/server/debugger.c b/server/debugger.c index 7c64cbb..99e50aa 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -638,7 +638,6 @@ DECL_HANDLER(debug_process) else if (debugger_attach( process, current )) { generate_startup_debug_events( process, 0 ); - break_process( process ); resume_process( process ); } release_object( process );

1 0

Jacek Caban : winternl.h: Remove inline DbgBreakPoint version.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: dc3623f57f072a7e1ab16156e9ee7555bd7a103e URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc3623f57f072a7e1ab16156… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 5 13:22:48 2019 +0200 winternl.h: Remove inline DbgBreakPoint version. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 1 - include/winternl.h | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 691e1c0..ff25c21 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -998,7 +998,6 @@ static void test_debug_children(char *name, DWORD flag, BOOL debug_child) ok(ctx.ev.dwThreadId == last_thread, "unexpected thread\n"); ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %x\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionCode); - todo_wine_if(sizeof(void*) == 4) ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == pDbgBreakPoint, "ExceptionAddres != DbgBreakPoint\n"); ret = SetEvent(event_attach); diff --git a/include/winternl.h b/include/winternl.h index 2a9ca65..49eedaf 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2285,17 +2285,12 @@ typedef LONG (CALLBACK *PRTL_EXCEPTION_FILTER)(PEXCEPTION_POINTERS); * Function declarations */ -#if defined(__i386__) && defined(__GNUC__) -static inline void WINAPI DbgBreakPoint(void) { __asm__ __volatile__("int3"); } -static inline void WINAPI DbgUserBreakPoint(void) { __asm__ __volatile__("int3"); } -#else /* __i386__ && __GNUC__ */ -NTSYSAPI void WINAPI DbgBreakPoint(void); -NTSYSAPI void WINAPI DbgUserBreakPoint(void); -#endif /* __i386__ && __GNUC__ */ +NTSYSAPI void WINAPI DbgBreakPoint(void); NTSYSAPI NTSTATUS WINAPIV DbgPrint(LPCSTR fmt, ...); NTSYSAPI NTSTATUS WINAPIV DbgPrintEx(ULONG iComponentId, ULONG Level, LPCSTR fmt, ...); NTSYSAPI NTSTATUS WINAPI DbgUiIssueRemoteBreakin(HANDLE); NTSYSAPI void WINAPI DbgUiRemoteBreakin(void*); +NTSYSAPI void WINAPI DbgUserBreakPoint(void); NTSYSAPI NTSTATUS WINAPI LdrAccessResource(HMODULE,const IMAGE_RESOURCE_DATA_ENTRY*,void**,PULONG); NTSYSAPI NTSTATUS WINAPI LdrAddRefDll(ULONG,HMODULE); NTSYSAPI NTSTATUS WINAPI LdrFindResourceDirectory_U(HMODULE,const LDR_RESOURCE_INFO*,ULONG,const IMAGE_RESOURCE_DIRECTORY**);

1 0

Jacek Caban : kernel32: Reimplement DebugBreakProcess on top of DbgUiIssueRemoteBreakin.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: a679f965c8154c46338bbef9a3a0ab3ec7e785a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a679f965c8154c46338bbef9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 5 13:21:37 2019 +0200 kernel32: Reimplement DebugBreakProcess on top of DbgUiIssueRemoteBreakin. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/debugger.c | 18 ++++++------------ dlls/kernel32/tests/debugger.c | 3 +-- include/wine/server_protocol.h | 19 +------------------ server/debugger.c | 14 -------------- server/protocol.def | 8 -------- server/request.h | 6 ------ server/trace.c | 13 ------------- 7 files changed, 8 insertions(+), 73 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index e2ee1fd..d439475 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -407,21 +407,15 @@ void WINAPI DebugBreak(void) * * True if successful. */ -BOOL WINAPI DebugBreakProcess(HANDLE hProc) +BOOL WINAPI DebugBreakProcess(HANDLE process) { - BOOL ret, self; + NTSTATUS status; - TRACE("(%p)\n", hProc); + TRACE("(%p)\n", process); - SERVER_START_REQ( debug_break ) - { - req->handle = wine_server_obj_handle( hProc ); - ret = !wine_server_call_err( req ); - self = ret && reply->self; - } - SERVER_END_REQ; - if (self) DbgBreakPoint(); - return ret; + status = DbgUiIssueRemoteBreakin(process); + if (status) SetLastError(RtlNtStatusToDosError(status)); + return !status; } diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 3f73f2e..691e1c0 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -988,7 +988,6 @@ static void test_debug_children(char *name, DWORD flag, BOOL debug_child) /* a new thread, which executes DbgDebugBreak, is created */ next_event(&ctx, 2000); - todo_wine ok(ctx.ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); last_thread = ctx.ev.dwThreadId; @@ -999,7 +998,7 @@ static void test_debug_children(char *name, DWORD flag, BOOL debug_child) ok(ctx.ev.dwThreadId == last_thread, "unexpected thread\n"); ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %x\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionCode); - todo_wine + todo_wine_if(sizeof(void*) == 4) ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == pDbgBreakPoint, "ExceptionAddres != DbgBreakPoint\n"); ret = SetEvent(event_attach); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index f67b09a..d26f27c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2552,20 +2552,6 @@ struct debug_process_reply -struct debug_break_request -{ - struct request_header __header; - obj_handle_t handle; -}; -struct debug_break_reply -{ - struct reply_header __header; - int self; - char __pad_12[4]; -}; - - - struct set_debugger_kill_on_exit_request { struct request_header __header; @@ -5901,7 +5887,6 @@ enum request REQ_get_exception_status, REQ_continue_debug_event, REQ_debug_process, - REQ_debug_break, REQ_set_debugger_kill_on_exit, REQ_read_process_memory, REQ_write_process_memory, @@ -6206,7 +6191,6 @@ union generic_request struct get_exception_status_request get_exception_status_request; struct continue_debug_event_request continue_debug_event_request; struct debug_process_request debug_process_request; - struct debug_break_request debug_break_request; struct set_debugger_kill_on_exit_request set_debugger_kill_on_exit_request; struct read_process_memory_request read_process_memory_request; struct write_process_memory_request write_process_memory_request; @@ -6509,7 +6493,6 @@ union generic_reply struct get_exception_status_reply get_exception_status_reply; struct continue_debug_event_reply continue_debug_event_reply; struct debug_process_reply debug_process_reply; - struct debug_break_reply debug_break_reply; struct set_debugger_kill_on_exit_reply set_debugger_kill_on_exit_reply; struct read_process_memory_reply read_process_memory_reply; struct write_process_memory_reply write_process_memory_reply; @@ -6708,6 +6691,6 @@ union generic_reply struct resume_process_reply resume_process_reply; }; -#define SERVER_PROTOCOL_VERSION 586 +#define SERVER_PROTOCOL_VERSION 587 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/debugger.c b/server/debugger.c index 38fe788..7c64cbb 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -714,20 +714,6 @@ DECL_HANDLER(get_exception_status) } } -/* simulate a breakpoint in a process */ -DECL_HANDLER(debug_break) -{ - struct process *process; - - reply->self = 0; - if ((process = get_process_from_handle( req->handle, PROCESS_SET_INFORMATION /*FIXME*/ ))) - { - if (process != current->process) break_process( process ); - else reply->self = 1; - release_object( process ); - } -} - /* set debugger kill on exit flag */ DECL_HANDLER(set_debugger_kill_on_exit) { diff --git a/server/protocol.def b/server/protocol.def index 58a7545..b80a6d6 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1940,14 +1940,6 @@ enum char_info_mode @END -/* Simulate a breakpoint in a process */ -@REQ(debug_break) - obj_handle_t handle; /* process handle */ -@REPLY - int self; /* was it the caller itself? */ -@END - - /* Set debugger kill on exit flag */ @REQ(set_debugger_kill_on_exit) int kill_on_exit; /* 0=detach/1=kill debuggee when debugger dies */ diff --git a/server/request.h b/server/request.h index 1858b41..57f8937 100644 --- a/server/request.h +++ b/server/request.h @@ -213,7 +213,6 @@ DECL_HANDLER(queue_exception_event); DECL_HANDLER(get_exception_status); DECL_HANDLER(continue_debug_event); DECL_HANDLER(debug_process); -DECL_HANDLER(debug_break); DECL_HANDLER(set_debugger_kill_on_exit); DECL_HANDLER(read_process_memory); DECL_HANDLER(write_process_memory); @@ -517,7 +516,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_get_exception_status, (req_handler)req_continue_debug_event, (req_handler)req_debug_process, - (req_handler)req_debug_break, (req_handler)req_set_debugger_kill_on_exit, (req_handler)req_read_process_memory, (req_handler)req_write_process_memory, @@ -1376,10 +1374,6 @@ C_ASSERT( sizeof(struct continue_debug_event_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct debug_process_request, pid) == 12 ); C_ASSERT( FIELD_OFFSET(struct debug_process_request, attach) == 16 ); C_ASSERT( sizeof(struct debug_process_request) == 24 ); -C_ASSERT( FIELD_OFFSET(struct debug_break_request, handle) == 12 ); -C_ASSERT( sizeof(struct debug_break_request) == 16 ); -C_ASSERT( FIELD_OFFSET(struct debug_break_reply, self) == 8 ); -C_ASSERT( sizeof(struct debug_break_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_debugger_kill_on_exit_request, kill_on_exit) == 12 ); C_ASSERT( sizeof(struct set_debugger_kill_on_exit_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct read_process_memory_request, handle) == 12 ); diff --git a/server/trace.c b/server/trace.c index d4a35e4..af87a5d 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2447,16 +2447,6 @@ static void dump_debug_process_request( const struct debug_process_request *req fprintf( stderr, ", attach=%d", req->attach ); } -static void dump_debug_break_request( const struct debug_break_request *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); -} - -static void dump_debug_break_reply( const struct debug_break_reply *req ) -{ - fprintf( stderr, " self=%d", req->self ); -} - static void dump_set_debugger_kill_on_exit_request( const struct set_debugger_kill_on_exit_request *req ) { fprintf( stderr, " kill_on_exit=%d", req->kill_on_exit ); @@ -4708,7 +4698,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_exception_status_request, (dump_func)dump_continue_debug_event_request, (dump_func)dump_debug_process_request, - (dump_func)dump_debug_break_request, (dump_func)dump_set_debugger_kill_on_exit_request, (dump_func)dump_read_process_memory_request, (dump_func)dump_write_process_memory_request, @@ -5009,7 +4998,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_exception_status_reply, NULL, NULL, - (dump_func)dump_debug_break_reply, NULL, (dump_func)dump_read_process_memory_reply, NULL, @@ -5310,7 +5298,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "get_exception_status", "continue_debug_event", "debug_process", - "debug_break", "set_debugger_kill_on_exit", "read_process_memory", "write_process_memory",

1 0

Jacek Caban : ntdll: Implement DbgUiIssueRemoteBreakin.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: 7f9faf10c747dc2abe4289f7aece92eef3ab48ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f9faf10c747dc2abe4289f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 5 13:21:14 2019 +0200 ntdll: Implement DbgUiIssueRemoteBreakin. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/misc.c | 8 -------- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/process.c | 29 +++++++++++++++++++++++++++++ dlls/ntdll/server.c | 5 +++++ include/wine/server_protocol.h | 10 ++++++++-- include/winternl.h | 2 ++ server/protocol.def | 8 +++++++- server/thread.c | 1 + server/trace.c | 6 ++++++ 9 files changed, 59 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 9b29c88..152b2cf 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -584,14 +584,6 @@ ULONG WINAPIV EtwTraceMessage( TRACEHANDLE handle, ULONG flags, LPGUID guid, USH return ret; } -/*********************************************************************** - * DbgUiRemoteBreakin (NTDLL.@) - */ -void WINAPI DbgUiRemoteBreakin( void *arg ) -{ - FIXME("stub\n"); -} - NTSTATUS WINAPI NtCreateLowBoxToken(HANDLE *token_handle, HANDLE existing_token_handle, ACCESS_MASK desired_access, OBJECT_ATTRIBUTES *object_attributes, SID *package_sid, ULONG capability_count, SID_AND_ATTRIBUTES *capabilities, ULONG handle_count, HANDLE *handle) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 299bfac..323d5ea 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -39,7 +39,7 @@ @ stub DbgUiConvertStateChangeStructure # @ stub DbgUiDebugActiveProcess # @ stub DbgUiGetThreadDebugObject -# @ stub DbgUiIssueRemoteBreakin +@ stdcall DbgUiIssueRemoteBreakin(long) @ stdcall DbgUiRemoteBreakin(ptr) # @ stub DbgUiSetThreadDebugObject # @ stub DbgUiStopDebugging diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index c1570a5..8b9d5bc 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -1365,3 +1365,32 @@ done: RtlFreeHeap( GetProcessHeap(), 0, unixdir ); return status; } + +/*********************************************************************** + * DbgUiRemoteBreakin (NTDLL.@) + */ +void WINAPI DbgUiRemoteBreakin( void *arg ) +{ + TRACE( "\n" ); + if (NtCurrentTeb()->Peb->BeingDebugged) DbgBreakPoint(); + RtlExitUserThread( STATUS_SUCCESS ); +} + +/*********************************************************************** + * DbgUiIssueRemoteBreakin (NTDLL.@) + */ +NTSTATUS WINAPI DbgUiIssueRemoteBreakin( HANDLE process ) +{ + apc_call_t call; + apc_result_t result; + NTSTATUS status; + + TRACE( "(%p)\n", process ); + + memset( &call, 0, sizeof(call) ); + + call.type = APC_BREAK_PROCESS; + status = server_queue_process_apc( process, &call, &result ); + if (status) return status; + return result.break_process.status; +} diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 8274f11..b82fbc5 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -575,6 +575,11 @@ BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) else result->create_thread.status = STATUS_INVALID_PARAMETER; break; } + case APC_BREAK_PROCESS: + result->type = APC_BREAK_PROCESS; + result->break_process.status = RtlCreateUserThread( NtCurrentProcess(), NULL, FALSE, NULL, 0, 0, + DbgUiRemoteBreakin, NULL, NULL, NULL ); + break; default: server_protocol_error( "get_apc_request: bad type %d\n", call->type ); break; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 15ad91c..f67b09a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -449,7 +449,8 @@ enum apc_type APC_VIRTUAL_UNLOCK, APC_MAP_VIEW, APC_UNMAP_VIEW, - APC_CREATE_THREAD + APC_CREATE_THREAD, + APC_BREAK_PROCESS }; typedef union @@ -638,6 +639,11 @@ typedef union thread_id_t tid; obj_handle_t handle; } create_thread; + struct + { + enum apc_type type; + unsigned int status; + } break_process; } apc_result_t; enum irp_type @@ -6702,6 +6708,6 @@ union generic_reply struct resume_process_reply resume_process_reply; }; -#define SERVER_PROTOCOL_VERSION 585 +#define SERVER_PROTOCOL_VERSION 586 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/include/winternl.h b/include/winternl.h index b87aa22..2a9ca65 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2294,6 +2294,8 @@ NTSYSAPI void WINAPI DbgUserBreakPoint(void); #endif /* __i386__ && __GNUC__ */ NTSYSAPI NTSTATUS WINAPIV DbgPrint(LPCSTR fmt, ...); NTSYSAPI NTSTATUS WINAPIV DbgPrintEx(ULONG iComponentId, ULONG Level, LPCSTR fmt, ...); +NTSYSAPI NTSTATUS WINAPI DbgUiIssueRemoteBreakin(HANDLE); +NTSYSAPI void WINAPI DbgUiRemoteBreakin(void*); NTSYSAPI NTSTATUS WINAPI LdrAccessResource(HMODULE,const IMAGE_RESOURCE_DATA_ENTRY*,void**,PULONG); NTSYSAPI NTSTATUS WINAPI LdrAddRefDll(ULONG,HMODULE); NTSYSAPI NTSTATUS WINAPI LdrFindResourceDirectory_U(HMODULE,const LDR_RESOURCE_INFO*,ULONG,const IMAGE_RESOURCE_DIRECTORY**); diff --git a/server/protocol.def b/server/protocol.def index e450388..58a7545 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -465,7 +465,8 @@ enum apc_type APC_VIRTUAL_UNLOCK, APC_MAP_VIEW, APC_UNMAP_VIEW, - APC_CREATE_THREAD + APC_CREATE_THREAD, + APC_BREAK_PROCESS }; typedef union @@ -654,6 +655,11 @@ typedef union thread_id_t tid; /* thread id */ obj_handle_t handle; /* handle to new thread */ } create_thread; + struct + { + enum apc_type type; /* APC_BREAK_PROCESS */ + unsigned int status; /* status returned by call */ + } break_process; } apc_result_t; enum irp_type diff --git a/server/thread.c b/server/thread.c index 7057c9b..63eea94 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1643,6 +1643,7 @@ DECL_HANDLER(queue_apc) } break; case APC_CREATE_THREAD: + case APC_BREAK_PROCESS: process = get_process_from_handle( req->handle, PROCESS_CREATE_THREAD ); break; default: diff --git a/server/trace.c b/server/trace.c index 8d3de65..d4a35e4 100644 --- a/server/trace.c +++ b/server/trace.c @@ -218,6 +218,9 @@ static void dump_apc_call( const char *prefix, const apc_call_t *call ) dump_uint64( ",commit=", &call->create_thread.commit ); fprintf( stderr, ",suspend=%u", call->create_thread.suspend ); break; + case APC_BREAK_PROCESS: + fprintf( stderr, "APC_BREAK_PROCESS" ); + break; default: fprintf( stderr, "type=%u", call->type ); break; @@ -298,6 +301,9 @@ static void dump_apc_result( const char *prefix, const apc_result_t *result ) get_status_name( result->create_thread.status ), result->create_thread.tid, result->create_thread.handle ); break; + case APC_BREAK_PROCESS: + fprintf( stderr, "APC_BREAK_PROCESS,status=%s", get_status_name( result->break_process.status ) ); + break; default: fprintf( stderr, "type=%u", result->type ); break;

1 0

Hans Leidekker : wbemprox: Add support for CIM_REFERENCE.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: b37eb06ba35b6afbfc04b4255d36d7d3024febdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b37eb06ba35b6afbfc04b425… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 5 11:14:50 2019 +0200 wbemprox: Add support for CIM_REFERENCE. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/class.c | 9 ++++++--- dlls/wbemprox/query.c | 2 ++ dlls/wbemprox/table.c | 6 +++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 6cb065b..042ebeb 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -238,7 +238,7 @@ void destroy_array( struct array *array, CIMTYPE type ) UINT i, size; if (!array) return; - if (type == CIM_STRING || type == CIM_DATETIME) + if (type == CIM_STRING || type == CIM_DATETIME || type == CIM_REFERENCE) { size = get_type_size( type ); for (i = 0; i < array->count; i++) heap_free( *(WCHAR **)((char *)array->ptr + i * size) ); @@ -255,8 +255,9 @@ static void destroy_record( struct record *record ) release_table( record->table ); for (i = 0; i < record->count; i++) { - if (record->fields[i].type == CIM_STRING || record->fields[i].type == CIM_DATETIME) - heap_free( record->fields[i].u.sval ); + if (record->fields[i].type == CIM_STRING || + record->fields[i].type == CIM_DATETIME || + record->fields[i].type == CIM_REFERENCE) heap_free( record->fields[i].u.sval ); else if (record->fields[i].type & CIM_FLAG_ARRAY) destroy_array( record->fields[i].u.aval, record->fields[i].type & CIM_TYPE_MASK ); } @@ -357,6 +358,7 @@ static HRESULT record_get_value( const struct record *record, UINT index, VARIAN { case CIM_STRING: case CIM_DATETIME: + case CIM_REFERENCE: if (!vartype) vartype = VT_BSTR; V_BSTR( var ) = SysAllocString( record->fields[index].u.sval ); break; @@ -418,6 +420,7 @@ static HRESULT record_set_value( struct record *record, UINT index, VARIANT *var { case CIM_STRING: case CIM_DATETIME: + case CIM_REFERENCE: record->fields[index].u.sval = (WCHAR *)(INT_PTR)val; return S_OK; case CIM_SINT16: diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index f7b5163..080329c 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -745,6 +745,7 @@ VARTYPE to_vartype( CIMTYPE type ) { case CIM_BOOLEAN: return VT_BOOL; case CIM_STRING: + case CIM_REFERENCE: case CIM_DATETIME: return VT_BSTR; case CIM_SINT8: return VT_I1; case CIM_UINT8: return VT_UI1; @@ -878,6 +879,7 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR if (!vartype) vartype = VT_BOOL; break; case CIM_STRING: + case CIM_REFERENCE: case CIM_DATETIME: if (val) { diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 261104b..79c7eb1 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -64,6 +64,7 @@ UINT get_type_size( CIMTYPE type ) case CIM_UINT64: return sizeof(INT64); case CIM_DATETIME: + case CIM_REFERENCE: case CIM_STRING: return sizeof(WCHAR *); default: @@ -110,6 +111,7 @@ HRESULT get_value( const struct table *table, UINT row, UINT column, LONGLONG *v *val = *(const int *)ptr; break; case CIM_DATETIME: + case CIM_REFERENCE: case CIM_STRING: *val = (INT_PTR)*(const WCHAR **)ptr; break; @@ -173,6 +175,7 @@ BSTR get_value_bstr( const struct table *table, UINT row, UINT column ) else return SysAllocString( falseW ); case CIM_DATETIME: + case CIM_REFERENCE: case CIM_STRING: if (!val) return NULL; len = lstrlenW( (const WCHAR *)(INT_PTR)val ) + 2; @@ -220,6 +223,7 @@ HRESULT set_value( const struct table *table, UINT row, UINT column, LONGLONG va switch (table->columns[column].type & COL_TYPE_MASK) { case CIM_DATETIME: + case CIM_REFERENCE: case CIM_STRING: *(WCHAR **)ptr = (WCHAR *)(INT_PTR)val; break; @@ -287,7 +291,7 @@ void free_row_values( const struct table *table, UINT row ) if (!(table->columns[i].type & COL_FLAG_DYNAMIC)) continue; type = table->columns[i].type & COL_TYPE_MASK; - if (type == CIM_STRING || type == CIM_DATETIME) + if (type == CIM_STRING || type == CIM_DATETIME || type == CIM_REFERENCE) { if (get_value( table, row, i, &val ) == S_OK) heap_free( (void *)(INT_PTR)val ); }

1 0

Hans Leidekker : bcrypt: Ignore the size parameter in BCRYPT_CHAINING_MODE setters.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: 691fcebf3d0d403fe6817821fbe28bc25f983051 URL: https://source.winehq.org/git/wine.git/?a=commit;h=691fcebf3d0d403fe6817821… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 5 10:38:01 2019 +0200 bcrypt: Ignore the size parameter in BCRYPT_CHAINING_MODE setters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47432 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 8 ++++---- dlls/bcrypt/gnutls.c | 8 ++++---- dlls/bcrypt/macos.c | 6 +++--- dlls/bcrypt/tests/bcrypt.c | 21 ++++++++++++++++++++- 4 files changed, 31 insertions(+), 12 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 3846341..79660c1 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -518,24 +518,24 @@ static NTSTATUS set_alg_property( struct algorithm *alg, const WCHAR *prop, UCHA case ALG_ID_AES: if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) { - if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB, size )) + if (!strcmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB )) { alg->mode = MODE_ID_ECB; return STATUS_SUCCESS; } - else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) + else if (!strcmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC )) { alg->mode = MODE_ID_CBC; return STATUS_SUCCESS; } - else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM, size )) + else if (!strcmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM )) { alg->mode = MODE_ID_GCM; return STATUS_SUCCESS; } else { - FIXME( "unsupported mode %s\n", debugstr_wn( (WCHAR *)value, size ) ); + FIXME( "unsupported mode %s\n", debugstr_w((WCHAR *)value) ); return STATUS_NOT_IMPLEMENTED; } } diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 2a7e37e..583a0e4 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -369,24 +369,24 @@ NTSTATUS key_set_property( struct key *key, const WCHAR *prop, UCHAR *value, ULO { if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) { - if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB, size )) + if (!strcmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB )) { key->u.s.mode = MODE_ID_ECB; return STATUS_SUCCESS; } - else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) + else if (!strcmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC )) { key->u.s.mode = MODE_ID_CBC; return STATUS_SUCCESS; } - else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM, size )) + else if (!strcmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM )) { key->u.s.mode = MODE_ID_GCM; return STATUS_SUCCESS; } else { - FIXME( "unsupported mode %s\n", debugstr_wn( (WCHAR *)value, size ) ); + FIXME( "unsupported mode %s\n", debugstr_w((WCHAR *)value) ); return STATUS_NOT_IMPLEMENTED; } } diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c index cc99637..df79f3e 100644 --- a/dlls/bcrypt/macos.c +++ b/dlls/bcrypt/macos.c @@ -48,19 +48,19 @@ NTSTATUS key_set_property( struct key *key, const WCHAR *prop, UCHAR *value, ULO { if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) { - if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB, size )) + if (!strcmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB )) { key->u.s.mode = MODE_ID_ECB; return STATUS_SUCCESS; } - else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) + else if (!strcmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC )) { key->u.s.mode = MODE_ID_CBC; return STATUS_SUCCESS; } else { - FIXME( "unsupported mode %s\n", debugstr_wn( (WCHAR *)value, size ) ); + FIXME( "unsupported mode %s\n", debugstr_w((WCHAR *)value) ); return STATUS_NOT_IMPLEMENTED; } } diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 11e274b..b8678a5 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -639,7 +639,7 @@ static void test_aes(void) ok(key_lengths.dwIncrement == 64, "Expected 64, got %d\n", key_lengths.dwIncrement); memcpy(mode, BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM)); - ret = pBCryptSetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode), 0); + ret = pBCryptSetProperty(alg, BCRYPT_CHAINING_MODE, mode, 0, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); size = 0; @@ -694,6 +694,25 @@ static void test_BCryptGenerateSymmetricKey(void) sizeof(BCRYPT_CHAIN_MODE_CBC), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + size = 0; + memset(mode, 0, sizeof(mode)); + ret = pBCryptGetProperty(key, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_CBC), "got %s\n", wine_dbgstr_w((const WCHAR *)mode)); + ok(size == 64, "got %u\n", size); + + ret = pBCryptSetProperty(key, BCRYPT_CHAINING_MODE, (UCHAR *)BCRYPT_CHAIN_MODE_ECB, 0, 0); + ok(ret == STATUS_SUCCESS || broken(ret == STATUS_NOT_SUPPORTED) /* < Win 8 */, "got %08x\n", ret); + if (ret == STATUS_SUCCESS) + { + size = 0; + memset(mode, 0, sizeof(mode)); + ret = pBCryptGetProperty(key, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_ECB), "got %s\n", wine_dbgstr_w((const WCHAR *)mode)); + ok(size == 64, "got %u\n", size); + } + ret = pBCryptSetProperty(key, BCRYPT_CHAINING_MODE, (UCHAR *)BCRYPT_CHAIN_MODE_CBC, sizeof(BCRYPT_CHAIN_MODE_CBC), 0); ok(ret == STATUS_SUCCESS || broken(ret == STATUS_NOT_SUPPORTED) /* < Win 8 */, "got %08x\n", ret);

1 0

Nikolay Sivov : mf: Fix method name.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: d2c518e546c39e0104497706cf9226ade6dab3c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2c518e546c39e0104497706… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 5 12:40:03 2019 +0300 mf: Fix method name. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 1a36933..1276f2e 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -681,7 +681,7 @@ static HRESULT WINAPI session_rate_support_GetFastestRate(IMFRateSupport *iface, return E_NOTIMPL; } -static HRESULT WINAPI session_rate_support_IsSupported(IMFRateSupport *iface, BOOL thin, float rate, +static HRESULT WINAPI session_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, float *nearest_supported_rate) { FIXME("%p, %d, %f, %p.\n", iface, thin, rate, nearest_supported_rate); @@ -696,7 +696,7 @@ static const IMFRateSupportVtbl session_rate_support_vtbl = session_rate_support_Release, session_rate_support_GetSlowestRate, session_rate_support_GetFastestRate, - session_rate_support_IsSupported, + session_rate_support_IsRateSupported, }; static HRESULT WINAPI session_rate_control_QueryInterface(IMFRateControl *iface, REFIID riid, void **obj)

1 0

Nikolay Sivov : mf: Return clock rate as session rate.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: 7e765f960b10dec2f81a9d045e8ae166cb474e37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e765f960b10dec2f81a9d04… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 5 12:40:02 2019 +0300 mf: Return clock rate as session rate. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 15 +++++++++++++-- dlls/mf/tests/mf.c | 48 +++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 52 insertions(+), 11 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index c43e6d2..1a36933 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -68,6 +68,7 @@ struct media_session LONG refcount; IMFMediaEventQueue *event_queue; IMFPresentationClock *clock; + IMFRateControl *clock_rate_control; struct list topologies; enum session_state state; CRITICAL_SECTION cs; @@ -315,6 +316,8 @@ static ULONG WINAPI mfsession_Release(IMFMediaSession *iface) IMFMediaEventQueue_Release(session->event_queue); if (session->clock) IMFPresentationClock_Release(session->clock); + if (session->clock_rate_control) + IMFRateControl_Release(session->clock_rate_control); DeleteCriticalSection(&session->cs); heap_free(session); } @@ -723,9 +726,11 @@ static HRESULT WINAPI session_rate_control_SetRate(IMFRateControl *iface, BOOL t static HRESULT WINAPI session_rate_control_GetRate(IMFRateControl *iface, BOOL *thin, float *rate) { - FIXME("%p, %p, %p.\n", iface, thin, rate); + struct media_session *session = impl_session_from_IMFRateControl(iface); - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, thin, rate); + + return IMFRateControl_GetRate(session->clock_rate_control, thin, rate); } static const IMFRateControlVtbl session_rate_control_vtbl = @@ -769,6 +774,12 @@ HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **ses if (FAILED(hr = MFCreatePresentationClock(&object->clock))) goto failed; + if (FAILED(hr = IMFPresentationClock_QueryInterface(object->clock, &IID_IMFRateControl, + (void **)&object->clock_rate_control))) + { + goto failed; + } + *session = &object->IMFMediaSession_iface; return S_OK; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 0d66da1..0a8a88d 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -951,14 +951,16 @@ static void test_session_events(IMFMediaSession *session) static void test_media_session(void) { + IMFRateControl *rate_control, *rate_control2; MFCLOCK_PROPERTIES clock_props; + IMFRateSupport *rate_support; IMFMediaSession *session; - IMFRateControl *rc, *rc2; - IMFRateSupport *rs; IMFGetService *gs; IMFClock *clock; IUnknown *unk; HRESULT hr; + float rate; + BOOL thin; hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); ok(hr == S_OK, "Startup failure, hr %#x.\n", hr); @@ -972,29 +974,57 @@ static void test_media_session(void) hr = IMFMediaSession_QueryInterface(session, &IID_IMFGetService, (void **)&gs); ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); - hr = IMFGetService_GetService(gs, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rs); + hr = IMFGetService_GetService(gs, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support); ok(hr == S_OK, "Failed to get rate support interface, hr %#x.\n", hr); - hr = IMFGetService_GetService(gs, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, (void **)&rc); + hr = IMFGetService_GetService(gs, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, (void **)&rate_control); ok(hr == S_OK, "Failed to get rate control interface, hr %#x.\n", hr); - hr = IMFRateSupport_QueryInterface(rs, &IID_IMFMediaSession, (void **)&unk); + hr = IMFRateSupport_QueryInterface(rate_support, &IID_IMFMediaSession, (void **)&unk); ok(hr == S_OK, "Failed to get session interface, hr %#x.\n", hr); ok(unk == (IUnknown *)session, "Unexpected pointer.\n"); IUnknown_Release(unk); + hr = IMFRateControl_GetRate(rate_control, NULL, NULL); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + + rate = 0.0f; + hr = IMFRateControl_GetRate(rate_control, NULL, &rate); + ok(hr == S_OK, "Failed to get playback rate, hr %#x.\n", hr); + ok(rate == 1.0f, "Unexpected rate %f.\n", rate); + + hr = IMFRateControl_GetRate(rate_control, &thin, NULL); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + + thin = TRUE; + rate = 0.0f; + hr = IMFRateControl_GetRate(rate_control, &thin, &rate); + ok(hr == S_OK, "Failed to get playback rate, hr %#x.\n", hr); + ok(!thin, "Unexpected thinning.\n"); + ok(rate == 1.0f, "Unexpected rate %f.\n", rate); + hr = IMFMediaSession_GetClock(session, &clock); ok(hr == S_OK, "Failed to get clock, hr %#x.\n", hr); - hr = IMFClock_QueryInterface(clock, &IID_IMFRateControl, (void **)&rc2); + hr = IMFClock_QueryInterface(clock, &IID_IMFRateControl, (void **)&rate_control2); ok(hr == S_OK, "Failed to get rate control, hr %#x.\n", hr); - IMFRateControl_Release(rc2); + + rate = 0.0f; + hr = IMFRateControl_GetRate(rate_control2, NULL, &rate); + ok(hr == S_OK, "Failed to get clock rate, hr %#x.\n", hr); + ok(rate == 1.0f, "Unexpected rate %f.\n", rate); + + hr = IMFRateControl_SetRate(rate_control, FALSE, 1.5f); +todo_wine + ok(hr == S_OK, "Failed to set rate, hr %#x.\n", hr); + + IMFRateControl_Release(rate_control2); hr = IMFClock_GetProperties(clock, &clock_props); ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); - IMFRateControl_Release(rc); - IMFRateSupport_Release(rs); + IMFRateControl_Release(rate_control); + IMFRateSupport_Release(rate_support); IMFGetService_Release(gs);

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2019