July 2019 - Wine-Commits - list.winehq.org

Paul Gofman : wined3d: Fixup 3D sampler when sampling 2D texture for PS models 2 and 3.
by Alexandre Julliard July 5, 2019

July 5, 2019

Module: wine Branch: master Commit: 34eeb0a877e7a5bb3be77e0ea0d9cd4e08862f34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34eeb0a877e7a5bb3be77e0e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jul 3 17:56:41 2019 +0300 wined3d: Fixup 3D sampler when sampling 2D texture for PS models 2 and 3. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/shader.c | 37 +++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 6 ++++-- 3 files changed, 40 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index ab2d0bb..d786f68 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -25946,7 +25946,7 @@ static void test_mismatched_sample_types(void) { {"2d_2d", (IDirect3DBaseTexture9 **)&tex_2d, &ps_2d, 0x00707070}, {"3d_3d", (IDirect3DBaseTexture9 **)&volume, &ps_3d, 0x00303030}, - {"2d_3d", (IDirect3DBaseTexture9 **)&tex_2d, &ps_3d, 0x00707070, 0x00b2cce5, TRUE}, + {"2d_3d", (IDirect3DBaseTexture9 **)&tex_2d, &ps_3d, 0x00707070, 0x00b2cce5}, {"3d_2d", (IDirect3DBaseTexture9 **)&volume, &ps_2d, 0x00303030, 0x00b2cce5, TRUE, 0x00202020}, }; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 93d33a6..d856fea 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -4003,6 +4003,39 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 } } } + else if (shader->reg_maps.shader_version.major <= 3) + { + for (i = 0; i < shader->limits->sampler; ++i) + { + enum wined3d_shader_resource_type resource_type; + enum wined3d_shader_tex_types tex_type; + + if (!(resource_type = shader->reg_maps.resource_info[i].type)) + continue; + + switch (resource_type) + { + case WINED3D_SHADER_RESOURCE_TEXTURE_3D: + tex_type = WINED3D_SHADER_TEX_3D; + break; + case WINED3D_SHADER_RESOURCE_TEXTURE_CUBE: + tex_type = WINED3D_SHADER_TEX_CUBE; + break; + default: + tex_type = WINED3D_SHADER_TEX_2D; + break; + } + + if ((texture = state->textures[i])) + { + if (texture->resource.type == WINED3D_RTYPE_TEXTURE_2D + && resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_3D + && !(texture->resource.usage & WINED3DUSAGE_LEGACY_CUBEMAP)) + tex_type = WINED3D_SHADER_TEX_2D; + } + args->tex_types |= tex_type << i * WINED3D_PSARGS_TEXTYPE_SHIFT; + } + } if (shader->reg_maps.shader_version.major >= 4) { @@ -4201,7 +4234,7 @@ static HRESULT pixel_shader_init(struct wined3d_shader *shader, struct wined3d_d } enum wined3d_shader_resource_type pixelshader_get_resource_type(const struct wined3d_shader_reg_maps *reg_maps, - unsigned int resource_idx, WORD tex_types) + unsigned int resource_idx, DWORD tex_types) { static enum wined3d_shader_resource_type shader_resource_type_from_shader_tex_types[] = { @@ -4212,7 +4245,7 @@ enum wined3d_shader_resource_type pixelshader_get_resource_type(const struct win unsigned int idx; - if (reg_maps->shader_version.major != 1) + if (reg_maps->shader_version.major > 3) return reg_maps->resource_info[resource_idx].type; if (!reg_maps->resource_info[resource_idx].type) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7cda311..b959a28 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1365,6 +1365,7 @@ enum wined3d_shader_tex_types WINED3D_SHADER_TEX_2D = 0, WINED3D_SHADER_TEX_3D = 1, WINED3D_SHADER_TEX_CUBE = 2, + WINED3D_SHADER_TEX_ERR = 3, }; struct ps_compile_args @@ -1372,8 +1373,8 @@ struct ps_compile_args struct color_fixup_desc color_fixup[WINED3D_MAX_FRAGMENT_SAMPLERS]; enum wined3d_vertex_processing_mode vp_mode; enum wined3d_ffp_ps_fog_mode fog; + DWORD tex_types; /* ps 1 - 3, 16 textures */ WORD tex_transform; /* ps 1.0-1.3, 4 textures */ - WORD tex_types; /* ps 1.0 - 1.4, 6 textures */ WORD srgb_correction; /* Bitmap for NP2 texcoord fixups (16 samplers max currently). D3D9 has a limit of 16 samplers and the fixup is superfluous @@ -1381,6 +1382,7 @@ struct ps_compile_args WORD np2_fixup; WORD shadow; /* WINED3D_MAX_FRAGMENT_SAMPLERS, 16 */ WORD texcoords_initialized; /* WINED3D_MAX_TEXTURES, 8 */ + WORD padding_to_dword; DWORD pointsprite : 1; DWORD flatshading : 1; DWORD alpha_test_func : 3; @@ -4445,7 +4447,7 @@ struct wined3d_shader }; enum wined3d_shader_resource_type pixelshader_get_resource_type(const struct wined3d_shader_reg_maps *reg_maps, - unsigned int resource_idx, WORD tex_types) DECLSPEC_HIDDEN; + unsigned int resource_idx, DWORD tex_types) DECLSPEC_HIDDEN; void find_ps_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, BOOL position_transformed, struct ps_compile_args *args, const struct wined3d_context *context) DECLSPEC_HIDDEN;

1 0

Jacek Caban : winmm: Build with msvcrt.
by Alexandre Julliard July 5, 2019

July 5, 2019

Module: wine Branch: master Commit: f09c0e7c0d2dd263570fe11829fe4c83ca042ac2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f09c0e7c0d2dd263570fe118… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 2 20:00:47 2019 +0200 winmm: Build with msvcrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/Makefile.in | 2 + dlls/winmm/driver.c | 6 +-- dlls/winmm/joystick.c | 8 ---- dlls/winmm/lolvldrv.c | 3 -- dlls/winmm/mci.c | 106 ++++++++++++++++++++++++------------------------- dlls/winmm/waveform.c | 2 +- 6 files changed, 55 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f09c0e7c0d2dd263570f…

1 0

Jacek Caban : winmm: Use condition variable to sleep in timer thread.
by Alexandre Julliard July 5, 2019

July 5, 2019

Module: wine Branch: master Commit: f277ef7e688799dc71f621794f853a5e09678d85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f277ef7e688799dc71f62179… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 2 20:00:31 2019 +0200 winmm: Use condition variable to sleep in timer thread. We have fast condition variable implementation now, so performance should not be a problem. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/time.c | 81 ++++++++++--------------------------------------------- 1 file changed, 14 insertions(+), 67 deletions(-) diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index e055f6b..22c8985 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -20,24 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include <errno.h> #include <time.h> -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#ifdef HAVE_POLL_H -#include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -#include <sys/poll.h> -#endif #include "windef.h" #include "winbase.h" @@ -74,7 +59,7 @@ static CRITICAL_SECTION TIME_cbcrst = { &critsect_debug, -1, 0, 0, 0, 0 }; static HANDLE TIME_hMMTimer; static BOOL TIME_TimeToDie = TRUE; -static int TIME_fdWake[2] = { -1, -1 }; +static CONDITION_VARIABLE TIME_cv; /* link timer at the appropriate spot in the list */ static inline void link_timer( WINE_TIMERENTRY *timer ) @@ -116,8 +101,6 @@ static inline void link_timer( WINE_TIMERENTRY *timer ) #define MMSYSTIME_MININTERVAL (1) #define MMSYSTIME_MAXINTERVAL (65535) -#ifdef HAVE_POLL - /************************************************************************** * TIME_MMSysTimeCallback */ @@ -195,12 +178,8 @@ static int TIME_MMSysTimeCallback(void) */ static DWORD CALLBACK TIME_MMSysTimeThread(LPVOID arg) { - int sleep_time, ret; - char readme[16]; - struct pollfd pfd; - - pfd.fd = TIME_fdWake[0]; - pfd.events = POLLIN; + int sleep_time; + BOOL ret; TRACE("Starting main winmm thread\n"); @@ -214,20 +193,12 @@ static DWORD CALLBACK TIME_MMSysTimeThread(LPVOID arg) if (sleep_time == 0) continue; - LeaveCriticalSection(&WINMM_cs); - ret = poll(&pfd, 1, sleep_time); - EnterCriticalSection(&WINMM_cs); - - if (ret < 0) + ret = SleepConditionVariableCS(&TIME_cv, &WINMM_cs, sleep_time); + if (!ret && GetLastError() != ERROR_TIMEOUT) { - if (errno != EINTR && errno != EAGAIN) - { - ERR("Unexpected error in poll: %s(%d)\n", strerror(errno), errno); - break; - } + ERR("Unexpected error in poll: %s(%d)\n", strerror(errno), errno); + break; } - - while (ret > 0) ret = read(TIME_fdWake[0], readme, sizeof(readme)); } CloseHandle(TIME_hMMTimer); TIME_hMMTimer = NULL; @@ -242,35 +213,15 @@ static DWORD CALLBACK TIME_MMSysTimeThread(LPVOID arg) */ static void TIME_MMTimeStart(void) { + HMODULE mod; TIME_TimeToDie = 0; + if (TIME_hMMTimer) return; - if (TIME_fdWake[0] < 0) { - if (pipe(TIME_fdWake) < 0) { - TIME_fdWake[0] = TIME_fdWake[1] = -1; - ERR("Cannot create pipe: %s\n", strerror(errno)); - } else { - fcntl(TIME_fdWake[0], F_SETFL, O_NONBLOCK); - fcntl(TIME_fdWake[1], F_SETFL, O_NONBLOCK); - } - } - - if (!TIME_hMMTimer) { - HMODULE mod; - GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)TIME_MMSysTimeThread, &mod); - TIME_hMMTimer = CreateThread(NULL, 0, TIME_MMSysTimeThread, mod, 0, NULL); - SetThreadPriority(TIME_hMMTimer, THREAD_PRIORITY_TIME_CRITICAL); - } + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)TIME_MMSysTimeThread, &mod); + TIME_hMMTimer = CreateThread(NULL, 0, TIME_MMSysTimeThread, mod, 0, NULL); + SetThreadPriority(TIME_hMMTimer, THREAD_PRIORITY_TIME_CRITICAL); } -#else /* HAVE_POLL */ - -static void TIME_MMTimeStart(void) -{ - FIXME( "not starting system thread\n" ); -} - -#endif /* HAVE_POLL */ - /************************************************************************** * TIME_MMTimeStop */ @@ -282,8 +233,6 @@ void TIME_MMTimeStop(void) ERR("Timer still active?!\n"); CloseHandle(TIME_hMMTimer); } - close(TIME_fdWake[0]); - close(TIME_fdWake[1]); DeleteCriticalSection(&TIME_cbcrst); } } @@ -312,7 +261,6 @@ MMRESULT WINAPI timeSetEvent(UINT wDelay, UINT wResol, LPTIMECALLBACK lpFunc, WORD wNewID = 0; LPWINE_TIMERENTRY lpNewTimer; LPWINE_TIMERENTRY lpTimer; - const char c = 'c'; TRACE("(%u, %u, %p, %08lX, %04X);\n", wDelay, wResol, lpFunc, dwUser, wFlags); @@ -346,7 +294,7 @@ MMRESULT WINAPI timeSetEvent(UINT wDelay, UINT wResol, LPTIMECALLBACK lpFunc, LeaveCriticalSection(&WINMM_cs); /* Wake the service thread in case there is work to be done */ - write(TIME_fdWake[1], &c, sizeof(c)); + WakeConditionVariable(&TIME_cv); TRACE("=> %u\n", wNewID + 1); @@ -373,9 +321,8 @@ MMRESULT WINAPI timeKillEvent(UINT wID) } } if (list_empty(&timer_list)) { - char c = 'q'; TIME_TimeToDie = 1; - write(TIME_fdWake[1], &c, sizeof(c)); + WakeConditionVariable(&TIME_cv); } LeaveCriticalSection(&WINMM_cs);

1 0

Henri Verbeet : wined3d: Merge wined3d_texture_download_data() and wined3d_texture_gl_download_data().
by Alexandre Julliard July 5, 2019

July 5, 2019

Module: wine Branch: master Commit: 3bc3fce811422818be284941fd4e5225da897b4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bc3fce811422818be284941… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 5 16:26:22 2019 +0430 wined3d: Merge wined3d_texture_download_data() and wined3d_texture_gl_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 174 ++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 2 - 2 files changed, 87 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3bc3fce811422818be28…

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to wined3d_pipeline_statistics_query_end ().
by Alexandre Julliard July 5, 2019

July 5, 2019

Module: wine Branch: master Commit: 7b13749fc8378f8d2e6ef600d9b54f6bfdab3118 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b13749fc8378f8d2e6ef600… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 5 16:26:21 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_pipeline_statistics_query_end(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 08f2e82..d6f7879 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -956,9 +956,9 @@ static BOOL wined3d_pipeline_query_ops_poll(struct wined3d_query *query, DWORD f } static void wined3d_pipeline_statistics_query_end(struct wined3d_pipeline_statistics_query *query, - struct wined3d_context *context) + struct wined3d_context_gl *context_gl) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GL_EXTCALL(glEndQuery(GL_VERTICES_SUBMITTED_ARB)); GL_EXTCALL(glEndQuery(GL_PRIMITIVES_SUBMITTED_ARB)); @@ -990,7 +990,7 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD { if ((context_gl = wined3d_context_gl_reacquire(pq->context_gl))) { - wined3d_pipeline_statistics_query_end(pq, &context_gl->c); + wined3d_pipeline_statistics_query_end(pq, context_gl); } else { @@ -1031,7 +1031,7 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD { if ((context_gl = wined3d_context_gl_reacquire(pq->context_gl))) { - wined3d_pipeline_statistics_query_end(pq, &context_gl->c); + wined3d_pipeline_statistics_query_end(pq, context_gl); context_release(&context_gl->c); poll = TRUE; }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to wined3d_query_destroy_buffer_object ().
by Alexandre Julliard July 5, 2019

July 5, 2019

Module: wine Branch: master Commit: ca35a55637a11f75b48e03d3f2fed8cc47813aac URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca35a55637a11f75b48e03d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 5 16:26:18 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_query_destroy_buffer_object(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index b167737..10ca7d6 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -54,9 +54,9 @@ static void wined3d_query_create_buffer_object(struct wined3d_context_gl *contex query->buffer_object = buffer_object; } -static void wined3d_query_destroy_buffer_object(struct wined3d_context *context, struct wined3d_query *query) +static void wined3d_query_destroy_buffer_object(struct wined3d_context_gl *context_gl, struct wined3d_query *query) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GL_EXTCALL(glDeleteBuffers(1, &query->buffer_object)); checkGLcall("query buffer object destruction"); @@ -93,7 +93,7 @@ static BOOL wined3d_query_buffer_queue_result(struct wined3d_context *context, s if (wined3d_query_buffer_is_valid(query)) wined3d_query_buffer_invalidate(query); else - wined3d_query_destroy_buffer_object(context, query); + wined3d_query_destroy_buffer_object(context_gl, query); } if (!query->buffer_object) @@ -434,8 +434,9 @@ static void wined3d_query_destroy_object(void *object) if (query->buffer_object) { struct wined3d_context *context; + context = context_acquire(query->device, NULL, 0); - wined3d_query_destroy_buffer_object(context, query); + wined3d_query_destroy_buffer_object(wined3d_context_gl(context), query); context_release(context); }

1 0

Jacek Caban : server: Rename cpu_type_t to client_cpu_t.
by Alexandre Julliard July 5, 2019

July 5, 2019

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 July 5, 2019

July 5, 2019

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: Reimplement DebugBreakProcess on top of DbgUiIssueRemoteBreakin.
by Alexandre Julliard July 5, 2019

July 5, 2019

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 */ -(a)REQ(debug_break) - obj_handle_t handle; /* process handle */ -(a)REPLY - int self; /* was it the caller itself? */ -(a)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 July 5, 2019

July 5, 2019

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