December 2008 - Wine-Commits

Paul Vriens : riched20/tests: Remove the todo_wine logic where appropriate.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: 696512b6cb7912b555a64245f3a3b44b98ad6268 URL: http://source.winehq.org/git/wine.git/?a=commit;h=696512b6cb7912b555a64245f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Dec 10 11:30:36 2008 +0100 riched20/tests: Remove the todo_wine logic where appropriate. --- dlls/riched20/tests/editor.c | 100 +++++++++++++++++++---------------------- 1 files changed, 46 insertions(+), 54 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index bc93899..f4f5f1b 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -148,80 +148,79 @@ struct find_s { const char *needle; int flags; int expected_loc; - int _todo_wine; }; struct find_s find_tests[] = { /* Find in empty text */ - {0, -1, "foo", FR_DOWN, -1, 0}, - {0, -1, "foo", 0, -1, 0}, - {0, -1, "", FR_DOWN, -1, 0}, - {20, 5, "foo", FR_DOWN, -1, 0}, - {5, 20, "foo", FR_DOWN, -1, 0} + {0, -1, "foo", FR_DOWN, -1}, + {0, -1, "foo", 0, -1}, + {0, -1, "", FR_DOWN, -1}, + {20, 5, "foo", FR_DOWN, -1}, + {5, 20, "foo", FR_DOWN, -1} }; struct find_s find_tests2[] = { /* No-result find */ - {0, -1, "foo", FR_DOWN | FR_MATCHCASE, -1, 0}, - {5, 20, "WINE", FR_DOWN | FR_MATCHCASE, -1, 0}, + {0, -1, "foo", FR_DOWN | FR_MATCHCASE, -1}, + {5, 20, "WINE", FR_DOWN | FR_MATCHCASE, -1}, /* Subsequent finds */ - {0, -1, "Wine", FR_DOWN | FR_MATCHCASE, 4, 0}, - {5, 31, "Wine", FR_DOWN | FR_MATCHCASE, 13, 0}, - {14, 31, "Wine", FR_DOWN | FR_MATCHCASE, 23, 0}, - {24, 31, "Wine", FR_DOWN | FR_MATCHCASE, 27, 0}, + {0, -1, "Wine", FR_DOWN | FR_MATCHCASE, 4}, + {5, 31, "Wine", FR_DOWN | FR_MATCHCASE, 13}, + {14, 31, "Wine", FR_DOWN | FR_MATCHCASE, 23}, + {24, 31, "Wine", FR_DOWN | FR_MATCHCASE, 27}, /* Find backwards */ - {19, 20, "Wine", FR_MATCHCASE, 13, 0}, - {10, 20, "Wine", FR_MATCHCASE, 4, 0}, - {20, 10, "Wine", FR_MATCHCASE, 13, 0}, + {19, 20, "Wine", FR_MATCHCASE, 13}, + {10, 20, "Wine", FR_MATCHCASE, 4}, + {20, 10, "Wine", FR_MATCHCASE, 13}, /* Case-insensitive */ - {1, 31, "wInE", FR_DOWN, 4, 0}, - {1, 31, "Wine", FR_DOWN, 4, 0}, + {1, 31, "wInE", FR_DOWN, 4}, + {1, 31, "Wine", FR_DOWN, 4}, /* High-to-low ranges */ - {20, 5, "Wine", FR_DOWN, -1, 0}, - {2, 1, "Wine", FR_DOWN, -1, 0}, - {30, 29, "Wine", FR_DOWN, -1, 0}, - {20, 5, "Wine", 0, 13, 0}, + {20, 5, "Wine", FR_DOWN, -1}, + {2, 1, "Wine", FR_DOWN, -1}, + {30, 29, "Wine", FR_DOWN, -1}, + {20, 5, "Wine", 0, 13}, /* Find nothing */ - {5, 10, "", FR_DOWN, -1, 0}, - {10, 5, "", FR_DOWN, -1, 0}, - {0, -1, "", FR_DOWN, -1, 0}, - {10, 5, "", 0, -1, 0}, + {5, 10, "", FR_DOWN, -1}, + {10, 5, "", FR_DOWN, -1}, + {0, -1, "", FR_DOWN, -1}, + {10, 5, "", 0, -1}, /* Whole-word search */ - {0, -1, "wine", FR_DOWN | FR_WHOLEWORD, 18, 0}, - {0, -1, "win", FR_DOWN | FR_WHOLEWORD, -1, 0}, - {13, -1, "wine", FR_DOWN | FR_WHOLEWORD, 18, 0}, - {0, -1, "winewine", FR_DOWN | FR_WHOLEWORD, 0, 0}, - {10, -1, "winewine", FR_DOWN | FR_WHOLEWORD, 23, 0}, - {11, -1, "winewine", FR_WHOLEWORD, 0, 0}, - {31, -1, "winewine", FR_WHOLEWORD, 23, 0}, + {0, -1, "wine", FR_DOWN | FR_WHOLEWORD, 18}, + {0, -1, "win", FR_DOWN | FR_WHOLEWORD, -1}, + {13, -1, "wine", FR_DOWN | FR_WHOLEWORD, 18}, + {0, -1, "winewine", FR_DOWN | FR_WHOLEWORD, 0}, + {10, -1, "winewine", FR_DOWN | FR_WHOLEWORD, 23}, + {11, -1, "winewine", FR_WHOLEWORD, 0}, + {31, -1, "winewine", FR_WHOLEWORD, 23}, /* Bad ranges */ - {5, 200, "XXX", FR_DOWN, -1, 0}, - {-20, 20, "Wine", FR_DOWN, -1, 0}, - {-20, 20, "Wine", FR_DOWN, -1, 0}, - {-15, -20, "Wine", FR_DOWN, -1, 0}, - {1<<12, 1<<13, "Wine", FR_DOWN, -1, 0}, + {5, 200, "XXX", FR_DOWN, -1}, + {-20, 20, "Wine", FR_DOWN, -1}, + {-20, 20, "Wine", FR_DOWN, -1}, + {-15, -20, "Wine", FR_DOWN, -1}, + {1<<12, 1<<13, "Wine", FR_DOWN, -1}, /* Check the case noted in bug 4479 where matches at end aren't recognized */ - {23, 31, "Wine", FR_DOWN | FR_MATCHCASE, 23, 0}, - {27, 31, "Wine", FR_DOWN | FR_MATCHCASE, 27, 0}, - {27, 32, "Wine", FR_DOWN | FR_MATCHCASE, 27, 0}, - {13, 31, "WineWine", FR_DOWN | FR_MATCHCASE, 23, 0}, - {13, 32, "WineWine", FR_DOWN | FR_MATCHCASE, 23, 0}, + {23, 31, "Wine", FR_DOWN | FR_MATCHCASE, 23}, + {27, 31, "Wine", FR_DOWN | FR_MATCHCASE, 27}, + {27, 32, "Wine", FR_DOWN | FR_MATCHCASE, 27}, + {13, 31, "WineWine", FR_DOWN | FR_MATCHCASE, 23}, + {13, 32, "WineWine", FR_DOWN | FR_MATCHCASE, 23}, /* The backwards case of bug 4479; bounds look right * Fails because backward find is wrong */ - {19, 20, "WINE", FR_MATCHCASE, 0, 0}, - {0, 20, "WINE", FR_MATCHCASE, -1, 0}, + {19, 20, "WINE", FR_MATCHCASE, 0}, + {0, 20, "WINE", FR_MATCHCASE, -1}, - {0, -1, "wineWine wine", 0, -1, 0}, + {0, -1, "wineWine wine", 0, -1}, }; static void check_EM_FINDTEXT(HWND hwnd, const char *name, struct find_s *f, int id) { @@ -267,15 +266,8 @@ static void run_tests_EM_FINDTEXT(HWND hwnd, const char *name, struct find_s *fi int i; for (i = 0; i < num_tests; i++) { - if (find[i]._todo_wine) { - todo_wine { - check_EM_FINDTEXT(hwnd, name, &find[i], i); - check_EM_FINDTEXTEX(hwnd, name, &find[i], i); - } - } else { - check_EM_FINDTEXT(hwnd, name, &find[i], i); - check_EM_FINDTEXTEX(hwnd, name, &find[i], i); - } + check_EM_FINDTEXT(hwnd, name, &find[i], i); + check_EM_FINDTEXTEX(hwnd, name, &find[i], i); } }

1 0

Andrew Nguyen : jscript: Implement the String.sup() method.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: abedd774fbbf055692814492235d299ce9c4ad3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=abedd774fbbf0556928144922… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Dec 10 03:07:46 2008 -0600 jscript: Implement the String.sup() method. --- dlls/jscript/string.c | 4 ++-- dlls/jscript/tests/api.js | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index c0ee311..eeceb1f 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1089,8 +1089,8 @@ static HRESULT String_substr(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA static HRESULT String_sup(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR suptagW[] = {'S','U','P',0}; + return do_attributeless_tag_format(dispex, lcid, flags, dp, retv, ei, sp, suptagW); } static HRESULT String_toLowerCase(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 72b64d2..2868c0f 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -341,6 +341,15 @@ ok(tmp === "test", "'test'.sub() = " + tmp); tmp = "test".sub(3); ok(tmp === "test", "'test'.sub(3) = " + tmp); +tmp = "".sup(); +ok(tmp === "", "''.sup() = " + tmp); +tmp = "".sup(3); +ok(tmp === "", "''.sup(3) = " + tmp); +tmp = "test".sup(); +ok(tmp === "test", "'test'.sup() = " + tmp); +tmp = "test".sup(3); +ok(tmp === "test", "'test'.sup(3) = " + tmp); + var arr = new Array(); ok(typeof(arr) === "object", "arr () is not object"); ok((arr.length === 0), "arr.length is not 0");

1 0

Andrew Nguyen : jscript: Implement the String.sub() method.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: 257e15da39c34870cd13f3b7852246fd1a95f44f URL: http://source.winehq.org/git/wine.git/?a=commit;h=257e15da39c34870cd13f3b78… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Dec 10 03:07:35 2008 -0600 jscript: Implement the String.sub() method. --- dlls/jscript/string.c | 4 ++-- dlls/jscript/tests/api.js | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 6dff58e..c0ee311 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1004,8 +1004,8 @@ static HRESULT String_strike(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA static HRESULT String_sub(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR subtagW[] = {'S','U','B',0}; + return do_attributeless_tag_format(dispex, lcid, flags, dp, retv, ei, sp, subtagW); } /* ECMA-262 3rd Edition 15.5.4.15 */ diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 1a0a88d..72b64d2 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -332,6 +332,15 @@ ok(tmp === "<STRIKE>test</STRIKE>", "'test'.strike() = " + tmp); tmp = "test".strike(3); ok(tmp === "<STRIKE>test</STRIKE>", "'test'.strike(3) = " + tmp); +tmp = "".sub(); +ok(tmp === "", "''.sub() = " + tmp); +tmp = "".sub(3); +ok(tmp === "", "''.sub(3) = " + tmp); +tmp = "test".sub(); +ok(tmp === "test", "'test'.sub() = " + tmp); +tmp = "test".sub(3); +ok(tmp === "test", "'test'.sub(3) = " + tmp); + var arr = new Array(); ok(typeof(arr) === "object", "arr () is not object"); ok((arr.length === 0), "arr.length is not 0");

1 0

Andrew Nguyen : jscript: Fix the lexicographical order of the String class properties array.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: f2388d92690dbaee8c87e873bb169f4ce68bcbdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2388d92690dbaee8c87e873b… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Dec 10 03:06:21 2008 -0600 jscript: Fix the lexicographical order of the String class properties array. The find_builtin_prop internal routine in dispex.c implements a binary search with the requirement that a class properties array be in ascending order, so this fix allows String's properties array to satisfy this requirement and allows the tests for String.sub() to pass. --- dlls/jscript/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 5e93fa2..6dff58e 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1261,9 +1261,9 @@ static const builtin_prop_t String_props[] = { {smallW, String_small, PROPF_METHOD}, {splitW, String_split, PROPF_METHOD}, {strikeW, String_strike, PROPF_METHOD}, - {substringW, String_substring, PROPF_METHOD}, - {substrW, String_substr, PROPF_METHOD}, {subW, String_sub, PROPF_METHOD}, + {substrW, String_substr, PROPF_METHOD}, + {substringW, String_substring, PROPF_METHOD}, {supW, String_sup, PROPF_METHOD}, {toLocaleLowerCaseW, String_toLocaleLowerCase, PROPF_METHOD}, {toLocaleUpperCaseW, String_toLocaleUpperCase, PROPF_METHOD},

1 0

Andrew Nguyen : jscript: Fix some errors detected by Valgrind.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: a6bdc47152964d06bdb97d4a8b2490c31e59b86b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6bdc47152964d06bdb97d4a8… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Dec 10 03:05:50 2008 -0600 jscript: Fix some errors detected by Valgrind. --- dlls/jscript/engine.c | 4 ++-- dlls/jscript/function.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 063bd60..f4d4796 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1499,7 +1499,7 @@ HRESULT new_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, j HRESULT call_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { call_expression_t *expr = (call_expression_t*)_expr; - VARIANT func, var; + VARIANT var; exprval_t exprval; DISPPARAMS dp; HRESULT hres; @@ -1520,7 +1520,7 @@ HRESULT call_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, V_VT(&var) = VT_EMPTY; break; default: - FIXME("unimplemented type %d\n", V_VT(&func)); + FIXME("unimplemented type %d\n", exprval.type); hres = E_NOTIMPL; } diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 96c41a9..314d585 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -191,7 +191,6 @@ static HRESULT invoke_constructor(FunctionInstance *function, LCID lcid, DISPPAR VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { DispatchEx *this_obj; - VARIANT var; HRESULT hres; hres = create_object(function->dispex.ctx, &function->dispex, &this_obj); @@ -203,7 +202,6 @@ static HRESULT invoke_constructor(FunctionInstance *function, LCID lcid, DISPPAR if(FAILED(hres)) return hres; - VariantClear(&var); V_VT(retv) = VT_DISPATCH; V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(this_obj); return S_OK;

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/put posHeight.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: 84abbd64aeaa15be2eebe957732d5dcb8901e404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84abbd64aeaa15be2eebe9577… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Dec 10 10:40:28 2008 +1100 mshtml: Implement IHTMLStyle get/put posHeight. --- dlls/mshtml/htmlstyle.c | 18 ++++++++++++++---- dlls/mshtml/tests/dom.c | 20 ++++++++++++++++++++ 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index b612f6a..ed0c27f 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1933,15 +1933,25 @@ static HRESULT WINAPI HTMLStyle_get_posWidth(IHTMLStyle *iface, float *p) static HRESULT WINAPI HTMLStyle_put_posHeight(IHTMLStyle *iface, float v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%f)\n", This, v); + + return set_style_pos(This, STYLEID_HEIGHT, v); } static HRESULT WINAPI HTMLStyle_get_posHeight(IHTMLStyle *iface, float *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + + if(get_nsstyle_pos(This, STYLEID_HEIGHT, p) != S_OK) + *p = 0.0f; + + return S_OK; } static HRESULT WINAPI HTMLStyle_put_cursor(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e620e56..c1f5105 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2513,6 +2513,10 @@ static void test_default_style(IHTMLStyle *style) ok(!V_BSTR(&v), "V_BSTR(v) != NULL\n"); VariantClear(&v); + /* Test posHeight */ + hres = IHTMLStyle_get_posHeight(style, NULL); + ok(hres == E_POINTER, "get_left failed: %08x\n", hres); + V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_height(style, &v); ok(hres == S_OK, "get_height failed: %08x\n", hres); @@ -2520,6 +2524,18 @@ static void test_default_style(IHTMLStyle *style) ok(!V_BSTR(&v), "V_BSTR(v) != NULL\n"); VariantClear(&v); + f = 1.0f; + hres = IHTMLStyle_get_posHeight(style, &f); + ok(hres == S_OK, "get_left failed: %08x\n", hres); + ok(f == 0.0, "expected 0.0 got %f\n", f); + + hres = IHTMLStyle_put_posHeight(style, 4.9f); + ok(hres == S_OK, "get_left failed: %08x\n", hres); + + hres = IHTMLStyle_get_posHeight(style, &f); + ok(hres == S_OK, "get_left failed: %08x\n", hres); + ok(f == 4.0, "expected 4.0 got %f\n", f); + V_VT(&v) = VT_BSTR; V_BSTR(&v) = a2bstr("64px"); hres = IHTMLStyle_put_height(style, v); @@ -2533,6 +2549,10 @@ static void test_default_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "64px"), "V_BSTR(v) = %s\n", dbgstr_w(V_BSTR(&v))); VariantClear(&v); + hres = IHTMLStyle_get_posHeight(style, &f); + ok(hres == S_OK, "get_left failed: %08x\n", hres); + ok(f == 64.0, "expected 64.0 got %f\n", f); + str = (void*)0xdeadbeef; hres = IHTMLStyle_get_cursor(style, &str); ok(hres == S_OK, "get_cursor failed: %08x\n", hres);

1 0

Austin English : kernel32: Convert a warn to an err.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: 7a92db4e8b29c02689facb3fd6c84ed0f5599be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a92db4e8b29c02689facb3fd… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 9 12:20:59 2008 -0600 kernel32: Convert a warn to an err. --- dlls/kernel32/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 6c6b0ca..ca941aa 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1022,7 +1022,7 @@ void __wine_kernel_init(void) if (boot_event) { - if (WaitForSingleObject( boot_event, 30000 )) WARN( "boot event wait timed out\n" ); + if (WaitForSingleObject( boot_event, 30000 )) ERR( "boot event wait timed out\n" ); CloseHandle( boot_event ); /* if we didn't find environment section, try again now that wineboot has run */ if (!got_environment)

1 0

Henri Verbeet : wined3d: Compare & copy with the correct clipplane size in IWineD3DStateBlockImpl_Capture ().
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: bcf0b4b12887c440100f7c7f26732b440e8baad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcf0b4b12887c440100f7c7f2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 10 10:04:40 2008 +0100 wined3d: Compare & copy with the correct clipplane size in IWineD3DStateBlockImpl_Capture(). --- dlls/wined3d/stateblock.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 78c57d9..3fe8183 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -543,13 +543,11 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) } for (i = 0; i < GL_LIMITS(clipplanes); i++) { - if (This->changed.clipplane[i] && memcmp(targetStateBlock->clipplane[i], - This->clipplane[i], - sizeof(This->clipplane)) != 0) { - + if (This->changed.clipplane[i] + && memcmp(targetStateBlock->clipplane[i], This->clipplane[i], sizeof(*This->clipplane))) + { TRACE("Updating clipplane %d\n", i); - memcpy(This->clipplane[i], targetStateBlock->clipplane[i], - sizeof(This->clipplane)); + memcpy(This->clipplane[i], targetStateBlock->clipplane[i], sizeof(*This->clipplane)); } }

1 0

Henri Verbeet : wined3d: Make some constant arrays also static.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: b409061337db54d19d72a031a4fb29e95e68f4e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b409061337db54d19d72a031a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 10 10:04:40 2008 +0100 wined3d: Make some constant arrays also static. As pointed out by Dan Kegel. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/drawprim.c | 16 ++++++++-------- dlls/wined3d/glsl_shader.c | 9 ++++++--- dlls/wined3d/state.c | 12 ++++++------ 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1e7e51a..f03e23b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1631,7 +1631,7 @@ static GLuint create_arb_blt_vertex_program(const WineD3D_GL_Info *gl_info) static GLuint create_arb_blt_fragment_program(const WineD3D_GL_Info *gl_info, enum tex_types tex_type) { GLuint program_id = 0; - const char *blt_fprograms[tex_type_count] = + static const char * const blt_fprograms[tex_type_count] = { /* tex_1d */ NULL, diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 7603103..243ed61 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1092,11 +1092,11 @@ HRESULT tesselate_rectpatch(IWineD3DDeviceImpl *This, checkGLcall("glPolygonMode(GL_FRONT_AND_BACK, GL_FILL)"); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_FILLMODE)); if(patch->has_normals) { - const GLfloat black[4] = {0, 0, 0, 0}; - const GLfloat red[4] = {1, 0, 0, 0}; - const GLfloat green[4] = {0, 1, 0, 0}; - const GLfloat blue[4] = {0, 0, 1, 0}; - const GLfloat white[4] = {1, 1, 1, 1}; + static const GLfloat black[] = {0, 0, 0, 0}; + static const GLfloat red[] = {1, 0, 0, 0}; + static const GLfloat green[] = {0, 1, 0, 0}; + static const GLfloat blue[] = {0, 0, 1, 0}; + static const GLfloat white[] = {1, 1, 1, 1}; glEnable(GL_LIGHTING); checkGLcall("glEnable(GL_LIGHTING)"); glLightModelfv(GL_LIGHT_MODEL_AMBIENT, black); @@ -1263,9 +1263,9 @@ HRESULT tesselate_rectpatch(IWineD3DDeviceImpl *This, if(patch->has_normals) { /* Now do the same with reverse light directions */ - const GLfloat x[4] = {-1, 0, 0, 0}; - const GLfloat y[4] = { 0, -1, 0, 0}; - const GLfloat z[4] = { 0, 0, -1, 0}; + static const GLfloat x[] = {-1, 0, 0, 0}; + static const GLfloat y[] = { 0, -1, 0, 0}; + static const GLfloat z[] = { 0, 0, -1, 0}; glLightfv(GL_LIGHT0, GL_POSITION, x); glLightfv(GL_LIGHT1, GL_POSITION, y); glLightfv(GL_LIGHT2, GL_POSITION, z); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f1a0f95..6ec2591 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -96,7 +96,8 @@ static void print_glsl_info_log(const WineD3D_GL_Info *gl_info, GLhandleARB obj) unsigned int i; BOOL is_spam; - const char *spam[] = { + static const char * const spam[] = + { "Vertex shader was successfully compiled to run on hardware.\n", /* fglrx */ "Fragment shader was successfully compiled to run on hardware.\n", /* fglrx */ "Fragment shader(s) linked, vertex shader(s) linked. \n ", /* fglrx, with \n */ @@ -3306,7 +3307,8 @@ static GLhandleARB create_glsl_blt_shader(const WineD3D_GL_Info *gl_info, enum t { GLhandleARB program_id; GLhandleARB vshader_id, pshader_id; - const char *blt_vshader[] = { + static const char *blt_vshader[] = + { "#version 120\n" "void main(void)\n" "{\n" @@ -3316,7 +3318,8 @@ static GLhandleARB create_glsl_blt_shader(const WineD3D_GL_Info *gl_info, enum t "}\n" }; - const char *blt_pshaders[tex_type_count] = { + static const char *blt_pshaders[tex_type_count] = + { /* tex_1d */ NULL, /* tex_2d */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0da9842..6642483 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -702,7 +702,7 @@ state_specularenable(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCon checkGLcall("glFinalCombinerInputNV()"); } } else { - const GLfloat black[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + static const GLfloat black[] = {0.0f, 0.0f, 0.0f, 0.0f}; /* for the case of enabled lighting: */ glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, &black[0]); @@ -1323,7 +1323,7 @@ static void state_colormat(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, (float*)&device->updateStateBlock->material.Specular); checkGLcall("glMaterialfv"); } else { - const GLfloat black[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + static const GLfloat black[] = {0.0f, 0.0f, 0.0f, 0.0f}; glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, &black[0]); checkGLcall("glMaterialfv"); } @@ -3175,10 +3175,10 @@ static void loadTexCoords(IWineD3DStateBlockImpl *stateblock, const WineDirect3D static void tex_coordindex(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE; DWORD mapped_stage = stateblock->wineD3DDevice->texUnitMap[stage]; - const GLfloat s_plane[] = { 1.0, 0.0, 0.0, 0.0 }; - const GLfloat t_plane[] = { 0.0, 1.0, 0.0, 0.0 }; - const GLfloat r_plane[] = { 0.0, 0.0, 1.0, 0.0 }; - const GLfloat q_plane[] = { 0.0, 0.0, 0.0, 1.0 }; + static const GLfloat s_plane[] = { 1.0, 0.0, 0.0, 0.0 }; + static const GLfloat t_plane[] = { 0.0, 1.0, 0.0, 0.0 }; + static const GLfloat r_plane[] = { 0.0, 0.0, 1.0, 0.0 }; + static const GLfloat q_plane[] = { 0.0, 0.0, 0.0, 1.0 }; if (mapped_stage == -1) { TRACE("No texture unit mapped to stage %d. Skipping texture coordinates.\n", stage);

1 0

Henri Verbeet : wined3d: Rename texture_stage_op. color_correction to texture_stage_op.color_fixup.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: 4aa00e8a213a4ceb45f6df0af754066dc135813e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aa00e8a213a4ceb45f6df0af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 10 10:04:40 2008 +0100 wined3d: Rename texture_stage_op.color_correction to texture_stage_op.color_fixup. This is consistent with other uses of struct color_fixup_desc. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/utils.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5eb8539..1e7e51a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2811,7 +2811,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi sprintf(colorcor_dst, "tex%u", stage); gen_color_correction(&buffer, colorcor_dst, WINED3DSP_WRITEMASK_ALL, "const.x", "const.y", - settings->op[stage].color_correction); + settings->op[stage].color_fixup); } /* Generate the main shader */ diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index f88de9e..88dd0a5 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -351,7 +351,7 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], con if(op[stage].cop != WINED3DTOP_BUMPENVMAP && op[stage].cop != WINED3DTOP_BUMPENVMAPLUMINANCE) continue; - fixup = op[stage].color_correction; + fixup = op[stage].color_fixup; if (fixup.x_source != CHANNEL_SOURCE_X || fixup.y_source != CHANNEL_SOURCE_Y) { FIXME("Swizzles not implemented\n"); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index fd4f4ee..0eb5337 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1917,7 +1917,7 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting settings->op[i].aop = WINED3DTOP_DISABLE; settings->op[i].carg0 = settings->op[i].carg1 = settings->op[i].carg2 = ARG_UNUSED; settings->op[i].aarg0 = settings->op[i].aarg1 = settings->op[i].aarg2 = ARG_UNUSED; - settings->op[i].color_correction = COLOR_FIXUP_IDENTITY; + settings->op[i].color_fixup = COLOR_FIXUP_IDENTITY; settings->op[i].dst = resultreg; settings->op[i].tex_type = tex_1d; settings->op[i].projected = proj_none; @@ -1927,7 +1927,7 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting texture = (IWineD3DBaseTextureImpl *) stateblock->textures[i]; if(texture) { - settings->op[i].color_correction = texture->baseTexture.shader_color_fixup; + settings->op[i].color_fixup = texture->baseTexture.shader_color_fixup; if(ignore_textype) { settings->op[i].tex_type = tex_1d; } else { @@ -1950,7 +1950,7 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting } } } else { - settings->op[i].color_correction = COLOR_FIXUP_IDENTITY; + settings->op[i].color_fixup = COLOR_FIXUP_IDENTITY; settings->op[i].tex_type = tex_1d; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 619baec..f8e2a8c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -935,7 +935,7 @@ struct texture_stage_op unsigned aarg2 : 8; unsigned aarg0 : 8; - struct color_fixup_desc color_correction; + struct color_fixup_desc color_fixup; unsigned tex_type : 3; unsigned dst : 1; unsigned projected : 2;

1 0