September 2008 - Wine-Commits

Alexandre Julliard : crypt32: Avoid some uninitialized variable warnings on older gcc.
by Alexandre Julliard Sept. 5, 2008

Sept. 5, 2008

Module: wine Branch: master Commit: ced5cb67ed8a8c02fe9dca2eac4a073d53d9f90f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ced5cb67ed8a8c02fe9dca2ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 5 11:32:59 2008 +0200 crypt32: Avoid some uninitialized variable warnings on older gcc. --- dlls/crypt32/msg.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index d7dfa07..1c07e05 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2073,7 +2073,7 @@ static BOOL CRYPT_CopyKeyIdAsIssuerAndSerial(CERT_NAME_BLOB *issuer, static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData, const CMSG_CMS_SIGNER_INFO *in) { - DWORD size = sizeof(CMSG_SIGNER_INFO), rdnSize; + DWORD size = sizeof(CMSG_SIGNER_INFO), rdnSize = 0; BOOL ret; TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in); @@ -2219,7 +2219,7 @@ static BOOL CRYPT_CopyCMSSignerInfo(void *pvData, DWORD *pcbData, static BOOL CRYPT_CopySignerCertInfo(void *pvData, DWORD *pcbData, const CMSG_CMS_SIGNER_INFO *in) { - DWORD size = sizeof(CERT_INFO), rdnSize; + DWORD size = sizeof(CERT_INFO), rdnSize = 0; BOOL ret; TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in); @@ -2803,7 +2803,7 @@ BOOL WINAPI CryptMsgGetAndVerifySigner(HCRYPTMSG hCryptMsg, DWORD cSignerStore, DWORD *pdwSignerIndex) { HCERTSTORE store; - DWORD i, signerIndex; + DWORD i, signerIndex = 0; PCCERT_CONTEXT signerCert = NULL; BOOL ret = FALSE;

1 0

Alexandre Julliard : shlwapi/tests: Avoid sizeof in traces.
by Alexandre Julliard Sept. 5, 2008

Sept. 5, 2008

Module: wine Branch: master Commit: b63c6486563b5deb91ec95edc945afc46971938e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b63c6486563b5deb91ec95edc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 5 11:25:21 2008 +0200 shlwapi/tests: Avoid sizeof in traces. --- dlls/shlwapi/tests/url.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index c7c6f8f..e2f7f1a 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -424,13 +424,13 @@ static void test_UrlApplyScheme(void) len = TEST_APPLY_MAX_LENGTH; res = UrlApplySchemeA(NULL, newurl, &len, TEST_APPLY[0].flags); ok(res == E_INVALIDARG, "got HRESULT 0x%x (expected E_INVALIDARG)\n", res); - ok(len == TEST_APPLY_MAX_LENGTH, "got len %d (expected %d)\n", len, TEST_APPLY_MAX_LENGTH); + ok(len == TEST_APPLY_MAX_LENGTH, "got len %d\n", len); ok(!lstrcmpA(newurl, untouchedA), "got '%s' (expected '%s')\n", newurl, untouchedA); len = TEST_APPLY_MAX_LENGTH; res = UrlApplySchemeA(TEST_APPLY[0].url, NULL, &len, TEST_APPLY[0].flags); ok(res == E_INVALIDARG, "got HRESULT 0x%x (expected E_INVALIDARG)\n", res); - ok(len == TEST_APPLY_MAX_LENGTH, "got len %d (expected %d)\n", len, TEST_APPLY_MAX_LENGTH); + ok(len == TEST_APPLY_MAX_LENGTH, "got len %d\n", len); lstrcpyA(newurl, untouchedA); res = UrlApplySchemeA(TEST_APPLY[0].url, newurl, NULL, TEST_APPLY[0].flags);

1 0

Alexandre Julliard : jscript: Avoid an uninitialized variable warning on older gcc.
by Alexandre Julliard Sept. 5, 2008

Sept. 5, 2008

Module: wine Branch: master Commit: dcc26cf8065cd2091f519e347d5ec5de3fde4f8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcc26cf8065cd2091f519e347… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 5 11:25:36 2008 +0200 jscript: Avoid an uninitialized variable warning on older gcc. --- dlls/jscript/parser.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 15584ca..a9e2063 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -951,7 +951,7 @@ static case_list_t *case_list_add(parser_ctx_t *ctx, case_list_t *list, case_cla static case_clausule_t *new_case_block(parser_ctx_t *ctx, case_list_t *case_list1, case_clausule_t *default_clausule, case_list_t *case_list2) { - case_clausule_t *ret = NULL, *iter, *iter2; + case_clausule_t *ret = NULL, *iter = NULL, *iter2; statement_t *stat = NULL; if(case_list1) {

1 0

Jacek Caban : jscript: Added empty statement implementation.
by Alexandre Julliard Sept. 5, 2008

Sept. 5, 2008

Module: wine Branch: master Commit: b40b352c8f8e995d06f1ab04742edadfc832cb05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b40b352c8f8e995d06f1ab047… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 5 02:39:07 2008 +0200 jscript: Added empty statement implementation. --- dlls/jscript/engine.c | 6 ++++-- dlls/jscript/tests/run.c | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 827087f..ef66c97 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -114,8 +114,10 @@ HRESULT var_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt HRESULT empty_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + V_VT(ret) = VT_EMPTY; + return S_OK; } HRESULT expression_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index af3d886..b9daee4 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -349,6 +349,7 @@ static void parse_script_a(const char *src) static void run_tests(void) { parse_script_a(""); + parse_script_a("/* empty */ ;"); } START_TEST(run)

1 0

Jacek Caban : jscript: Added ParseScriptText test.
by Alexandre Julliard Sept. 5, 2008

Sept. 5, 2008

Module: wine Branch: master Commit: a7ede8f272a4545a56703acbe97a52c7afd34553 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7ede8f272a4545a56703acbe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 5 02:38:44 2008 +0200 jscript: Added ParseScriptText test. --- dlls/jscript/tests/Makefile.in | 5 +- dlls/jscript/tests/run.c | 361 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 364 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a7ede8f272a4545a56703…

1 0

Jacek Caban : jscript: Added IActiveScript::ParseScriptText implementation.
by Alexandre Julliard Sept. 5, 2008

Sept. 5, 2008

Module: wine Branch: master Commit: 69f8b4b9b23013e8bf879cced575c910f10fdb09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f8b4b9b23013e8bf879cced… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 5 02:37:59 2008 +0200 jscript: Added IActiveScript::ParseScriptText implementation. --- dlls/jscript/Makefile.in | 2 +- dlls/jscript/engine.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/engine.h | 34 ++++++++++++++------ dlls/jscript/jscript.c | 72 +++++++++++++++++++++++++++++++++++++++++- dlls/jscript/jscript.h | 7 ++++ 5 files changed, 179 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 96d8c37..095659b 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = jscript.dll -IMPORTS = kernel32 +IMPORTS = oleaut32 kernel32 RC_SRCS = rsrc.rc diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index a65e5d8..827087f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -23,6 +23,83 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); +static inline HRESULT stat_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) +{ + return stat->eval(ctx, stat, rt, ret); +} + +HRESULT create_exec_ctx(exec_ctx_t **ret) +{ + exec_ctx_t *ctx; + + ctx = heap_alloc_zero(sizeof(exec_ctx_t)); + if(!ctx) + return E_OUTOFMEMORY; + + *ret = ctx; + return S_OK; +} + +void exec_release(exec_ctx_t *ctx) +{ + if(--ctx->ref) + return; + + heap_free(ctx); +} + +HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *source, jsexcept_t *ei, VARIANT *retv) +{ + script_ctx_t *script = parser->script; + parser_ctx_t *prev_parser; + VARIANT val, tmp; + statement_t *stat; + exec_ctx_t *prev_ctx; + return_type_t rt; + HRESULT hres = S_OK; + + prev_ctx = script->exec_ctx; + script->exec_ctx = ctx; + + prev_parser = ctx->parser; + ctx->parser = parser; + + V_VT(&val) = VT_EMPTY; + memset(&rt, 0, sizeof(rt)); + rt.type = RT_NORMAL; + + for(stat = source->statement; stat; stat = stat->next) { + hres = stat_eval(ctx, stat, &rt, &tmp); + if(FAILED(hres)) + break; + + VariantClear(&val); + val = tmp; + if(rt.type != RT_NORMAL) + break; + } + + script->exec_ctx = prev_ctx; + ctx->parser = prev_parser; + + if(rt.type != RT_NORMAL && rt.type != RT_RETURN) { + FIXME("wrong rt %d\n", rt.type); + hres = E_FAIL; + } + + *ei = rt.ei; + if(FAILED(hres)) { + VariantClear(&val); + return hres; + } + + if(retv) + *retv = val; + else + VariantClear(&val); + return S_OK; +} + HRESULT block_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) { FIXME("\n"); diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 1fad3dd..6e91178 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -32,6 +32,8 @@ typedef struct _parser_ctx_t { jsheap_t tmp_heap; jsheap_t heap; + + struct _parser_ctx_t *next; } parser_ctx_t; HRESULT script_parse(script_ctx_t*,const WCHAR*,parser_ctx_t**); @@ -54,17 +56,20 @@ static inline void *parser_alloc_tmp(parser_ctx_t *ctx, DWORD size) return jsheap_alloc(&ctx->tmp_heap, size); } -typedef struct { - enum{ - RT_NORMAL, - RT_RETURN, - RT_BREAK - } type; -} return_type_t; +struct _exec_ctx_t { + LONG ref; -typedef struct _exec_ctx_t { parser_ctx_t *parser; -} exec_ctx_t; +}; + +static inline void exec_addref(exec_ctx_t *ctx) +{ + ctx->ref++; +} + +void exec_release(exec_ctx_t*); +HRESULT create_exec_ctx(exec_ctx_t**); +HRESULT exec_source(exec_ctx_t*,parser_ctx_t*,source_elements_t*,jsexcept_t*,VARIANT*); typedef struct _statement_t statement_t; typedef struct _expression_t expression_t; @@ -88,6 +93,16 @@ typedef struct _variable_declaration_t { struct _variable_declaration_t *next; } variable_declaration_t; +typedef struct { + enum{ + RT_NORMAL, + RT_RETURN, + RT_BREAK, + RT_CONTINUE + } type; + jsexcept_t ei; +} return_type_t; + typedef HRESULT (*statement_eval_t)(exec_ctx_t*,statement_t*,return_type_t*,VARIANT*); struct _statement_t { @@ -201,7 +216,6 @@ HRESULT throw_statement_eval(exec_ctx_t*,statement_t*,return_type_t*,VARIANT*); HRESULT try_statement_eval(exec_ctx_t*,statement_t*,return_type_t*,VARIANT*); typedef struct exprval_t exprval_t; -typedef struct jsexcept_t jsexcept_t; typedef HRESULT (*expression_eval_t)(exec_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*); diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 27cf071..adfd73c 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -38,6 +38,9 @@ typedef struct { LONG thread_id; IActiveScriptSite *site; + + parser_ctx_t *queue_head; + parser_ctx_t *queue_tail; } JScript; #define ACTSCRIPT(x) ((IActiveScript*) &(x)->lpIActiveScriptVtbl) @@ -63,6 +66,56 @@ static void change_state(JScript *This, SCRIPTSTATE state) IActiveScriptSite_OnStateChange(This->site, state); } +static inline BOOL is_started(script_ctx_t *ctx) +{ + return ctx->state == SCRIPTSTATE_STARTED + || ctx->state == SCRIPTSTATE_CONNECTED + || ctx->state == SCRIPTSTATE_DISCONNECTED; +} + +static HRESULT exec_global_code(JScript *This, parser_ctx_t *parser_ctx) +{ + exec_ctx_t *exec_ctx; + jsexcept_t jsexcept; + VARIANT var; + HRESULT hres; + + hres = create_exec_ctx(&exec_ctx); + if(FAILED(hres)) + return hres; + + IActiveScriptSite_OnEnterScript(This->site); + + memset(&jsexcept, 0, sizeof(jsexcept)); + hres = exec_source(exec_ctx, parser_ctx, parser_ctx->source, &jsexcept, &var); + VariantClear(&jsexcept.var); + exec_release(exec_ctx); + if(SUCCEEDED(hres)) + VariantClear(&var); + + IActiveScriptSite_OnLeaveScript(This->site); + + return hres; +} + +static void clear_script_queue(JScript *This) +{ + parser_ctx_t *iter, *iter2; + + if(!This->queue_head) + return; + + iter = This->queue_head; + while(iter) { + iter2 = iter->next; + iter->next = NULL; + parser_release(iter); + iter = iter2; + } + + This->queue_head = This->queue_tail = NULL; +} + #define ACTSCRIPT_THIS(iface) DEFINE_THIS(JScript, IActiveScript, iface) static HRESULT WINAPI JScript_QueryInterface(IActiveScript *iface, REFIID riid, void **ppv) @@ -216,6 +269,8 @@ static HRESULT WINAPI JScript_Close(IActiveScript *iface) if(This->thread_id != GetCurrentThreadId()) return E_UNEXPECTED; + clear_script_queue(This); + if(This->ctx) { change_state(This, SCRIPTSTATE_CLOSED); @@ -398,16 +453,29 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, parser_ctx_t *parser_ctx; HRESULT hres; - FIXME("(%p)->(%s %s %p %s %x %u %x %p %p)\n", This, debugstr_w(pstrCode), + TRACE("(%p)->(%s %s %p %s %x %u %x %p %p)\n", This, debugstr_w(pstrCode), debugstr_w(pstrItemName), punkContext, debugstr_w(pstrDelimiter), dwSourceContextCookie, ulStartingLine, dwFlags, pvarResult, pexcepinfo); + if(This->thread_id != GetCurrentThreadId() || This->ctx->state == SCRIPTSTATE_CLOSED) + return E_UNEXPECTED; + hres = script_parse(This->ctx, pstrCode, &parser_ctx); if(FAILED(hres)) return hres; + if(!is_started(This->ctx)) { + if(This->queue_tail) + This->queue_tail = This->queue_tail->next = parser_ctx; + else + This->queue_head = This->queue_tail = parser_ctx; + return S_OK; + } + + hres = exec_global_code(This, parser_ctx); parser_release(parser_ctx); - return E_NOTIMPL; + + return hres; } #undef ASPARSE_THIS diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 1f55604..0fff0e8 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -32,6 +32,12 @@ #include "wine/list.h" typedef struct _script_ctx_t script_ctx_t; +typedef struct _exec_ctx_t exec_ctx_t; + +typedef struct { + EXCEPINFO ei; + VARIANT var; +} jsexcept_t; typedef struct DispatchEx { const IDispatchExVtbl *lpIDispatchExVtbl; @@ -49,6 +55,7 @@ struct _script_ctx_t { LONG ref; SCRIPTSTATE state; + exec_ctx_t *exec_ctx; LCID lcid; DispatchEx *script_disp;

1 0

Jacek Caban : jscript: Added SCRIPTSTATE_STARTED implementation.
by Alexandre Julliard Sept. 5, 2008

Sept. 5, 2008

Module: wine Branch: master Commit: 51a2ccb4c475295741c03efe98b8a46bb82c509b URL: http://source.winehq.org/git/wine.git/?a=commit;h=51a2ccb4c475295741c03efe9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 5 02:38:17 2008 +0200 jscript: Added SCRIPTSTATE_STARTED implementation. --- dlls/jscript/jscript.c | 32 ++++++++++++++++++++++++++++++-- dlls/jscript/tests/jscript.c | 7 +++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index adfd73c..2bd9f12 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -116,6 +116,16 @@ static void clear_script_queue(JScript *This) This->queue_head = This->queue_tail = NULL; } +static void exec_queued_code(JScript *This) +{ + parser_ctx_t *iter; + + for(iter = This->queue_head; iter; iter = iter->next) + exec_global_code(This, iter); + + clear_script_queue(This); +} + #define ACTSCRIPT_THIS(iface) DEFINE_THIS(JScript, IActiveScript, iface) static HRESULT WINAPI JScript_QueryInterface(IActiveScript *iface, REFIID riid, void **ppv) @@ -235,8 +245,26 @@ static HRESULT WINAPI JScript_GetScriptSite(IActiveScript *iface, REFIID riid, static HRESULT WINAPI JScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE ss) { JScript *This = ACTSCRIPT_THIS(iface); - FIXME("(%p)->(%d)\n", This, ss); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, ss); + + if(!This->ctx || GetCurrentThreadId() != This->thread_id) + return E_UNEXPECTED; + + switch(ss) { + case SCRIPTSTATE_STARTED: + if(This->ctx->state == SCRIPTSTATE_CLOSED) + return E_UNEXPECTED; + + exec_queued_code(This); + break; + default: + FIXME("unimplemented state %d\n", ss); + return E_NOTIMPL; + } + + change_state(This, ss); + return S_OK; } static HRESULT WINAPI JScript_GetScriptState(IActiveScript *iface, SCRIPTSTATE *pssState) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index d923f33..b0c532f 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -317,6 +317,13 @@ static void test_jscript(void) test_script_dispatch(script, TRUE); + SET_EXPECT(OnStateChange_STARTED); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_STARTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_STARTED); + + test_state(script, SCRIPTSTATE_STARTED); + SET_EXPECT(OnStateChange_CLOSED); hres = IActiveScript_Close(script); ok(hres == S_OK, "Close failed: %08x\n", hres);

1 0

Stefan Dösinger : wined3d: Fix uploading higher transform matrices.
by Alexandre Julliard Sept. 5, 2008

Sept. 5, 2008

Module: wine Branch: master Commit: fe64fe5ef809d79722b88f8833493b9ac760b896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe64fe5ef809d79722b88f883… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 4 13:58:11 2008 -0500 wined3d: Fix uploading higher transform matrices. --- dlls/wined3d/state.c | 510 +++++++++++++++++++++++++------------------------- 1 files changed, 255 insertions(+), 255 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe64fe5ef809d79722b88…

1 0

Stefan Dösinger : wined3d: Close a pshader on-off switching loophole.
by Alexandre Julliard Sept. 5, 2008

Sept. 5, 2008

Module: wine Branch: master Commit: 271f56c9f142da4cf370e5cbb6d2d0015751495a URL: http://source.winehq.org/git/wine.git/?a=commit;h=271f56c9f142da4cf370e5cbb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 3 16:07:37 2008 -0500 wined3d: Close a pshader on-off switching loophole. --- dlls/wined3d/arb_program_shader.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ca65e3e..7fa88c0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2912,6 +2912,13 @@ static void fragment_prog_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, if(isStateDirty(context, STATE_RENDER(WINED3DRS_FOGENABLE))) { if(use_pshader) { IWineD3DPixelShader_CompileShader(stateblock->pixelShader); + } else if(device->shader_backend == &arb_program_shader_backend && context->last_was_pshader) { + /* Reload fixed function constants since they collide with the pixel shader constants */ + for(i = 0; i < MAX_TEXTURES; i++) { + set_bumpmat_arbfp(STATE_TEXTURESTAGE(i, WINED3DTSS_BUMPENVMAT00), stateblock, context); + } + state_texfactor_arbfp(STATE_RENDER(WINED3DRS_TEXTUREFACTOR), stateblock, context); + state_arb_specularenable(STATE_RENDER(WINED3DRS_SPECULARENABLE), stateblock, context); } return; }

1 0

Stefan Dösinger : wined3d: Fix the pixelformat selection logic.
by Alexandre Julliard Sept. 5, 2008

Sept. 5, 2008

Module: wine Branch: master Commit: c36e033856b811d19a2abb1024b0ffe1b71cc1eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c36e033856b811d19a2abb102… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 3 13:56:17 2008 -0500 wined3d: Fix the pixelformat selection logic. --- dlls/wined3d/context.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2f30aff..088142e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -136,12 +136,12 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DF * only offer 32 bit ARB pixel formats. First try without an exact alpha * match, then try without an exact alpha and color match. */ - { FALSE, TRUE, TRUE }, { TRUE, TRUE, TRUE }, - { FALSE, FALSE, TRUE }, - { FALSE, FALSE, FALSE }, { TRUE, FALSE, TRUE }, + { FALSE, TRUE, TRUE }, + { FALSE, FALSE, TRUE }, { TRUE, FALSE, FALSE }, + { FALSE, FALSE, FALSE }, }; int i = 0;

1 0