April 2010 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Validate some more states.
by Alexandre Julliard 08 Apr '10

08 Apr '10

Module: wine Branch: master Commit: 284e92def932243e9d75435c2eee2caf02767363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=284e92def932243e9d75435c2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 7 21:04:48 2010 +0200 wined3d: Validate some more states. --- dlls/wined3d/state.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5d6c19a..f94aac5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5670,6 +5670,20 @@ static void validate_state_table(struct StateEntry *state_table) {196, 197}, { 0, 0}, }; + static const DWORD simple_states[] = + { + STATE_MATERIAL, + STATE_VDECL, + STATE_STREAMSRC, + STATE_INDEXBUFFER, + STATE_VERTEXSHADERCONSTANT, + STATE_PIXELSHADERCONSTANT, + STATE_VSHADER, + STATE_PIXELSHADER, + STATE_VIEWPORT, + STATE_SCISSORRECT, + STATE_FRONTFACE, + }; unsigned int i, current; for (i = STATE_RENDER(1), current = 0; i <= STATE_RENDER(WINEHIGHEST_RENDER_STATE); ++i) @@ -5685,6 +5699,13 @@ static void validate_state_table(struct StateEntry *state_table) if (i == STATE_RENDER(rs_holes[current].last)) ++current; } + for (i = 0; i < sizeof(simple_states) / sizeof(*simple_states); ++i) + { + if (!state_table[simple_states[i]].representative) + ERR("State %s (%#x) should have a representative.\n", + debug_d3dstate(simple_states[i]), simple_states[i]); + } + for (i = 0; i < STATE_HIGHEST + 1; ++i) { DWORD rep = state_table[i].representative;

1 0

Henri Verbeet : wined3d: Add a FIXME for predicated shader instructions.
by Alexandre Julliard 08 Apr '10

08 Apr '10

Module: wine Branch: master Commit: d373e14d53c375848ffeeff7ef98f9d384d99035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d373e14d53c375848ffeeff7e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 7 21:04:49 2010 +0200 wined3d: Add a FIXME for predicated shader instructions. --- dlls/wined3d/shader.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 307cadf..6836532 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1150,7 +1150,11 @@ void shader_generate_main(IWineD3DBaseShader *iface, struct wined3d_shader_buffe if (ins.dst_count) fe->shader_read_dst_param(fe_data, &ptr, &dst_param, &dst_rel_addr); /* Predication token */ - if (ins.predicate) ins.predicate = *ptr++; + if (ins.predicate) + { + FIXME("Predicates not implemented.\n"); + ins.predicate = *ptr++; + } /* Other source tokens */ for (i = 0; i < ins.src_count; ++i)

1 0

Eric Pouech : server: Correctly set the DR0.. 7 registers on Linux for x86_64 architecture.
by Alexandre Julliard 08 Apr '10

08 Apr '10

Module: wine Branch: master Commit: 9f49c6a05f33d04882ada4804315bdafe99f2b79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f49c6a05f33d04882ada4804… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 7 21:05:45 2010 +0200 server: Correctly set the DR0..7 registers on Linux for x86_64 architecture. --- server/ptrace.c | 73 +++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 55 insertions(+), 18 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 4fa48ec..b8a31cf 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -549,12 +549,28 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int goto done; } } - context->debug.i386_regs.dr0 = data[0]; - context->debug.i386_regs.dr1 = data[1]; - context->debug.i386_regs.dr2 = data[2]; - context->debug.i386_regs.dr3 = data[3]; - context->debug.i386_regs.dr6 = data[6]; - context->debug.i386_regs.dr7 = data[7]; + switch (context->cpu) + { + case CPU_x86: + context->debug.i386_regs.dr0 = data[0]; + context->debug.i386_regs.dr1 = data[1]; + context->debug.i386_regs.dr2 = data[2]; + context->debug.i386_regs.dr3 = data[3]; + context->debug.i386_regs.dr6 = data[6]; + context->debug.i386_regs.dr7 = data[7]; + break; + case CPU_x86_64: + context->debug.x86_64_regs.dr0 = data[0]; + context->debug.x86_64_regs.dr1 = data[1]; + context->debug.x86_64_regs.dr2 = data[2]; + context->debug.x86_64_regs.dr3 = data[3]; + context->debug.x86_64_regs.dr6 = data[6]; + context->debug.x86_64_regs.dr7 = data[7]; + break; + default: + set_error( STATUS_INVALID_PARAMETER ); + goto done; + } context->flags |= SERVER_CTX_DEBUG_REGISTERS; done: resume_after_ptrace( thread ); @@ -570,18 +586,39 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign if (!suspend_for_ptrace( thread )) return; - if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(0), context->debug.i386_regs.dr0 ) == -1) goto error; - if (thread->context) thread->context->debug.i386_regs.dr0 = context->debug.i386_regs.dr0; - if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(1), context->debug.i386_regs.dr1 ) == -1) goto error; - if (thread->context) thread->context->debug.i386_regs.dr1 = context->debug.i386_regs.dr1; - if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(2), context->debug.i386_regs.dr2 ) == -1) goto error; - if (thread->context) thread->context->debug.i386_regs.dr2 = context->debug.i386_regs.dr2; - if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(3), context->debug.i386_regs.dr3 ) == -1) goto error; - if (thread->context) thread->context->debug.i386_regs.dr3 = context->debug.i386_regs.dr3; - if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(6), context->debug.i386_regs.dr6 ) == -1) goto error; - if (thread->context) thread->context->debug.i386_regs.dr6 = context->debug.i386_regs.dr6; - if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.i386_regs.dr7 ) == -1) goto error; - if (thread->context) thread->context->debug.i386_regs.dr7 = context->debug.i386_regs.dr7; + switch (context->cpu) + { + case CPU_x86: + if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(0), context->debug.i386_regs.dr0 ) == -1) goto error; + if (thread->context) thread->context->debug.i386_regs.dr0 = context->debug.i386_regs.dr0; + if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(1), context->debug.i386_regs.dr1 ) == -1) goto error; + if (thread->context) thread->context->debug.i386_regs.dr1 = context->debug.i386_regs.dr1; + if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(2), context->debug.i386_regs.dr2 ) == -1) goto error; + if (thread->context) thread->context->debug.i386_regs.dr2 = context->debug.i386_regs.dr2; + if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(3), context->debug.i386_regs.dr3 ) == -1) goto error; + if (thread->context) thread->context->debug.i386_regs.dr3 = context->debug.i386_regs.dr3; + if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(6), context->debug.i386_regs.dr6 ) == -1) goto error; + if (thread->context) thread->context->debug.i386_regs.dr6 = context->debug.i386_regs.dr6; + if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.i386_regs.dr7 ) == -1) goto error; + if (thread->context) thread->context->debug.i386_regs.dr7 = context->debug.i386_regs.dr7; + break; + case CPU_x86_64: + if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(0), context->debug.x86_64_regs.dr0 ) == -1) goto error; + if (thread->context) thread->context->debug.x86_64_regs.dr0 = context->debug.x86_64_regs.dr0; + if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(1), context->debug.x86_64_regs.dr1 ) == -1) goto error; + if (thread->context) thread->context->debug.x86_64_regs.dr1 = context->debug.x86_64_regs.dr1; + if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(2), context->debug.x86_64_regs.dr2 ) == -1) goto error; + if (thread->context) thread->context->debug.x86_64_regs.dr2 = context->debug.x86_64_regs.dr2; + if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(3), context->debug.x86_64_regs.dr3 ) == -1) goto error; + if (thread->context) thread->context->debug.x86_64_regs.dr3 = context->debug.x86_64_regs.dr3; + if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(6), context->debug.x86_64_regs.dr6 ) == -1) goto error; + if (thread->context) thread->context->debug.x86_64_regs.dr6 = context->debug.x86_64_regs.dr6; + if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.x86_64_regs.dr7 ) == -1) goto error; + if (thread->context) thread->context->debug.x86_64_regs.dr7 = context->debug.x86_64_regs.dr7; + break; + default: + set_error( STATUS_INVALID_PARAMETER ); + } resume_after_ptrace( thread ); return; error:

1 0

Eric Pouech : dbghelp: When trying to enumerate locals & parameters with SymEnumSymbols, don' t return a global or public symbol when the nearest symbol of the current context isn 't a function.
by Alexandre Julliard 08 Apr '10

08 Apr '10

Module: wine Branch: master Commit: e520605fa90fb16414d879e894aaa854a6fd16b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e520605fa90fb16414d879e89… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 7 22:23:52 2010 +0200 dbghelp: When trying to enumerate locals & parameters with SymEnumSymbols, don't return a global or public symbol when the nearest symbol of the current context isn't a function. --- dlls/dbghelp/symbol.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index e53b583..0eac098 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1037,9 +1037,8 @@ static BOOL symt_enum_locals(struct process* pcs, const char* mask, &((struct symt_function*)sym)->vchildren); regfree(&preg); return ret; - } - return send_symbol(se, &pair, NULL, &sym->symt); + return FALSE; } /******************************************************************

1 0

Paul Vriens : ddrawex/tests: Don't crash on Windows 95.
by Alexandre Julliard 08 Apr '10

08 Apr '10

Module: wine Branch: master Commit: 9a787f7021703810fb40a6e91c220f90e685450a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a787f7021703810fb40a6e91… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Apr 7 21:47:16 2010 +0200 ddrawex/tests: Don't crash on Windows 95. --- dlls/ddrawex/tests/surface.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ddrawex/tests/surface.c b/dlls/ddrawex/tests/surface.c index d5d347b..fb3def9 100644 --- a/dlls/ddrawex/tests/surface.c +++ b/dlls/ddrawex/tests/surface.c @@ -317,6 +317,11 @@ static void test_surface_from_dc4(void) dd1 = createDD(); hr = IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw4, (void **)&dd4); + if (hr == E_NOINTERFACE) { + win_skip("DirectDraw4 is not supported\n"); + IDirectDraw_Release(dd1); + return; + } ok(SUCCEEDED(hr), "IDirectDraw_QueryInterface failed, hr %#x.\n", hr); IDirectDraw_Release(dd1);

1 0

Paul Vriens : rsaenh/tests: Run tests again on Windows 95.
by Alexandre Julliard 08 Apr '10

08 Apr '10

Module: wine Branch: master Commit: d474fa6a6c0c7c06af855c9e7871ab3eb23f1901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d474fa6a6c0c7c06af855c9e7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Apr 7 22:03:17 2010 +0200 rsaenh/tests: Run tests again on Windows 95. --- dlls/rsaenh/tests/rsaenh.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 5fe0033..0bc3d57 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -465,7 +465,7 @@ static void test_hashes(void) ok(!result && GetLastError() == NTE_BAD_ALGID, "expected NTE_BAD_ALGID, got %08x\n", GetLastError()); - result = CryptAcquireContextW(&prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + result = CryptAcquireContextA(&prov, NULL, szProvider, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); ok(result, "CryptAcquireContext failed 0x%08x\n", GetLastError()); result = CryptCreateHash(prov, CALG_SHA1, 0, 0, &hHash); @@ -487,7 +487,13 @@ static void test_hashes(void) ok(!result, "CryptDestroyHash succeeded\n"); ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", error); - result = CryptAcquireContextW(&prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + if (!pCryptDuplicateHash) + { + win_skip("CryptDuplicateHash is not available\n"); + return; + } + + result = CryptAcquireContextA(&prov, NULL, szProvider, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); ok(result, "CryptAcquireContext failed 0x%08x\n", GetLastError()); result = CryptCreateHash(hProv, CALG_SHA1, 0, 0, &hHash); @@ -496,7 +502,7 @@ static void test_hashes(void) result = CryptHashData(hHash, (const BYTE *)"data", sizeof("data"), 0); ok(result, "CryptHashData failed 0x%08x\n", GetLastError()); - result = CryptDuplicateHash(hHash, NULL, 0, &hHashClone); + result = pCryptDuplicateHash(hHash, NULL, 0, &hHashClone); ok(result, "CryptDuplicateHash failed 0x%08x\n", GetLastError()); len = 20;

1 0

Joel Holdsworth : user32: Replaced oic_bang.ico with Tango compliant icon.
by Alexandre Julliard 08 Apr '10

08 Apr '10

Module: wine Branch: master Commit: 55ac8659651418546c66d4134ebac540828a1447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55ac8659651418546c66d4134… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Thu Apr 8 01:03:07 2010 +0100 user32: Replaced oic_bang.ico with Tango compliant icon. --- dlls/user32/Makefile.in | 4 ++- dlls/user32/resources/oic_bang.ico | Bin 766 -> 25214 bytes dlls/user32/resources/oic_bang.svg | 43 ++++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=55ac8659651418546c66d…

1 0

Joel Holdsworth : user32: Replaced oic_hand.ico with Tango compliant icon.
by Alexandre Julliard 08 Apr '10

08 Apr '10

Module: wine Branch: master Commit: 0f5499ecd4717e8b3e28d8598f6a39e9c400995c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f5499ecd4717e8b3e28d8598… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Thu Apr 8 01:03:11 2010 +0100 user32: Replaced oic_hand.ico with Tango compliant icon. --- dlls/user32/Makefile.in | 1 + dlls/user32/resources/oic_hand.ico | Bin 766 -> 25214 bytes dlls/user32/resources/oic_hand.svg | 72 ++++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f5499ecd4717e8b3e28d…

1 0

Joel Holdsworth : user32: Replaced oic_note.ico with Tango compliant icon.
by Alexandre Julliard 08 Apr '10

08 Apr '10

Module: wine Branch: master Commit: 7b68f9a0edbfa722ab525637a881cd6c9d3bf85c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b68f9a0edbfa722ab525637a… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Thu Apr 8 01:03:14 2010 +0100 user32: Replaced oic_note.ico with Tango compliant icon. --- dlls/user32/Makefile.in | 1 + dlls/user32/resources/oic_note.ico | Bin 766 -> 25214 bytes dlls/user32/resources/oic_note.svg | 59 ++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b68f9a0edbfa722ab525…

1 0

Joel Holdsworth : user32: Replaced oic_ques.ico with Tango compliant icon.
by Alexandre Julliard 08 Apr '10

08 Apr '10

Module: wine Branch: master Commit: db3092cf79d556fff62ff63c7032a431e94a20b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db3092cf79d556fff62ff63c7… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Thu Apr 8 01:03:18 2010 +0100 user32: Replaced oic_ques.ico with Tango compliant icon. --- dlls/user32/Makefile.in | 1 + dlls/user32/resources/oic_ques.ico | Bin 766 -> 25214 bytes dlls/user32/resources/oic_ques.svg | 57 ++++++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db3092cf79d556fff62ff…

1 0