May 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Introduce a helper function for translating blend factors.
by Alexandre Julliard May 6, 2011

May 6, 2011

Module: wine Branch: master Commit: 493af7e5c109a424b733f31a341dd6c2cd59c573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=493af7e5c109a424b733f31a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 5 20:56:08 2011 +0200 wined3d: Introduce a helper function for translating blend factors. --- dlls/wined3d/state.c | 217 ++++++++++++++++++-------------------------------- 1 files changed, 77 insertions(+), 140 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=493af7e5c109a424b733f…

1 0

Henri Verbeet : d3d9/tests: Check if formats are supported for render targets in pixelshader_blending_test ().
by Alexandre Julliard May 6, 2011

May 6, 2011

Module: wine Branch: master Commit: ed3f5081a3a408b247a2afc42d73064fd843089e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed3f5081a3a408b247a2afc42… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 5 20:56:06 2011 +0200 d3d9/tests: Check if formats are supported for render targets in pixelshader_blending_test(). --- dlls/d3d9/tests/visual.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index baf8243..a655974 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8893,9 +8893,12 @@ static void pixelshader_blending_test(IDirect3DDevice9 *device) for(fmt_index=0; test_formats[fmt_index].textureFormat != 0; fmt_index++) { D3DFORMAT fmt = test_formats[fmt_index].textureFormat; - if(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, fmt) != D3D_OK) { - skip("%s textures not supported\n", test_formats[fmt_index].fmtName); - continue; + + if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_RENDERTARGET, D3DRTYPE_TEXTURE, fmt) != D3D_OK) + { + skip("%s textures not supported as render targets.\n", test_formats[fmt_index].fmtName); + continue; } hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0);

1 0

Marcus Meissner : riched20: Use correct flag name (Coverity).
by Alexandre Julliard May 6, 2011

May 6, 2011

Module: wine Branch: master Commit: 0cd53a589d44aacfb003af25f1d64d9fbdf02ca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cd53a589d44aacfb003af25f… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu May 5 17:57:28 2011 +0200 riched20: Use correct flag name (Coverity). --- dlls/riched20/table.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index f184ff0..053bedf 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -247,7 +247,7 @@ void ME_CheckTablesForCorruption(ME_TextEditor *editor) { assert(!(p->member.para.nFlags & (MEPF_ROWSTART|MEPF_ROWEND|MEPF_CELL))); assert(p->member.para.pFmt->dwMask & PFM_TABLE); - assert(!(p->member.para.pFmt->wEffects & PFM_TABLEROWDELIMITER)); + assert(!(p->member.para.pFmt->wEffects & PFE_TABLEROWDELIMITER)); assert(!p->member.para.pCell); p = p->member.para.next_para; }

1 0

Marcus Meissner : riched20: Adjusted shift by 8 bits to 16 bits (Coverity).
by Alexandre Julliard May 6, 2011

May 6, 2011

Module: wine Branch: master Commit: 2ae0d40c8ff700c174aee855c8286a4e476ae6f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ae0d40c8ff700c174aee855c… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu May 5 17:52:52 2011 +0200 riched20: Adjusted shift by 8 bits to 16 bits (Coverity). --- dlls/riched20/para.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index b6319e7..efd3d04 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -475,7 +475,7 @@ void ME_DumpParaStyleToBuf(const PARAFORMAT2 *pFmt, char buf[2048]) /* we take for granted that PFE_xxx is the hiword of the corresponding PFM_xxx */ #define DUMP_EFFECT(mask, name) \ - p += sprintf(p, "%-22s%s\n", name, (pFmt->dwMask & (mask)) ? ((pFmt->wEffects & ((mask) >> 8)) ? "yes" : "no") : "N/A"); + p += sprintf(p, "%-22s%s\n", name, (pFmt->dwMask & (mask)) ? ((pFmt->wEffects & ((mask) >> 16)) ? "yes" : "no") : "N/A"); DUMP(PFM_NUMBERING, "Numbering:", "%u", wNumbering); DUMP_EFFECT(PFM_DONOTHYPHEN, "Disable auto-hyphen:");

1 0

Alexandre Julliard : server: Check for the need to suspend a thread again once it leaves an exception or suspend block .
by Alexandre Julliard May 6, 2011

May 6, 2011

Module: wine Branch: master Commit: 5dc9c73c3147ef0c540830a802a7be1321aaf0e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dc9c73c3147ef0c540830a80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 6 12:43:16 2011 +0200 server: Check for the need to suspend a thread again once it leaves an exception or suspend block. --- server/debugger.c | 7 ++++++- server/process.c | 2 +- server/thread.c | 14 ++++++++++++-- server/thread.h | 1 + 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/server/debugger.c b/server/debugger.c index 2ee6f6d..d8a390e 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -308,7 +308,11 @@ static void debug_event_destroy( struct object *obj ) break; } } - if (event->sender->context == &event->context) event->sender->context = NULL; + if (event->sender->context == &event->context) + { + event->sender->context = NULL; + stop_thread_if_suspended( event->sender ); + } release_object( event->sender ); release_object( event->debugger ); } @@ -680,6 +684,7 @@ DECL_HANDLER(get_exception_status) data_size_t size = min( sizeof(context_t), get_reply_max_size() ); set_reply_data( &event->context, size ); current->context = NULL; + stop_thread_if_suspended( current ); } set_error( event->status ); } diff --git a/server/process.c b/server/process.c index 797b4cf..f5430c8 100644 --- a/server/process.c +++ b/server/process.c @@ -1045,7 +1045,7 @@ DECL_HANDLER(init_process_done) set_process_startup_state( process, STARTUP_DONE ); if (req->gui) process->idle_event = create_event( NULL, NULL, 0, 1, 0, NULL ); - if (current->suspend + process->suspend > 0) stop_thread( current ); + stop_thread_if_suspended( current ); if (process->debugger) set_process_debug_flag( process, 1 ); } diff --git a/server/thread.c b/server/thread.c index 9e56b1b..4388847 100644 --- a/server/thread.c +++ b/server/thread.c @@ -491,6 +491,12 @@ void stop_thread( struct thread *thread ) if (is_process_init_done(thread->process)) send_thread_signal( thread, SIGUSR1 ); } +/* stop a thread if it's supposed to be suspended */ +void stop_thread_if_suspended( struct thread *thread ) +{ + if (thread->suspend + thread->process->suspend > 0) stop_thread( thread ); +} + /* suspend a thread */ static int suspend_thread( struct thread *thread ) { @@ -1182,7 +1188,7 @@ DECL_HANDLER(init_thread) } if (process->unix_pid != current->unix_pid) process->unix_pid = -1; /* can happen with linuxthreads */ - if (current->suspend + process->suspend > 0) stop_thread( current ); + stop_thread_if_suspended( current ); generate_debug_event( current, CREATE_THREAD_DEBUG_EVENT, &req->entry ); set_thread_affinity( current, current->affinity ); } @@ -1556,7 +1562,11 @@ DECL_HANDLER(get_suspend_context) if (current->suspend_context) { set_reply_data_ptr( current->suspend_context, sizeof(context_t) ); - if (current->context == current->suspend_context) current->context = NULL; + if (current->context == current->suspend_context) + { + current->context = NULL; + stop_thread_if_suspended( current ); + } current->suspend_context = NULL; } else set_error( STATUS_INVALID_PARAMETER ); /* not suspended, shouldn't happen */ diff --git a/server/thread.h b/server/thread.h index 1e95732..1c4a74a 100644 --- a/server/thread.h +++ b/server/thread.h @@ -106,6 +106,7 @@ extern struct thread *get_thread_from_handle( obj_handle_t handle, unsigned int extern struct thread *get_thread_from_tid( int tid ); extern struct thread *get_thread_from_pid( int pid ); extern void stop_thread( struct thread *thread ); +extern void stop_thread_if_suspended( struct thread *thread ); extern int wake_thread( struct thread *thread ); extern int add_queue( struct object *obj, struct wait_queue_entry *entry ); extern void remove_queue( struct object *obj, struct wait_queue_entry *entry );

1 0

Alexandre Julliard : server: Fix the status code for get/ set_thread_context on a terminated thread.
by Alexandre Julliard May 6, 2011

May 6, 2011

Module: wine Branch: master Commit: 055c883ee0e9362d134db14ea57f47c87a30737d URL: http://source.winehq.org/git/wine.git/?a=commit;h=055c883ee0e9362d134db14ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 6 13:06:52 2011 +0200 server: Fix the status code for get/set_thread_context on a terminated thread. --- dlls/kernel32/tests/thread.c | 16 ++++++++++++++++ server/thread.c | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 25b55ac..8376575 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -955,6 +955,22 @@ static void test_SetThreadContext(void) WaitForSingleObject( thread, INFINITE ); ok( test_value == 20, "test_value %d instead of 20\n", test_value ); + + ctx.ContextFlags = CONTEXT_FULL; + SetLastError(0xdeadbeef); + ret = GetThreadContext( thread, &ctx ); + ok( !ret, "GetThreadContext succeeded\n" ); + ok( GetLastError() == ERROR_GEN_FAILURE || broken(GetLastError() == ERROR_INVALID_HANDLE), /* win2k */ + "wrong error %u\n", GetLastError() ); + + SetLastError(0xdeadbeef); + ret = SetThreadContext( thread, &ctx ); + ok( !ret, "SetThreadContext succeeded\n" ); + ok( GetLastError() == ERROR_GEN_FAILURE || GetLastError() == ERROR_ACCESS_DENIED || + broken(GetLastError() == ERROR_INVALID_HANDLE), /* win2k */ + "wrong error %u\n", GetLastError() ); + + CloseHandle( thread ); } #endif /* __i386__ */ diff --git a/server/thread.c b/server/thread.c index 4388847..d0fdc30 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1493,7 +1493,7 @@ DECL_HANDLER(get_thread_context) suspend_thread( thread ); } } - else set_error( STATUS_ACCESS_DENIED ); + else set_error( STATUS_UNSUCCESSFUL ); } else if ((context = set_reply_data_size( sizeof(context_t) ))) { @@ -1535,7 +1535,7 @@ DECL_HANDLER(set_thread_context) suspend_thread( thread ); } } - else set_error( STATUS_ACCESS_DENIED ); + else set_error( STATUS_UNSUCCESSFUL ); } else if (context->cpu == thread->process->cpu) {

1 0

Alexandre Julliard : ntdll: Ask the server to suspend the thread in the get /set_thread_context requests.
by Alexandre Julliard May 6, 2011

May 6, 2011

Module: wine Branch: master Commit: e1eb6228f47eafbf41a4cb080678360b77505055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1eb6228f47eafbf41a4cb080… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 6 12:40:29 2011 +0200 ntdll: Ask the server to suspend the thread in the get/set_thread_context requests. --- dlls/ntdll/thread.c | 72 +++++++++++++++++++++++--------------------------- 1 files changed, 33 insertions(+), 39 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 56eca23..bd6a00c 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -699,7 +699,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) SERVER_START_REQ( set_thread_context ) { req->handle = wine_server_obj_handle( handle ); - req->suspend = 0; + req->suspend = 1; wine_server_add_data( req, &server_context, sizeof(server_context) ); ret = wine_server_call( req ); self = reply->self; @@ -708,28 +708,25 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) if (ret == STATUS_PENDING) { - if (NtSuspendThread( handle, &dummy ) == STATUS_SUCCESS) + for (i = 0; i < 100; i++) { - for (i = 0; i < 100; i++) + SERVER_START_REQ( set_thread_context ) { - SERVER_START_REQ( set_thread_context ) - { - req->handle = wine_server_obj_handle( handle ); - req->suspend = 0; - wine_server_add_data( req, &server_context, sizeof(server_context) ); - ret = wine_server_call( req ); - } - SERVER_END_REQ; - if (ret == STATUS_PENDING) - { - LARGE_INTEGER timeout; - timeout.QuadPart = -10000; - NtDelayExecution( FALSE, &timeout ); - } - else break; + req->handle = wine_server_obj_handle( handle ); + req->suspend = 0; + wine_server_add_data( req, &server_context, sizeof(server_context) ); + ret = wine_server_call( req ); + } + SERVER_END_REQ; + if (ret == STATUS_PENDING) + { + LARGE_INTEGER timeout; + timeout.QuadPart = -10000; + NtDelayExecution( FALSE, &timeout ); } - NtResumeThread( handle, &dummy ); + else break; } + NtResumeThread( handle, &dummy ); if (ret == STATUS_PENDING) ret = STATUS_ACCESS_DENIED; } @@ -789,7 +786,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) { req->handle = wine_server_obj_handle( handle ); req->flags = server_flags; - req->suspend = 0; + req->suspend = 1; wine_server_set_reply( req, &server_context, sizeof(server_context) ); ret = wine_server_call( req ); self = reply->self; @@ -798,29 +795,26 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) if (ret == STATUS_PENDING) { - if (NtSuspendThread( handle, &dummy ) == STATUS_SUCCESS) + for (i = 0; i < 100; i++) { - for (i = 0; i < 100; i++) + SERVER_START_REQ( get_thread_context ) { - SERVER_START_REQ( get_thread_context ) - { - req->handle = wine_server_obj_handle( handle ); - req->flags = server_flags; - req->suspend = 0; - wine_server_set_reply( req, &server_context, sizeof(server_context) ); - ret = wine_server_call( req ); - } - SERVER_END_REQ; - if (ret == STATUS_PENDING) - { - LARGE_INTEGER timeout; - timeout.QuadPart = -10000; - NtDelayExecution( FALSE, &timeout ); - } - else break; + req->handle = wine_server_obj_handle( handle ); + req->flags = server_flags; + req->suspend = 0; + wine_server_set_reply( req, &server_context, sizeof(server_context) ); + ret = wine_server_call( req ); + } + SERVER_END_REQ; + if (ret == STATUS_PENDING) + { + LARGE_INTEGER timeout; + timeout.QuadPart = -10000; + NtDelayExecution( FALSE, &timeout ); } - NtResumeThread( handle, &dummy ); + else break; } + NtResumeThread( handle, &dummy ); if (ret == STATUS_PENDING) ret = STATUS_ACCESS_DENIED; } if (!ret) ret = context_from_server( context, &server_context );

1 0

Alexandre Julliard : server: Add separate requests for getting/ setting the thread context during suspend.
by Alexandre Julliard May 6, 2011

May 6, 2011

Module: wine Branch: master Commit: 45075b2f9c87ac1e18b5860308ad5bc39c8129a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45075b2f9c87ac1e18b586030… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 6 12:25:34 2011 +0200 server: Add separate requests for getting/setting the thread context during suspend. --- dlls/ntdll/exception.c | 8 +--- include/wine/server_protocol.h | 34 ++++++++++++++++++- server/protocol.def | 17 ++++++++- server/request.h | 7 ++++ server/thread.c | 74 +++++++++++++++++++++++---------------- server/trace.c | 20 +++++++++++ 6 files changed, 121 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45075b2f9c87ac1e18b58…

1 0

Alexandre Julliard : server: Add support for suspending the thread directly in the get/ set_thread_context requests.
by Alexandre Julliard May 6, 2011

May 6, 2011

Module: wine Branch: master Commit: 90982480f0ad074875e74a0256dd6537c111206f URL: http://source.winehq.org/git/wine.git/?a=commit;h=90982480f0ad074875e74a025… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 6 12:31:11 2011 +0200 server: Add support for suspending the thread directly in the get/set_thread_context requests. --- server/thread.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/server/thread.c b/server/thread.c index 7cfbc60..9e56b1b 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1471,12 +1471,23 @@ DECL_HANDLER(get_thread_context) return; } if (!(thread = get_thread_from_handle( req->handle, THREAD_GET_CONTEXT ))) return; + reply->self = (thread == current); if (thread != current && !thread->context) { /* thread is not suspended, retry (if it's still running) */ - if (thread->state != RUNNING) set_error( STATUS_ACCESS_DENIED ); - else set_error( STATUS_PENDING ); + if (thread->state == RUNNING) + { + set_error( STATUS_PENDING ); + if (req->suspend) + { + release_object( thread ); + /* make sure we have suspend access */ + if (!(thread = get_thread_from_handle( req->handle, THREAD_SUSPEND_RESUME ))) return; + suspend_thread( thread ); + } + } + else set_error( STATUS_ACCESS_DENIED ); } else if ((context = set_reply_data_size( sizeof(context_t) ))) { @@ -1487,7 +1498,6 @@ DECL_HANDLER(get_thread_context) if (thread->context) copy_context( context, thread->context, req->flags & ~flags ); if (flags) get_thread_context( thread, context, flags ); } - reply->self = (thread == current); release_object( thread ); } @@ -1503,12 +1513,23 @@ DECL_HANDLER(set_thread_context) return; } if (!(thread = get_thread_from_handle( req->handle, THREAD_SET_CONTEXT ))) return; + reply->self = (thread == current); if (thread != current && !thread->context) { /* thread is not suspended, retry (if it's still running) */ - if (thread->state != RUNNING) set_error( STATUS_ACCESS_DENIED ); - else set_error( STATUS_PENDING ); + if (thread->state == RUNNING) + { + set_error( STATUS_PENDING ); + if (req->suspend) + { + release_object( thread ); + /* make sure we have suspend access */ + if (!(thread = get_thread_from_handle( req->handle, THREAD_SUSPEND_RESUME ))) return; + suspend_thread( thread ); + } + } + else set_error( STATUS_ACCESS_DENIED ); } else if (context->cpu == thread->process->cpu) { @@ -1520,7 +1541,6 @@ DECL_HANDLER(set_thread_context) } else set_error( STATUS_INVALID_PARAMETER ); - reply->self = (thread == current); release_object( thread ); }

1 0

André Hentschel : Update German download informations
by Jeremy Newman May 5, 2011

May 5, 2011

Module: website Branch: master Commit: 611e609ed8304bd4377ab6046324e51eb1590d49 URL: http://source.winehq.org/git/website.git/?a=commit;h=611e609ed8304bd4377ab6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 5 23:26:06 2011 +0200 Update German download informations --- templates/de/download.template | 17 ++----- templates/de/download/debian.template | 30 +++++++++++ templates/de/download/deblenny.template | 55 -------------------- .../de/download/{deb.template => ubuntu.template} | 6 +- 4 files changed, 37 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=611e609ed8304bd437…

1 0