February 2021 - Wine-commits

Rémi Bernon : include: Add IWMPGraphCreation interface to wmpservice.idl.
by Alexandre Julliard 01 Feb '21

01 Feb '21

Module: wine Branch: master Commit: 0817bb1789907c70708ed8e43ea1b5c1632aea2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0817bb1789907c70708ed8e4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 1 09:29:28 2021 +0100 include: Add IWMPGraphCreation interface to wmpservice.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/wmpservices.idl | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index b03c2e8c602..5de2a0e3a4f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -798,6 +798,7 @@ SOURCES = \ wmp.idl \ wmpids.h \ wmprealestate.idl \ + wmpservices.idl \ wmsbuffer.idl \ wmsdk.h \ wmsdkidl.idl \ diff --git a/include/wmpservices.idl b/include/wmpservices.idl new file mode 100644 index 00000000000..86f2fc1da72 --- /dev/null +++ b/include/wmpservices.idl @@ -0,0 +1,32 @@ +/* + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +[ + odl, + uuid(bfb377e5-c594-4369-a970-de896d5ece74), + oleautomation +] +interface IWMPGraphCreation : IUnknown +{ + HRESULT GraphCreationPreRender([in] IUnknown *filter_graph, [in] IUnknown *reserved); + HRESULT GraphCreationPostRender([in] IUnknown *filter_graph); + HRESULT GetGraphCreationFlags([out, retval] DWORD *flags); +}

1 0

Rémi Bernon : include: Add WMPGC_FLAGS_SUPPRESS_DIALOGS constant to wmpservices.idl.
by Alexandre Julliard 01 Feb '21

01 Feb '21

Module: wine Branch: master Commit: ed67f53bf8545e7f6208f62ab2c9494da791b066 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed67f53bf8545e7f6208f62a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 1 09:29:29 2021 +0100 include: Add WMPGC_FLAGS_SUPPRESS_DIALOGS constant to wmpservices.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmpservices.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/wmpservices.idl b/include/wmpservices.idl index 86f2fc1da72..3c3ac47333a 100644 --- a/include/wmpservices.idl +++ b/include/wmpservices.idl @@ -19,6 +19,8 @@ import "oaidl.idl"; import "ocidl.idl"; +cpp_quote("#define WMPGC_FLAGS_SUPPRESS_DIALOGS 0x00000002") + [ odl, uuid(bfb377e5-c594-4369-a970-de896d5ece74),

1 0

Rémi Bernon : include: Add more DISPID constants to wmpids.h.
by Alexandre Julliard 01 Feb '21

01 Feb '21

Module: wine Branch: master Commit: da0b451f5f8f9a9d19b32c28aa2b3d14515d081c URL: https://source.winehq.org/git/wine.git/?a=commit;h=da0b451f5f8f9a9d19b32c28… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 1 09:29:30 2021 +0100 include: Add more DISPID constants to wmpids.h. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmpids.h | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/include/wmpids.h b/include/wmpids.h index a8500409ac4..2ae1d5c8bdd 100644 --- a/include/wmpids.h +++ b/include/wmpids.h @@ -19,6 +19,53 @@ #define DISPID_WMPCOREEVENT_STATUSCHANGE 5002 #define DISPID_WMPCOREEVENT_PLAYSTATECHANGE 5101 +#define DISPID_WMPCOREEVENT_AUDIOLANGUAGECHANGE 5102 -#define DISPID_WMPCOREEVENT_MEDIACHANGE 5802 -#define DISPID_WMPCOREEVENT_CURRENTITEMCHANGE 5806 +#define DISPID_WMPCOREEVENT_ENDOFSTREAM 5201 +#define DISPID_WMPCOREEVENT_POSITIONCHANGE 5202 +#define DISPID_WMPCOREEVENT_MARKERHIT 5203 +#define DISPID_WMPCOREEVENT_DURATIONUNITCHANGE 5204 + +#define DISPID_WMPCOREEVENT_SCRIPTCOMMAND 5301 + +#define DISPID_WMPCOREEVENT_DISCONNECT 5401 +#define DISPID_WMPCOREEVENT_BUFFERING 5402 +#define DISPID_WMPCOREEVENT_NEWSTREAM 5403 + +#define DISPID_WMPCOREEVENT_ERROR 5501 + +#define DISPID_WMPCOREEVENT_WARNING 5601 + +#define DISPID_WMPCOREEVENT_CDROMMEDIACHANGE 5701 + +#define DISPID_WMPCOREEVENT_PLAYLISTCHANGE 5801 +#define DISPID_WMPCOREEVENT_MEDIACHANGE 5802 +#define DISPID_WMPCOREEVENT_CURRENTMEDIAITEMAVAILABLE 5803 +#define DISPID_WMPCOREEVENT_CURRENTPLAYLISTCHANGE 5804 +#define DISPID_WMPCOREEVENT_CURRENTPLAYLISTITEMAVAILABLE 5805 +#define DISPID_WMPCOREEVENT_CURRENTITEMCHANGE 5806 +#define DISPID_WMPCOREEVENT_MEDIACOLLECTIONCHANGE 5807 +#define DISPID_WMPCOREEVENT_MEDIACOLLECTIONATTRIBUTESTRINGADDED 5808 +#define DISPID_WMPCOREEVENT_MEDIACOLLECTIONATTRIBUTESTRINGREMOVED 5809 +#define DISPID_WMPCOREEVENT_PLAYLISTCOLLECTIONCHANGE 5810 +#define DISPID_WMPCOREEVENT_PLAYLISTCOLLECTIONPLAYLISTADDED 5811 +#define DISPID_WMPCOREEVENT_PLAYLISTCOLLECTIONPLAYLISTREMOVED 5812 +#define DISPID_WMPCOREEVENT_PLAYLISTCOLLECTIONPLAYLISTSETASDELETED 5818 +#define DISPID_WMPCOREEVENT_MODECHANGE 5819 +#define DISPID_WMPCOREEVENT_MEDIACOLLECTIONATTRIBUTESTRINGCHANGED 5820 +#define DISPID_WMPCOREEVENT_MEDIAERROR 5821 +#define DISPID_WMPCOREEVENT_DOMAINCHANGE 5822 +#define DISPID_WMPCOREEVENT_OPENPLAYLISTSWITCH 5823 + +#define DISPID_WMPOCXEVENT_SWITCHEDTOPLAYERAPPLICATION 6501 +#define DISPID_WMPOCXEVENT_SWITCHEDTOCONTROL 6502 +#define DISPID_WMPOCXEVENT_PLAYERDOCKEDSTATECHANGE 6503 +#define DISPID_WMPOCXEVENT_PLAYERRECONNECT 6504 +#define DISPID_WMPOCXEVENT_CLICK 6505 +#define DISPID_WMPOCXEVENT_DOUBLECLICK 6506 +#define DISPID_WMPOCXEVENT_KEYDOWN 6507 +#define DISPID_WMPOCXEVENT_KEYPRESS 6508 +#define DISPID_WMPOCXEVENT_KEYUP 6509 +#define DISPID_WMPOCXEVENT_MOUSEDOWN 6510 +#define DISPID_WMPOCXEVENT_MOUSEMOVE 6511 +#define DISPID_WMPOCXEVENT_MOUSEUP 6512

1 0

Alexandre Julliard : ntdll: Pass a debug object in the new_process request.
by Alexandre Julliard 01 Feb '21

01 Feb '21

Module: wine Branch: master Commit: 11e6f1007c3d13a2f5b1e547850de8b832110c7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=11e6f1007c3d13a2f5b1e547… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 11:08:44 2021 +0100 ntdll: Pass a debug object in the new_process request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 3 --- dlls/kernelbase/process.c | 48 ++++++++++++++++++++++++++++++------------ dlls/ntdll/unix/process.c | 2 +- include/wine/server_protocol.h | 4 +++- server/debugger.c | 5 +++++ server/process.c | 19 ++++++++++++----- server/process.h | 1 + server/protocol.def | 1 + server/request.h | 19 +++++++++-------- server/trace.c | 1 + 10 files changed, 70 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=11e6f1007c3d13a2f5b1…

1 0

Alexandre Julliard : ntdll: Implement NtDebugActiveProcess() and NtRemoveProcessDebug().
by Alexandre Julliard 01 Feb '21

01 Feb '21

Module: wine Branch: master Commit: 46b84e7a83beae7484e6daac16739a2b9238f68e URL: https://source.winehq.org/git/wine.git/?a=commit;h=46b84e7a83beae7484e6daac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 11:09:01 2021 +0100 ntdll: Implement NtDebugActiveProcess() and NtRemoveProcessDebug(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/debug.c | 37 +++++++++-------------- dlls/ntdll/ntdll.spec | 8 ++--- dlls/ntdll/process.c | 20 +++++++++++++ dlls/ntdll/unix/process.c | 34 ++++++++++++++++++++-- include/wine/server_protocol.h | 6 ++-- include/winternl.h | 4 +++ server/debugger.c | 66 +++++++++++++++--------------------------- server/object.h | 1 - server/protocol.def | 5 ++-- server/request.h | 5 ++-- server/trace.c | 3 +- 11 files changed, 107 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=46b84e7a83beae7484e6…

1 0

Alexandre Julliard : ntdll: Implement NtSetInformationDebugObject().
by Alexandre Julliard 01 Feb '21

01 Feb '21

Module: wine Branch: master Commit: 7bebf7db8c2c7a147b24cf0c8e9cac2c7460093a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bebf7db8c2c7a147b24cf0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 11:10:06 2021 +0100 ntdll: Implement NtSetInformationDebugObject(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/debugger.c | 16 ++++++------ dlls/kernel32/tests/debugger.c | 23 ++++++++++++++++++ dlls/ntdll/ntdll.spec | 4 +-- dlls/ntdll/tests/info.c | 55 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/sync.c | 30 +++++++++++++++++++++++ include/wine/server_protocol.h | 16 ++++++------ include/winternl.h | 7 ++++++ server/debugger.c | 15 ++++++------ server/protocol.def | 7 +++--- server/request.h | 9 ++++--- server/trace.c | 9 ++++--- 11 files changed, 154 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7bebf7db8c2c7a147b24…

1 0

Alexandre Julliard : ntdll: Implement NtDebugContinue().
by Alexandre Julliard 01 Feb '21

01 Feb '21

Module: wine Branch: master Commit: c8f5cced47132197befdeece76645853bb9a7a5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8f5cced47132197befdeece… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 11:22:23 2021 +0100 ntdll: Implement NtDebugContinue(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/debug.c | 15 +++++---------- dlls/ntdll/ntdll.spec | 6 +++--- dlls/ntdll/process.c | 8 ++++++++ dlls/ntdll/unix/process.c | 20 ++++++++++++++++++++ include/wine/server_protocol.h | 6 ++++-- include/winternl.h | 2 ++ server/debugger.c | 13 ++++++++----- server/protocol.def | 3 ++- server/request.h | 9 +++++---- server/trace.c | 5 +++-- 10 files changed, 60 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c8f5cced47132197befd…

1 0

Alexandre Julliard : ntdll: Implement DbgUiConvertStateChangeStructure().
by Alexandre Julliard 01 Feb '21

01 Feb '21

Module: wine Branch: master Commit: d848a25b765cd9826d19d3448b75ffe9692460b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d848a25b765cd9826d19d344… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 11:39:06 2021 +0100 ntdll: Implement DbgUiConvertStateChangeStructure(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/process.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/tests/info.c | 55 ++++++++++++++++++++++++ include/winternl.h | 93 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 258 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d848a25b765cd9826d19…

1 0

Alexandre Julliard : ntdll: Implement NtWaitForDebugEvent().
by Alexandre Julliard 01 Feb '21

01 Feb '21

Module: wine Branch: master Commit: 7999af82448c340b28e3d6e412463c5cdcc6cea6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7999af82448c340b28e3d6e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 11:45:29 2021 +0100 ntdll: Implement NtWaitForDebugEvent(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 1 - dlls/kernelbase/debug.c | 107 +---------------------------------------- dlls/kernelbase/sync.c | 29 +++++++++++ dlls/ntdll/ntdll.spec | 6 +-- dlls/ntdll/process.c | 8 +++ dlls/ntdll/unix/sync.c | 102 +++++++++++++++++++++++++++++++++++++++ include/wine/server_protocol.h | 9 +--- include/winternl.h | 2 + server/debugger.c | 68 +++++++++++--------------- server/process.c | 8 +-- server/protocol.def | 20 +++----- server/request.h | 5 +- server/thread.c | 2 +- server/trace.c | 61 ++++++++++++----------- 14 files changed, 220 insertions(+), 208 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7999af82448c340b28e3…

1 0

Alexandre Julliard : server: Don't store the debug object in the debugger thread.
by Alexandre Julliard 01 Feb '21

01 Feb '21

Module: wine Branch: master Commit: 2b6426da6550c50787eeb2b39affcb766e07ec11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b6426da6550c50787eeb2b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 12:17:03 2021 +0100 server: Don't store the debug object in the debugger thread. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 40 +++++++++++++++++++++++++++++++++++++--- server/debugger.c | 15 --------------- server/object.h | 1 - server/process.c | 1 - server/thread.c | 3 --- server/thread.h | 1 - 6 files changed, 37 insertions(+), 24 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index b7ec9e99ed3..fb5ea1581e2 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1727,15 +1727,29 @@ static DWORD run_child_wait( char *cmd, HANDLE event ) return exit_code; } +static PROCESS_INFORMATION pi; +static char *cmd; + +static DWORD WINAPI debug_and_exit(void *arg) +{ + STARTUPINFOA si = { sizeof(si) }; + BOOL ret; + + ret = CreateProcessA(NULL, cmd, NULL, NULL, TRUE, DEBUG_PROCESS, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess failed, last error %#x.\n", GetLastError()); + Sleep(200); + *(HANDLE *)arg = pDbgUiGetThreadDebugObject(); + ExitThread(0); +} + static void test_kill_on_exit(const char *argv0) { static const char arguments[] = " debugger wait "; SECURITY_ATTRIBUTES sa = { sizeof(sa), NULL, TRUE }; OBJECT_ATTRIBUTES attr = { sizeof(attr) }; NTSTATUS status; - HANDLE event, debug; - DWORD exit_code; - char *cmd; + HANDLE event, debug, thread; + DWORD exit_code, tid; ULONG val; event = CreateEventW(&sa, FALSE, FALSE, NULL); @@ -1784,6 +1798,26 @@ static void test_kill_on_exit(const char *argv0) exit_code = run_child_wait( cmd, event ); ok( exit_code == STATUS_DEBUGGER_INACTIVE, "exit code = %08x\n", exit_code); + /* test that threads don't close the debug port on exit */ + thread = CreateThread(NULL, 0, debug_and_exit, &debug, 0, &tid); + WaitForSingleObject( thread, 1000 ); + ok( debug != 0, "no debug port\n" ); + SetEvent( event ); + WaitForSingleObject( pi.hProcess, 100 ); + GetExitCodeProcess( pi.hProcess, &exit_code ); + ok( exit_code == STILL_ACTIVE, "exit code = %08x\n", exit_code); + val = 0; + status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation, + &val, sizeof(val), NULL ); + ok( !status, "NtSetInformationDebugObject failed %x\n", status ); + CloseHandle( debug ); + WaitForSingleObject( pi.hProcess, 1000 ); + GetExitCodeProcess( pi.hProcess, &exit_code ); + ok( exit_code == 0, "exit code = %08x\n", exit_code); + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + CloseHandle( thread ); + heap_free(cmd); } diff --git a/server/debugger.c b/server/debugger.c index 927fe42929e..24cf33f92b4 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -488,7 +488,6 @@ static int debugger_attach( struct process *process, struct thread *debugger, st struct thread *renderer = console_get_renderer(debugger->process->console); if (renderer && renderer->process == process) goto error; } - if (!debugger->debug_obj) debugger->debug_obj = (struct debug_obj *)grab_object( debug_obj ); suspend_process( process ); @@ -568,20 +567,6 @@ void generate_startup_debug_events( struct process *process, client_ptr_t entry } } -/* a thread is exiting */ -void debug_exit_thread( struct thread *thread ) -{ - struct debug_obj *debug_obj = thread->debug_obj; - - if (debug_obj) /* this thread is a debugger */ - { - detach_debugged_processes( debug_obj, - (debug_obj->flags & DEBUG_KILL_ON_CLOSE) ? STATUS_DEBUGGER_INACTIVE : 0 ); - release_object( thread->debug_obj ); - thread->debug_obj = NULL; - } -} - /* create a debug object */ DECL_HANDLER(create_debug_obj) { diff --git a/server/object.h b/server/object.h index 77d0594f99e..62f2cbafca6 100644 --- a/server/object.h +++ b/server/object.h @@ -215,7 +215,6 @@ extern void sock_init(void); extern void generate_debug_event( struct thread *thread, int code, const void *arg ); extern void resume_delayed_debug_events( struct thread *thread ); extern void generate_startup_debug_events( struct process *process, client_ptr_t entry ); -extern void debug_exit_thread( struct thread *thread ); /* registry functions */ diff --git a/server/process.c b/server/process.c index 95e030777c9..60562db326b 100644 --- a/server/process.c +++ b/server/process.c @@ -1261,7 +1261,6 @@ DECL_HANDLER(new_process) { process->debug_obj = debug_obj; process->debug_children = !(req->create_flags & DEBUG_ONLY_THIS_PROCESS); - if (!current->debug_obj) current->debug_obj = (struct debug_obj *)grab_object( debug_obj ); } else if (parent->debug_children) { diff --git a/server/thread.c b/server/thread.c index fd3538c51f3..03b483d14ee 100644 --- a/server/thread.c +++ b/server/thread.c @@ -221,7 +221,6 @@ static inline void init_thread_structure( struct thread *thread ) thread->context = NULL; thread->teb = 0; thread->entry_point = 0; - thread->debug_obj = NULL; thread->system_regs = 0; thread->queue = NULL; thread->wait = NULL; @@ -429,7 +428,6 @@ static void destroy_thread( struct object *obj ) struct thread *thread = (struct thread *)obj; assert( obj->ops == &thread_ops ); - assert( !thread->debug_obj ); /* cannot still be debugging something */ list_remove( &thread->entry ); cleanup_thread( thread ); release_object( thread->process ); @@ -1266,7 +1264,6 @@ void kill_thread( struct thread *thread, int violent_death ) violent_death = 0; } kill_console_processes( thread, 0 ); - debug_exit_thread( thread ); abandon_mutexes( thread ); wake_up( &thread->obj, 0 ); if (violent_death) send_thread_signal( thread, SIGQUIT ); diff --git a/server/thread.h b/server/thread.h index a83309bc940..5f8eeeb3c50 100644 --- a/server/thread.h +++ b/server/thread.h @@ -54,7 +54,6 @@ struct thread struct process *process; thread_id_t id; /* thread id */ struct list mutex_list; /* list of currently owned mutexes */ - struct debug_obj *debug_obj; /* debugger context if this thread is a debugger */ 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 */

1 0