April 2019 - Wine-Devel - list.winehq.org

[PATCH] setupapi: Add DECLSPEC_HOTPATCH to SetupDiEnumDeviceInfo().
by Andrey Gusev April 11, 2019

April 11, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46971 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 45f4df7346..7440465748 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1707,7 +1707,7 @@ BOOL WINAPI SetupDiDeleteDeviceInterfaceData(HDEVINFO devinfo, SP_DEVICE_INTERFA /*********************************************************************** * SetupDiEnumDeviceInfo (SETUPAPI.@) */ -BOOL WINAPI SetupDiEnumDeviceInfo(HDEVINFO devinfo, DWORD index, SP_DEVINFO_DATA *device_data) +BOOL WINAPI DECLSPEC_HOTPATCH SetupDiEnumDeviceInfo(HDEVINFO devinfo, DWORD index, SP_DEVINFO_DATA *device_data) { struct DeviceInfoSet *set; struct device *device; -- 2.20.1

1 0

[PATCH] packager: Prefer native version.
by Vijay Kiran Kamuju April 11, 2019

April 11, 2019

From: Sebastian Lackner <sebastian(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43472 From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/packager/packager_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index d70202b73b2..1ce184a5c74 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -675,6 +675,8 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) TRACE("(%p, %u, %p)\n", instance, reason, reserved); switch(reason){ + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: g_instance = instance; DisableThreadLibraryCalls(instance); -- 2.17.0

4 4

[PATCH] ntdll: Add NtSuspendProcess()/NtResumeProcess() implementation.
by Nikolay Sivov April 11, 2019

April 11, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/process.c | 24 ++++++++++++++++++++---- include/wine/server_protocol.h | 32 +++++++++++++++++++++++++++++++- server/process.c | 24 ++++++++++++++++++++++++ server/protocol.def | 12 ++++++++++++ server/request.h | 8 ++++++++ server/trace.c | 16 ++++++++++++++++ 6 files changed, 111 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 6c6c427372..573a7a771d 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -763,8 +763,16 @@ NTSTATUS WINAPI NtOpenProcess(PHANDLE handle, ACCESS_MASK access, */ NTSTATUS WINAPI NtResumeProcess( HANDLE handle ) { - FIXME("stub: %p\n", handle); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS ret; + + SERVER_START_REQ( resume_process ) + { + req->handle = wine_server_obj_handle( handle ); + ret = wine_server_call( req ); + } + SERVER_END_REQ; + + return ret; } /****************************************************************************** @@ -773,8 +781,16 @@ NTSTATUS WINAPI NtResumeProcess( HANDLE handle ) */ NTSTATUS WINAPI NtSuspendProcess( HANDLE handle ) { - FIXME("stub: %p\n", handle); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS ret; + + SERVER_START_REQ( suspend_process ) + { + req->handle = wine_server_obj_handle( handle ); + ret = wine_server_call( req ); + } + SERVER_END_REQ; + + return ret; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 88b933cc14..c3d1bb6a59 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5742,6 +5742,30 @@ struct terminate_job_reply }; + +struct suspend_process_request +{ + struct request_header __header; + obj_handle_t handle; +}; +struct suspend_process_reply +{ + struct reply_header __header; +}; + + + +struct resume_process_request +{ + struct request_header __header; + obj_handle_t handle; +}; +struct resume_process_reply +{ + struct reply_header __header; +}; + + enum request { REQ_new_process, @@ -6040,6 +6064,8 @@ enum request REQ_set_job_limits, REQ_set_job_completion_port, REQ_terminate_job, + REQ_suspend_process, + REQ_resume_process, REQ_NB_REQUESTS }; @@ -6343,6 +6369,8 @@ union generic_request struct set_job_limits_request set_job_limits_request; struct set_job_completion_port_request set_job_completion_port_request; struct terminate_job_request terminate_job_request; + struct suspend_process_request suspend_process_request; + struct resume_process_request resume_process_request; }; union generic_reply { @@ -6644,8 +6672,10 @@ union generic_reply struct set_job_limits_reply set_job_limits_reply; struct set_job_completion_port_reply set_job_completion_port_reply; struct terminate_job_reply terminate_job_reply; + struct suspend_process_reply suspend_process_reply; + struct resume_process_reply resume_process_reply; }; -#define SERVER_PROTOCOL_VERSION 578 +#define SERVER_PROTOCOL_VERSION 579 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.c b/server/process.c index 473d3b1a27..01555b37a9 100644 --- a/server/process.c +++ b/server/process.c @@ -1705,3 +1705,27 @@ DECL_HANDLER(set_job_completion_port) release_object( job ); } + +/* suspend a process */ +DECL_HANDLER(suspend_process) +{ + struct process *process; + + if ((process = get_process_from_handle( req->handle, PROCESS_SUSPEND_RESUME ))) + { + suspend_process( process ); + release_object( process ); + } +} + +/* resume a process */ +DECL_HANDLER(resume_process) +{ + struct process *process; + + if ((process = get_process_from_handle( req->handle, PROCESS_SUSPEND_RESUME ))) + { + resume_process( process ); + release_object( process ); + } +} diff --git a/server/protocol.def b/server/protocol.def index b6ad514463..8a3ca0a28f 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3909,3 +3909,15 @@ struct handle_info obj_handle_t handle; /* handle to the job */ int status; /* process exit code */ @END + + +/* Suspend a process */ +(a)REQ(suspend_process) + obj_handle_t handle; /* process handle */ +(a)END + + +/* Resume a process */ +(a)REQ(resume_process) + obj_handle_t handle; /* process handle */ +(a)END diff --git a/server/request.h b/server/request.h index a3e95137e1..a21252c7a6 100644 --- a/server/request.h +++ b/server/request.h @@ -408,6 +408,8 @@ DECL_HANDLER(process_in_job); DECL_HANDLER(set_job_limits); DECL_HANDLER(set_job_completion_port); DECL_HANDLER(terminate_job); +DECL_HANDLER(suspend_process); +DECL_HANDLER(resume_process); #ifdef WANT_REQUEST_HANDLERS @@ -710,6 +712,8 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_set_job_limits, (req_handler)req_set_job_completion_port, (req_handler)req_terminate_job, + (req_handler)req_suspend_process, + (req_handler)req_resume_process, }; C_ASSERT( sizeof(affinity_t) == 8 ); @@ -2436,6 +2440,10 @@ C_ASSERT( sizeof(struct set_job_completion_port_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct terminate_job_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct terminate_job_request, status) == 16 ); C_ASSERT( sizeof(struct terminate_job_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct suspend_process_request, handle) == 12 ); +C_ASSERT( sizeof(struct suspend_process_request) == 16 ); +C_ASSERT( FIELD_OFFSET(struct resume_process_request, handle) == 12 ); +C_ASSERT( sizeof(struct resume_process_request) == 16 ); #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/trace.c b/server/trace.c index d4d0c3eb8d..5c6325a257 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4582,6 +4582,16 @@ static void dump_terminate_job_request( const struct terminate_job_request *req fprintf( stderr, ", status=%d", req->status ); } +static void dump_suspend_process_request( const struct suspend_process_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); +} + +static void dump_resume_process_request( const struct resume_process_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); +} + static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, (dump_func)dump_exec_process_request, @@ -4879,6 +4889,8 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_set_job_limits_request, (dump_func)dump_set_job_completion_port_request, (dump_func)dump_terminate_job_request, + (dump_func)dump_suspend_process_request, + (dump_func)dump_resume_process_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -5178,6 +5190,8 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, NULL, NULL, + NULL, + NULL, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -5477,6 +5491,8 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "set_job_limits", "set_job_completion_port", "terminate_job", + "suspend_process", + "resume_process", }; static const struct -- 2.20.1

2 1

[PATCH] ntoskrnl.exe: Use proper device handle in DevicePropertyPhysicalDeviceObjectName implementation.
by Jacek Caban April 11, 2019

April 11, 2019

Spotted by Huw Davies. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

2 1

[PATCH] ntdll: Fix handling of DOS style device paths in RtlIsDosDeviceName_U
by Lukas Platz April 11, 2019

April 11, 2019

Use existing general processing code instead of hardcoding a less general result. Signed-off-by: Lukas Platz <lukas.platz(a)bluescan.de> --- dlls/ntdll/path.c | 6 ++---- dlls/ntdll/tests/path.c | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 11483fabba..c41dc81a20 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -268,7 +268,6 @@ DOS_PATHNAME_TYPE WINAPI RtlDetermineDosPathNameType_U( PCWSTR path ) */ ULONG WINAPI RtlIsDosDeviceName_U( PCWSTR dos_name ) { - static const WCHAR consoleW[] = {'\\','\\','.','\\','C','O','N',0}; static const WCHAR auxW[] = {'A','U','X'}; static const WCHAR comW[] = {'C','O','M'}; static const WCHAR conW[] = {'C','O','N'}; @@ -284,9 +283,8 @@ ULONG WINAPI RtlIsDosDeviceName_U( PCWSTR dos_name ) case UNC_PATH: return 0; case DEVICE_PATH: - if (!strcmpiW( dos_name, consoleW )) - return MAKELONG( sizeof(conW), 4 * sizeof(WCHAR) ); /* 4 is length of \\.\ prefix */ - return 0; + start = dos_name + 4; /* skip device path prefix */ + break; case ABSOLUTE_DRIVE_PATH: case RELATIVE_DRIVE_PATH: start = dos_name + 2; /* skip drive letter */ diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 195dea37e8..e744c10649 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -114,6 +114,7 @@ static void test_RtlIsDosDeviceName_U(void) { "\\\\.\\CON", 8, 6, TRUE }, /* fails on win8 */ { "\\\\.\\con", 8, 6, TRUE }, /* fails on win8 */ { "\\\\.\\CON2", 0, 0 }, + { "\\\\.\\com3", 8, 8 }, { "", 0, 0 }, { "\\\\foo\\nul", 0, 0 }, { "c:\\nul:", 6, 6 }, -- 2.18.0

2 1

[PATCH v2] ddraw: Improve d3d_device7_GetClipStatus() stub.
by Paul Gofman April 11, 2019

April 11, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43411 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: - removed redundant explicit cast; - got word "stub" back into the message. dlls/ddraw/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 003ce1d2e4..054e2dccc9 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3916,7 +3916,20 @@ static HRESULT WINAPI d3d_device2_SetClipStatus(IDirect3DDevice2 *iface, D3DCLIP *****************************************************************************/ static HRESULT WINAPI d3d_device7_GetClipStatus(IDirect3DDevice7 *iface, D3DCLIPSTATUS *clip_status) { - FIXME("iface %p, clip_status %p stub!\n", iface, clip_status); + struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + struct wined3d_viewport vp; + + FIXME("iface %p, clip_status %p stub.\n", iface, clip_status); + + wined3d_device_get_viewports(device->wined3d_device, NULL, &vp); + clip_status->minx = vp.x; + clip_status->maxx = vp.x + vp.width; + clip_status->miny = vp.y; + clip_status->maxy = vp.y + vp.height; + clip_status->minz = 0.0f; + clip_status->maxz = 0.0f; + clip_status->dwFlags = D3DCLIPSTATUS_EXTENTS2; + clip_status->dwStatus = 0; return D3D_OK; } -- 2.20.1

3 2

[PATCH] jscript: Support type conversion to VT_UI2.
by Jacek Caban April 11, 2019

April 11, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jsutils.c | 8 ++++++++ dlls/jscript/tests/caller.c | 3 +++ 2 files changed, 11 insertions(+)

1 0

[PATCH] ddraw: Improve d3d_device7_GetClipStatus() stub.
by Paul Gofman April 11, 2019

April 11, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43411 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ddraw/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 003ce1d2e4..57fe19ecf7 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3916,7 +3916,20 @@ static HRESULT WINAPI d3d_device2_SetClipStatus(IDirect3DDevice2 *iface, D3DCLIP *****************************************************************************/ static HRESULT WINAPI d3d_device7_GetClipStatus(IDirect3DDevice7 *iface, D3DCLIPSTATUS *clip_status) { - FIXME("iface %p, clip_status %p stub!\n", iface, clip_status); + struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + struct wined3d_viewport vp; + + FIXME("iface %p, clip_status %p.\n", iface, clip_status); + + wined3d_device_get_viewports(device->wined3d_device, NULL, &vp); + clip_status->minx = (float)vp.x; + clip_status->maxx = (float)(vp.x + vp.width); + clip_status->miny = (float)vp.y; + clip_status->maxy = (float)(vp.y + vp.height); + clip_status->minz = 0.0f; + clip_status->maxz = 0.0f; + clip_status->dwFlags = D3DCLIPSTATUS_EXTENTS2; + clip_status->dwStatus = 0; return D3D_OK; } -- 2.20.1

3 2

[PATCH 1/2] dbgeng: Keep a list of processes to attach to.
by Nikolay Sivov April 11, 2019

April 11, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dbgeng/dbgeng.c | 39 ++++++- dlls/dbgeng/tests/dbgeng.c | 231 +++++++++++++++++++++++++++++++++++++ include/dbgeng.h | 89 ++++++++++++++ 3 files changed, 357 insertions(+), 2 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 75ae4505db..9aed1b0506 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -31,9 +31,17 @@ #include "wine/debug.h" #include "wine/heap.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(dbgeng); +struct target_process +{ + struct list entry; + unsigned int pid; + unsigned int attach_flags; +}; + struct debug_client { IDebugClient IDebugClient_iface; @@ -42,6 +50,7 @@ struct debug_client IDebugControl2 IDebugControl2_iface; LONG refcount; ULONG engine_options; + struct list targets; }; static struct debug_client *impl_from_IDebugClient(IDebugClient *iface) @@ -113,11 +122,19 @@ static ULONG STDMETHODCALLTYPE debugclient_Release(IDebugClient *iface) { struct debug_client *debug_client = impl_from_IDebugClient(iface); ULONG refcount = InterlockedDecrement(&debug_client->refcount); + struct target_process *cur, *cur2; TRACE("%p, %d.\n", debug_client, refcount); if (!refcount) + { + LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &debug_client->targets, struct target_process, entry) + { + list_remove(&cur->entry); + heap_free(cur); + } heap_free(debug_client); + } return refcount; } @@ -195,9 +212,26 @@ static HRESULT STDMETHODCALLTYPE debugclient_GetRunningProcessDescription(IDebug static HRESULT STDMETHODCALLTYPE debugclient_AttachProcess(IDebugClient *iface, ULONG64 server, ULONG pid, ULONG flags) { - FIXME("%p, %s, %u, %#x stub.\n", iface, wine_dbgstr_longlong(server), pid, flags); + struct debug_client *debug_client = impl_from_IDebugClient(iface); + struct target_process *process; - return E_NOTIMPL; + TRACE("%p, %s, %u, %#x.\n", iface, wine_dbgstr_longlong(server), pid, flags); + + if (server) + { + FIXME("Remote debugging is not supported.\n"); + return E_NOTIMPL; + } + + if (!(process = heap_alloc(sizeof(*process)))) + return E_OUTOFMEMORY; + + process->pid = pid; + process->attach_flags = flags; + + list_add_head(&debug_client->targets, &process->entry); + + return S_OK; } static HRESULT STDMETHODCALLTYPE debugclient_CreateProcess(IDebugClient *iface, ULONG64 server, char *cmdline, @@ -2142,6 +2176,7 @@ HRESULT WINAPI DebugCreate(REFIID riid, void **obj) debug_client->IDebugSymbols_iface.lpVtbl = &debugsymbolsvtbl; debug_client->IDebugControl2_iface.lpVtbl = &debugcontrolvtbl; debug_client->refcount = 1; + list_init(&debug_client->targets); unk = (IUnknown *)&debug_client->IDebugClient_iface; diff --git a/dlls/dbgeng/tests/dbgeng.c b/dlls/dbgeng/tests/dbgeng.c index a76b25a128..f5d50c899a 100644 --- a/dlls/dbgeng/tests/dbgeng.c +++ b/dlls/dbgeng/tests/dbgeng.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include <string.h> #include "windef.h" @@ -99,7 +100,237 @@ static void test_engine_options(void) control->lpVtbl->Release(control); } +static HRESULT WINAPI event_callbacks_QueryInterface(IDebugEventCallbacks *iface, REFIID riid, void **out) +{ + if (IsEqualIID(riid, &IID_IDebugEventCallbacks) || + IsEqualIID(riid, &IID_IUnknown)) + { + *out = iface; + iface->lpVtbl->AddRef(iface); + return S_OK; + } + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI event_callbacks_AddRef(IDebugEventCallbacks *iface) +{ + return 2; +} + +static ULONG WINAPI event_callbacks_Release(IDebugEventCallbacks *iface) +{ + return 1; +} + +static HRESULT WINAPI event_callbacks_GetInterestMask(IDebugEventCallbacks *iface, ULONG *mask) +{ + *mask = ~0u; + return S_OK; +} + +static HRESULT WINAPI event_callbacks_Breakpoint(IDebugEventCallbacks *iface, PDEBUG_BREAKPOINT breakpoint) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI event_callbacks_Exception(IDebugEventCallbacks *iface, EXCEPTION_RECORD64 *exception, + ULONG first_chance) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI event_callbacks_CreateThread(IDebugEventCallbacks *iface, ULONG64 handle, ULONG64 data_offset, + ULONG64 start_offset) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI event_callbacks_ExitThread(IDebugEventCallbacks *iface, ULONG exit_code) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI event_callbacks_CreateProcess(IDebugEventCallbacks *iface, ULONG64 image_handle, ULONG64 handle, + ULONG64 base_offset, ULONG module_size, const char *module_name, const char *image_name, ULONG checksum, + ULONG timedatestamp, ULONG64 initial_thread_handle, ULONG64 thread_data_offset, ULONG64 start_offset) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI event_callbacks_ExitProcess(IDebugEventCallbacks *iface, ULONG exit_code) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI event_callbacks_LoadModule(IDebugEventCallbacks *iface, ULONG64 image_handle, + ULONG64 base_offset, ULONG module_size, const char *module_name, const char *image_name, ULONG checksum, + ULONG timedatestamp) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI event_callbacks_UnloadModule(IDebugEventCallbacks *iface, const char *image_basename, + ULONG64 base_offset) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI event_callbacks_SystemError(IDebugEventCallbacks *iface, ULONG error, ULONG level) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI event_callbacks_SessionStatus(IDebugEventCallbacks *iface, ULONG status) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI event_callbacks_ChangeDebuggeeState(IDebugEventCallbacks *iface, ULONG flags, ULONG64 argument) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI event_callbacks_ChangeEngineState(IDebugEventCallbacks *iface, ULONG flags, ULONG64 argument) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI event_callbacks_ChangeSymbolState(IDebugEventCallbacks *iface, ULONG flags, ULONG64 argument) + +{ + return E_NOTIMPL; +} + +static const IDebugEventCallbacksVtbl event_callbacks_vtbl = +{ + event_callbacks_QueryInterface, + event_callbacks_AddRef, + event_callbacks_Release, + event_callbacks_GetInterestMask, + event_callbacks_Breakpoint, + event_callbacks_Exception, + event_callbacks_CreateThread, + event_callbacks_ExitThread, + event_callbacks_CreateProcess, + event_callbacks_ExitProcess, + event_callbacks_LoadModule, + event_callbacks_UnloadModule, + event_callbacks_SystemError, + event_callbacks_SessionStatus, + event_callbacks_ChangeDebuggeeState, + event_callbacks_ChangeEngineState, + event_callbacks_ChangeSymbolState, +}; + +static const char *event_name = "dbgeng_test_event"; + +static void test_attach(void) +{ + IDebugEventCallbacks event_callbacks = { &event_callbacks_vtbl }; + PROCESS_INFORMATION info; + char path_name[MAX_PATH]; + IDebugControl *control; + IDebugClient *client; + STARTUPINFOA startup; + BOOL is_debugged; + HANDLE event; + char **argv; + HRESULT hr; + BOOL ret; + + hr = DebugCreate(&IID_IDebugClient, (void **)&client); + ok(hr == S_OK, "Failed to create engine object, hr %#x.\n", hr); + + hr = client->lpVtbl->QueryInterface(client, &IID_IDebugControl, (void **)&control); + ok(hr == S_OK, "Failed to get interface pointer, hr %#x.\n", hr); + + hr = client->lpVtbl->SetEventCallbacks(client, &event_callbacks); +todo_wine + ok(hr == S_OK, "Failed to set event callbacks, hr %#x.\n", hr); + + event = CreateEventA(NULL, FALSE, FALSE, event_name); + ok(event != NULL, "Failed to create event.\n"); + + winetest_get_mainargs(&argv); + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + sprintf(path_name, "%s dbgeng target", argv[0]); + ret = CreateProcessA(NULL, path_name, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info), + ok(ret, "Failed to create target process.\n"); + + is_debugged = TRUE; + CheckRemoteDebuggerPresent(info.hProcess, &is_debugged); + ok(!is_debugged, "Unexpected mode.\n"); + + /* Non-invasive mode. */ + hr = client->lpVtbl->AttachProcess(client, 0, info.dwProcessId, DEBUG_ATTACH_NONINVASIVE); + ok(hr == S_OK, "Failed to attach to process, hr %#x.\n", hr); + + is_debugged = TRUE; + ret = CheckRemoteDebuggerPresent(info.hProcess, &is_debugged); + ok(ret, "Failed to check target status.\n"); + ok(!is_debugged, "Unexpected mode.\n"); + + hr = control->lpVtbl->WaitForEvent(control, 0, INFINITE); +todo_wine + ok(hr == S_OK, "Waiting for event failed, hr %#x.\n", hr); + + is_debugged = TRUE; + ret = CheckRemoteDebuggerPresent(info.hProcess, &is_debugged); + ok(ret, "Failed to check target status.\n"); + ok(!is_debugged, "Unexpected mode.\n"); + + hr = client->lpVtbl->DetachProcesses(client); +todo_wine + ok(hr == S_OK, "Failed to detach, hr %#x.\n", hr); + + hr = client->lpVtbl->EndSession(client, DEBUG_END_ACTIVE_DETACH); +todo_wine + ok(hr == S_OK, "Failed to end session, hr %#x.\n", hr); + + SetEvent(event); + + winetest_wait_child_process(info.hProcess); + + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + + CloseHandle(event); + + client->lpVtbl->Release(client); + control->lpVtbl->Release(control); +} + +static void target_proc(void) +{ + HANDLE event = OpenEventA(SYNCHRONIZE, FALSE, event_name); + + ok(event != NULL, "Failed to open event handle.\n"); + + for (;;) + { + if (WaitForSingleObject(event, 100) == WAIT_OBJECT_0) + break; + } + + CloseHandle(event); +} + START_TEST(dbgeng) { + char **argv; + int argc; + + argc = winetest_get_mainargs(&argv); + + if (argc >= 3 && !strcmp(argv[2], "target")) + { + target_proc(); + return; + } + test_engine_options(); + test_attach(); } diff --git a/include/dbgeng.h b/include/dbgeng.h index 8c5c78c07f..3b7ff2be4f 100644 --- a/include/dbgeng.h +++ b/include/dbgeng.h @@ -73,6 +73,95 @@ DEFINE_GUID(IID_IDebugSystemObjects3, 0xe9676e2f, 0xe286, 0x4ea3, 0xb0, 0xf9 #define DEBUG_ATTACH_INVASIVE_RESUME_PROCESS 0x00000010 #define DEBUG_ATTACH_NONINVASIVE_ALLOW_PARTIAL 0x00000020 +/* EndSession() flags */ +#define DEBUG_END_PASSIVE 0x00000000 +#define DEBUG_END_ACTIVE_TERMINATE 0x00000001 +#define DEBUG_END_ACTIVE_DETACH 0x00000002 +#define DEBUG_END_REENTRANT 0x00000003 +#define DEBUG_END_DISCONNECT 0x00000004 + +/* ChangeEngineState() flags */ +#define DEBUG_CES_CURRENT_THREAD 0x00000001 +#define DEBUG_CES_EFFECTIVE_PROCESSOR 0x00000002 +#define DEBUG_CES_BREAKPOINTS 0x00000004 +#define DEBUG_CES_CODE_LEVEL 0x00000008 +#define DEBUG_CES_EXECUTION_STATUS 0x00000010 +#define DEBUG_CES_ENGINE_OPTIONS 0x00000020 +#define DEBUG_CES_LOG_FILE 0x00000040 +#define DEBUG_CES_RADIX 0x00000080 +#define DEBUG_CES_EVENT_FILTERS 0x00000100 +#define DEBUG_CES_PROCESS_OPTIONS 0x00000200 +#define DEBUG_CES_EXTENSIONS 0x00000400 +#define DEBUG_CES_SYSTEMS 0x00000800 +#define DEBUG_CES_ASSEMBLY_OPTIONS 0x00001000 +#define DEBUG_CES_EXPRESSION_SYNTAX 0x00002000 +#define DEBUG_CES_TEXT_REPLACEMENTS 0x00004000 +#define DEBUG_CES_ALL 0xffffffff + +#define DEBUG_STATUS_NO_CHANGE 0 +#define DEBUG_STATUS_GO 1 +#define DEBUG_STATUS_GO_HANDLED 2 +#define DEBUG_STATUS_GO_NOT_HANDLED 3 +#define DEBUG_STATUS_STEP_OVER 4 +#define DEBUG_STATUS_STEP_INTO 5 +#define DEBUG_STATUS_BREAK 6 +#define DEBUG_STATUS_NO_DEBUGGEE 7 +#define DEBUG_STATUS_STEP_BRANCH 8 +#define DEBUG_STATUS_IGNORE_EVENT 9 +#define DEBUG_STATUS_RESTART_REQUESTED 10 +#define DEBUG_STATUS_REVERSE_GO 11 +#define DEBUG_STATUS_REVERSE_STEP_BRANCH 12 +#define DEBUG_STATUS_REVERSE_STEP_OVER 13 +#define DEBUG_STATUS_REVERSE_STEP_INTO 14 +#define DEBUG_STATUS_OUT_OF_SYNC 15 +#define DEBUG_STATUS_WAIT_INPUT 16 +#define DEBUG_STATUS_TIMEOUT 17 +#define DEBUG_STATUS_MASK 0x1f + +/* ChangeSymbolState() flags */ +#define DEBUG_CSS_LOADS 0x00000001 +#define DEBUG_CSS_UNLOADS 0x00000002 +#define DEBUG_CSS_SCOPE 0x00000004 +#define DEBUG_CSS_PATHS 0x00000008 +#define DEBUG_CSS_SYMBOL_OPTIONS 0x00000010 +#define DEBUG_CSS_TYPE_OPTIONS 0x00000020 +#define DEBUG_CSS_COLLAPSE_CHILDREN 0x00000040 +#define DEBUG_CSS_ALL 0xffffffff + +/* SessionStatus() flags */ +#define DEBUG_SESSION_ACTIVE 0x00000000 +#define DEBUG_SESSION_END_SESSION_ACTIVE_TERMINATE 0x00000001 +#define DEBUG_SESSION_END_SESSION_ACTIVE_DETACH 0x00000002 +#define DEBUG_SESSION_END_SESSION_PASSIVE 0x00000003 +#define DEBUG_SESSION_END 0x00000004 +#define DEBUG_SESSION_REBOOT 0x00000005 +#define DEBUG_SESSION_HIBERNATE 0x00000006 +#define DEBUG_SESSION_FAILURE 0x00000007 + +/* ChangeDebuggeeState() flags */ +#define DEBUG_CDS_REGISTERS 0x00000001 +#define DEBUG_CDS_DATA 0x00000002 +#define DEBUG_CDS_REFRESH 0x00000004 +#define DEBUG_CDS_ALL 0xffffffff + +#define DEBUG_CDS_REFRESH_EVALUATE 1 +#define DEBUG_CDS_REFRESH_EXECUTE 2 +#define DEBUG_CDS_REFRESH_EXECUTECOMMANDFILE 3 +#define DEBUG_CDS_REFRESH_ADDBREAKPOINT 4 +#define DEBUG_CDS_REFRESH_REMOVEBREAKPOINT 5 +#define DEBUG_CDS_REFRESH_WRITEVIRTUAL 6 +#define DEBUG_CDS_REFRESH_WRITEVIRTUALUNCACHED 7 +#define DEBUG_CDS_REFRESH_WRITEPHYSICAL 8 +#define DEBUG_CDS_REFRESH_WRITEPHYSICAL2 9 +#define DEBUG_CDS_REFRESH_SETVALUE 10 +#define DEBUG_CDS_REFRESH_SETVALUE2 11 +#define DEBUG_CDS_REFRESH_SETSCOPE 12 +#define DEBUG_CDS_REFRESH_SETSCOPEFRAMEBYINDEX 13 +#define DEBUG_CDS_REFRESH_SETSCOPEFROMJITDEBUGINFO 14 +#define DEBUG_CDS_REFRESH_SETSCOPEFROMSTOREDEVENT 15 +#define DEBUG_CDS_REFRESH_INLINESTEP 16 +#define DEBUG_CDS_REFRESH_INLINESTEP_PSEUDO 17 + typedef struct _DEBUG_MODULE_PARAMETERS { ULONG64 Base; -- 2.20.1

1 1

[PATCH] mshtml.idl: Add more SVG interfaces.
by Jacek Caban April 11, 2019

April 11, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtmdid.h | 53 +++++++ include/mshtml.idl | 388 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 441 insertions(+)

1 0