January 2020 - Wine-Devel - list.winehq.org

[PATCH 03/10] jscript: Directly return error code instead of using throw_generic_error.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/activex.c | 2 +- dlls/jscript/error.c | 5 ----- dlls/jscript/jscript.h | 2 -- 3 files changed, 1 insertion(+), 8 deletions(-)

Jan. 31, 2020

[PATCH 02/10] jscript: Factor out format_error_message implementation.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/error.c | 52 ++++++++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 14 deletions(-)

Jan. 31, 2020

[PATCH 01/10] jscript: Suport generic error object for exception with no associated JavaScript exception value.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/engine.c | 18 ++++++--- dlls/jscript/error.c | 80 ++++++++++++++++++++++++++++++++++++++ dlls/jscript/global.c | 2 +- dlls/jscript/jscript.h | 1 + dlls/jscript/tests/lang.js | 31 +++++++++++++++ 5 files changed, 125 insertions(+), 7 deletions(-)

Jan. 31, 2020

[PATCH] wined3d: Fix the spelling of a comment.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bc220f0cf4..fe8e239dea 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1031,7 +1031,7 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit DWORD location; /* If we would need to copy from a renderbuffer or drawable, we'd probably - * be better of using the FBO blitter directly, since we'd need to use it + * be better off using the FBO blitter directly, since we'd need to use it * to copy the resource contents to the texture anyway. */ if (op != WINED3D_BLIT_OP_RAW_BLIT || (src_texture->resource.format->id == dst_texture->resource.format->id -- 2.25.0

Jan. 31, 2020

Re: [PATCH] ws2_32: Add stub for WSCSetApplicationCategory

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=64270 Your paranoid android. === debian10 (32 bit report) === ws2_32: sock.c:3057: Test succeeded inside todo block: Test[2]: expected 0, got 0 sock.c:3057: Test succeeded inside todo block: Test[2]: expected 0, got 0 === debian10 (32 bit WoW report) === ws2_32: sock.c:3057: Test succeeded inside todo block: Test[1]: expected 0, got 0 sock.c:3057: Test succeeded inside todo block: Test[2]: expected 0, got 0 sock.c:3057: Test succeeded inside todo block: Test[1]: expected 0, got 0 sock.c:3057: Test succeeded inside todo block: Test[2]: expected 0, got 0

Jan. 31, 2020

[PATCH 3/3] server: Implement DBG_REPLY_LATER handling.

by Rémi Bernon

This flag causes the debug event to be replayed after the target thread continues. It can be used, after suspending the thread, to resume other threads and later return to the breaking. This will help implementing gdb continue/step packets correctly. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernelbase/debug.c | 2 +- dlls/ntdll/tests/exception.c | 1 - server/debugger.c | 58 +++++++++++++++++++++++++++++++++++- server/object.h | 1 + server/thread.c | 4 ++- 5 files changed, 62 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index d99309377f0..422fb029242 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -71,7 +71,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH ContinueDebugEvent( DWORD pid, DWORD tid, DWORD st { BOOL ret; - if (status != DBG_EXCEPTION_NOT_HANDLED && status != DBG_CONTINUE) + if (status != DBG_EXCEPTION_NOT_HANDLED && status != DBG_CONTINUE && status != DBG_REPLY_LATER) { FIXME("Unknown status %x\n", status); return FALSE; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 1e14f47e04e..1bd275d7074 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1001,7 +1001,6 @@ static void test_debugger(void) ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n"); ok(!ContinueDebugEvent(de.dwProcessId, de.dwThreadId, 0xdeadbeef), "ContinueDebugEvent unexpectedly succeeded\n"); - todo_wine ok((ret = ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_REPLY_LATER)) || broken(!ret) /* only on w10 > 1507 */, "ContinueDebugEvent DBG_REPLY_LATER failed\n"); diff --git a/server/debugger.c b/server/debugger.c index a5c39aa33e7..24038ab1105 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -38,7 +38,7 @@ #include "thread.h" #include "request.h" -enum debug_event_state { EVENT_QUEUED, EVENT_SENT, EVENT_CONTINUED }; +enum debug_event_state { EVENT_QUEUED, EVENT_SENT, EVENT_DELAYED, EVENT_CONTINUED }; /* debug event */ struct debug_event @@ -265,6 +265,31 @@ static void link_event( struct debug_event *event ) } } +/* resume a delayed debug event already in the queue */ +static void resume_event( struct debug_event *event ) +{ + struct debug_ctx *debug_ctx = event->debugger->debug_ctx; + + assert( debug_ctx ); + event->state = EVENT_QUEUED; + if (!event->sender->process->debug_event) + { + grab_object( debug_ctx ); + wake_up( &debug_ctx->obj, 0 ); + release_object( debug_ctx ); + } +} + +/* delay a debug event already in the queue to be replayed when thread wakes up */ +static void delay_event( struct debug_event *event ) +{ + struct debug_ctx *debug_ctx = event->debugger->debug_ctx; + + assert( debug_ctx ); + event->state = EVENT_DELAYED; + if (event->sender->process->debug_event == event) event->sender->process->debug_event = NULL; +} + /* find the next event that we can send to the debugger */ static struct debug_event *find_event_to_send( struct debug_ctx *debug_ctx ) { @@ -273,6 +298,7 @@ static struct debug_event *find_event_to_send( struct debug_ctx *debug_ctx ) LIST_FOR_EACH_ENTRY( event, &debug_ctx->event_queue, struct debug_event, entry ) { if (event->state == EVENT_SENT) continue; /* already sent */ + if (event->state == EVENT_DELAYED) continue; /* delayed until thread resumes */ if (event->sender->process->debug_event) continue; /* process busy with another one */ return event; } @@ -373,6 +399,15 @@ static int continue_debug_event( struct process *process, struct thread *thread, { assert( event->sender->process->debug_event == event ); + if (status == DBG_REPLY_LATER) + { + delay_event( event ); + /* the target thread is not suspended, replay the event immediately */ + if (!event->sender->suspend) resume_event( event ); + else resume_process( process ); + return 1; + } + event->status = status; event->state = EVENT_CONTINUED; wake_up( &event->obj, 0 ); @@ -430,6 +465,27 @@ void generate_debug_event( struct thread *thread, int code, const void *arg ) } } +int resume_delayed_debug_events( struct thread *thread ) +{ + struct thread *debugger = thread->process->debugger; + struct debug_event *event; + + if (debugger) + { + assert( debugger->debug_ctx ); + LIST_FOR_EACH_ENTRY( event, &debugger->debug_ctx->event_queue, struct debug_event, entry ) + { + if (event->state != EVENT_DELAYED) continue; + if (event->sender != thread) continue; + resume_event( event ); + suspend_process( thread->process ); + return 1; + } + } + + return 0; +} + /* attach a process to a debugger thread and suspend it */ static int debugger_attach( struct process *process, struct thread *debugger ) { diff --git a/server/object.h b/server/object.h index 4a486e0d633..84d2cb227e4 100644 --- a/server/object.h +++ b/server/object.h @@ -206,6 +206,7 @@ extern void sock_init(void); extern int set_process_debugger( struct process *process, struct thread *debugger ); extern void generate_debug_event( struct thread *thread, int code, const void *arg ); +extern int 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 ); diff --git a/server/thread.c b/server/thread.c index 80db41b48d2..aec4c1acf4e 100644 --- a/server/thread.c +++ b/server/thread.c @@ -612,7 +612,9 @@ int resume_thread( struct thread *thread ) int old_count = thread->suspend; if (thread->suspend > 0) { - if (!(--thread->suspend + thread->process->suspend)) wake_thread( thread ); + if (!(--thread->suspend + thread->process->suspend) && + !resume_delayed_debug_events( thread )) + wake_thread( thread ); } return old_count; } -- 2.25.0

Jan. 31, 2020

[PATCH 2/3] ntdll/tests: Add tests for ContinueDebugEvent with DBG_REPLY_LATER status.

by Rémi Bernon

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 9cb9fc50d5d..1e14f47e04e 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1001,6 +1001,21 @@ static void test_debugger(void) ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n"); ok(!ContinueDebugEvent(de.dwProcessId, de.dwThreadId, 0xdeadbeef), "ContinueDebugEvent unexpectedly succeeded\n"); + todo_wine + ok((ret = ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_REPLY_LATER)) || broken(!ret) /* only on w10 > 1507 */, + "ContinueDebugEvent DBG_REPLY_LATER failed\n"); + + if (!ret) + skip("Skipping unsupported DBG_REPLY_LATER tests\n"); + else + { + DEBUG_EVENT delayed_de; + ok(WaitForDebugEvent(&delayed_de, 50), "reading delayed debug event\n"); + ok(de.dwDebugEventCode == delayed_de.dwDebugEventCode, "delayed event differ, code:%x was:%x\n", delayed_de.dwDebugEventCode, de.dwDebugEventCode); + ok(de.dwProcessId == delayed_de.dwProcessId, "delayed event differ, pid:%x was:%x\n", delayed_de.dwProcessId, de.dwProcessId); + ok(de.dwThreadId == delayed_de.dwThreadId, "delayed event differ, tid:%x was:%x\n", delayed_de.dwThreadId, de.dwThreadId); + } + if (de.dwThreadId != pi.dwThreadId) { trace("event %d not coming from main thread, ignoring\n", de.dwDebugEventCode); -- 2.25.0

Jan. 31, 2020

[PATCH 1/3] kernelbase: Return FALSE in ContinueDebugEvent if status is unknown.

by Rémi Bernon

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernelbase/debug.c | 7 +++++++ dlls/ntdll/tests/exception.c | 1 + 2 files changed, 8 insertions(+) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 53b95aa6dda..d99309377f0 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -70,6 +70,13 @@ BOOL WINAPI DECLSPEC_HOTPATCH CheckRemoteDebuggerPresent( HANDLE process, BOOL * BOOL WINAPI DECLSPEC_HOTPATCH ContinueDebugEvent( DWORD pid, DWORD tid, DWORD status ) { BOOL ret; + + if (status != DBG_EXCEPTION_NOT_HANDLED && status != DBG_CONTINUE) + { + FIXME("Unknown status %x\n", status); + return FALSE; + } + SERVER_START_REQ( continue_debug_event ) { req->pid = pid; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index e8b481e703f..9cb9fc50d5d 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -999,6 +999,7 @@ static void test_debugger(void) { continuestatus = DBG_CONTINUE; ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n"); + ok(!ContinueDebugEvent(de.dwProcessId, de.dwThreadId, 0xdeadbeef), "ContinueDebugEvent unexpectedly succeeded\n"); if (de.dwThreadId != pi.dwThreadId) { -- 2.25.0

Jan. 31, 2020

[PATCH] ws2_32: Add stub for WSCSetApplicationCategory

by Vijay Kiran Kamuju

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48392 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

Jan. 31, 2020

Re: [PATCH 2/2] mapi32: Use the %I length modifier to print pointer-size integers.

by Jacek Caban

Hi Zebediah, On 29.01.2020 05:56, Zebediah Figura wrote: > "long int" is 32 bits on Windows, so %l will silently truncate the argument to > 32 bits. > > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > The standard arguments %z, %j, %t are supported by our msvcrt, and could > conceivably be used instead, but native msvcrt only supports them for 64-bit > programs, and only with very recent versions of windows. mingw accordingly spits > out warnings if they are used in 32-bit code. The only other pointer-size length > modifier that msvcrt accepts is %I. > > Other options include casting to a pointer or a larger type, or using a macro > similar to PRIxPTR. Note that PRIxPTR itself causes warnings on 32-bit > platforms, however, because it expands to "x" while the type is defined as "long > int", so we would have to define our own such macro. Of these options, using %I > seems to me the most palatable. > > Note that %I is not supported by our ntdll (for traces from e.g. kernelbase), > but native ntdll supports %I, so there should be no problem adding support for > it. Unfortunately, this causes warnings on clang: mapi32_main.c:132:49: warning: format specifies type 'unsigned __int32' (aka 'unsigned int') but the argument has type 'ULONG_PTR' (aka 'unsigned long') [-Wformat] Thinking about it some more, I think we should revisit the idea of using ucrt for builtin modules. With recent changes, we control whole crt when building Wine, so we can do that. I also have some patches improving linking with ucrt in my queue. On top of that, we should be able to default to ucrt for majority of Wine codebase and use standard arguments. Of course, the biggest problem with that is that we can't do that for some modules. We can't do that for tests, DLLs that need to link to specific crt DLLs (like msvcp) and low level DLLs that don't import any crt DLL. However, maybe it isn't too bad. I'm not worried about tests. Looking at the size of your recent kernelbase change, maybe problematic cases will be few enough that we don't need to worry about that too much... Thanks, Jacek

Jan. 31, 2020