January 2012 - Wine-Commits

Jacek Caban : mshtml: Use ATTR_FIX_PX in IHTMLStyle::put_marginTop.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: 1ea652900767389816034f32bf93c19e21975ccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ea652900767389816034f32b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 14:33:15 2012 +0100 mshtml: Use ATTR_FIX_PX in IHTMLStyle::put_marginTop. --- dlls/mshtml/htmlstyle.c | 2 +- dlls/mshtml/tests/style.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index e21753b..9602f5e 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1473,7 +1473,7 @@ static HRESULT WINAPI HTMLStyle_put_marginTop(IHTMLStyle *iface, VARIANT v) TRACE("(%p)->(v%d)\n", This, V_VT(&v)); - return set_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_TOP, &v, 0); + return set_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_TOP, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_marginTop(IHTMLStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 4a0b9fb..183d3f4 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -729,6 +729,18 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginTop) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + V_VT(&v) = VT_I4; + V_I4(&v) = 5; + hres = IHTMLStyle_put_marginTop(style, v); + ok(hres == S_OK, "put_marginTop failed: %08x\n", hres); + + str = (void*)0xdeadbeef; + hres = IHTMLStyle_get_marginTop(style, &v); + ok(hres == S_OK, "get_marginTop failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(marginTop) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "5px"), "V_BSTR(marginTop) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + str = NULL; hres = IHTMLStyle_get_border(style, &str); ok(hres == S_OK, "get_border failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Added IHTMLStyle::paddingRight implementation.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: 2de64c8a26f40f1f290d39ce4526b920b5aa71b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de64c8a26f40f1f290d39ce4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 14:33:57 2012 +0100 mshtml: Added IHTMLStyle::paddingRight implementation. --- dlls/mshtml/htmlstyle.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 13c00a8..3e328ba 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1574,15 +1574,19 @@ static HRESULT WINAPI HTMLStyle_get_paddingTop(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_paddingRight(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_RIGHT, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_paddingRight(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_RIGHT, p, 0); } static HRESULT WINAPI HTMLStyle_put_paddingBottom(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index dc7908f..a6ac67a 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1244,6 +1244,22 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + hres = IHTMLStyle_get_paddingRight(style, &v); + ok(hres == S_OK, "get_paddingRight: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!V_BSTR(&v), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + + V_VT(&v) = VT_I4; + V_I4(&v) = 6; + hres = IHTMLStyle_put_paddingRight(style, v); + ok(hres == S_OK, "put_paddingRight failed: %08x\n", hres); + + hres = IHTMLStyle_get_paddingRight(style, &v); + ok(hres == S_OK, "get_paddingRight: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + str = a2bstr("1"); hres = IHTMLStyle_put_padding(style, str); ok(hres == S_OK, "put_padding failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Added IHTMLStyle::paddingBottom implementation.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: 9fc673f48e0b9fccfbb5861fa0f5b51751f82890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fc673f48e0b9fccfbb5861fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 14:34:05 2012 +0100 mshtml: Added IHTMLStyle::paddingBottom implementation. --- dlls/mshtml/htmlstyle.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 3e328ba..684f744 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1592,15 +1592,19 @@ static HRESULT WINAPI HTMLStyle_get_paddingRight(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_paddingBottom(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_BOTTOM, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_paddingBottom(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_BOTTOM, p, 0); } static HRESULT WINAPI HTMLStyle_put_paddingLeft(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index a6ac67a..03a433f 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1260,6 +1260,22 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + hres = IHTMLStyle_get_paddingBottom(style, &v); + ok(hres == S_OK, "get_paddingBottom: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!V_BSTR(&v), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + + V_VT(&v) = VT_I4; + V_I4(&v) = 6; + hres = IHTMLStyle_put_paddingBottom(style, v); + ok(hres == S_OK, "put_paddingBottom failed: %08x\n", hres); + + hres = IHTMLStyle_get_paddingBottom(style, &v); + ok(hres == S_OK, "get_paddingBottom: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + str = a2bstr("1"); hres = IHTMLStyle_put_padding(style, str); ok(hres == S_OK, "put_padding failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Use helpers in IHTMLStyle::paddingLeft implementation .
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: dec3a9c7b04bf7496c5fc1fea733ac6b22457715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dec3a9c7b04bf7496c5fc1fea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 14:34:22 2012 +0100 mshtml: Use helpers in IHTMLStyle::paddingLeft implementation. --- dlls/mshtml/htmlstyle.c | 27 +++------------------------ dlls/mshtml/tests/style.c | 2 ++ 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 684f744..0487992 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1611,39 +1611,18 @@ static HRESULT WINAPI HTMLStyle_put_paddingLeft(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - TRACE("(%p)->(vt=%d)\n", This, V_VT(&v)); - - switch(V_VT(&v)) { - case VT_I4: { - WCHAR buf[14]; - - wsprintfW(buf, px_formatW, V_I4(&v)); - return set_style_attr(This, STYLEID_PADDING_LEFT, buf, 0); - } - case VT_BSTR: - return set_style_attr(This, STYLEID_PADDING_LEFT, V_BSTR(&v), 0); - default: - FIXME("unsupported vt=%d\n", V_VT(&v)); - } + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + return set_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_LEFT, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_paddingLeft(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - BSTR ret; - HRESULT hres; TRACE("(%p)->(%p)\n", This, p); - hres = get_style_attr(This, STYLEID_PADDING_LEFT, &ret); - if(FAILED(hres)) - return hres; - - V_VT(p) = VT_BSTR; - V_BSTR(p) = ret; - return S_OK; + return get_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_LEFT, p, 0); } static HRESULT WINAPI HTMLStyle_put_padding(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 03a433f..793b51c 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1289,6 +1289,8 @@ static void test_body_style(IHTMLStyle *style) /* PaddingLeft */ hres = IHTMLStyle_get_paddingLeft(style, &vDefault); ok(hres == S_OK, "get_paddingLeft: %08x\n", hres); + ok(V_VT(&vDefault) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&vDefault)); + ok(!strcmp_wa(V_BSTR(&vDefault), "1px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&vDefault))); V_VT(&v) = VT_BSTR; V_BSTR(&v) = a2bstr("10");

1 0

Austin English : setupapi: Add a stub for SetupAddToDiskSpaceListA/W.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: 056de6fbcf4d436b00054031346db92f4ebb0233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=056de6fbcf4d436b000540313… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 25 14:35:42 2012 -0800 setupapi: Add a stub for SetupAddToDiskSpaceListA/W. --- dlls/setupapi/diskspace.c | 24 ++++++++++++++++++++++++ dlls/setupapi/setupapi.spec | 4 ++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/diskspace.c b/dlls/setupapi/diskspace.c index 0a1a5ff..1ca45f9 100644 --- a/dlls/setupapi/diskspace.c +++ b/dlls/setupapi/diskspace.c @@ -259,3 +259,27 @@ BOOL WINAPI SetupDestroyDiskSpaceList(HDSKSPC DiskSpace) HeapFree(GetProcessHeap(),0,list); return TRUE; } + +/*********************************************************************** +* SetupAddToDiskSpaceListA (SETUPAPI.@) +*/ +BOOL WINAPI SetupAddToDiskSpaceListA(HDSKSPC diskspace, PCSTR targetfile, + LONGLONG filesize, UINT operation, + PVOID reserved1, UINT reserved2) +{ + FIXME(": stub\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** +* SetupAddToDiskSpaceListW (SETUPAPI.@) +*/ +BOOL WINAPI SetupAddToDiskSpaceListW(HDSKSPC diskspace, PCWSTR targetfile, + LONGLONG filesize, UINT operation, + PVOID reserved1, UINT reserved2) +{ + FIXME(": stub\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index d3825d9..6397ab2 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -246,8 +246,8 @@ @ stub SetupAddInstallSectionToDiskSpaceListW @ stub SetupAddSectionToDiskSpaceListA @ stub SetupAddSectionToDiskSpaceListW -@ stub SetupAddToDiskSpaceListA -@ stub SetupAddToDiskSpaceListW +@ stdcall SetupAddToDiskSpaceListA(long str int64 long ptr long) +@ stdcall SetupAddToDiskSpaceListW(long wstr int64 long ptr long) @ stub SetupAddToSourceListA @ stub SetupAddToSourceListW @ stub SetupAdjustDiskSpaceListA

1 0

Jacek Caban : mshtml: Don' t use simplified fragment-only navigation if there is post data to send.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: c77ba794b7042611d6500a37fdd4263f04cab8a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c77ba794b7042611d6500a37f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 15:15:39 2012 +0100 mshtml: Don't use simplified fragment-only navigation if there is post data to send. --- dlls/mshtml/navigate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 9b650f4..9950511 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1920,7 +1920,7 @@ HRESULT super_navigate(HTMLWindow *window, IUri *uri, const WCHAR *headers, BYTE } } - if(window->uri && compare_ignoring_frag(window->uri, uri)) { + if(window->uri && !post_data_size && compare_ignoring_frag(window->uri, uri)) { TRACE("fragment navigate\n"); return navigate_fragment(window, uri); }

1 0

Jacek Caban : mshtml: Added IHTMLStyle::paddingTop implementation.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: f01571182293bf4f97231119d23f7e8ba45ef811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f01571182293bf4f97231119d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 14:33:47 2012 +0100 mshtml: Added IHTMLStyle::paddingTop implementation. --- dlls/mshtml/htmlstyle.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 523fc8f..13c00a8 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1556,15 +1556,19 @@ static HRESULT WINAPI HTMLStyle_get_marginLeft(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_paddingTop(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_TOP, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_paddingTop(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_TOP, p, 0); } static HRESULT WINAPI HTMLStyle_put_paddingRight(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index e950f83..dc7908f 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1228,6 +1228,22 @@ static void test_body_style(IHTMLStyle *style) ok(!str, "padding = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + hres = IHTMLStyle_get_paddingTop(style, &v); + ok(hres == S_OK, "get_paddingTop: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!V_BSTR(&v), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + + V_VT(&v) = VT_I4; + V_I4(&v) = 6; + hres = IHTMLStyle_put_paddingTop(style, v); + ok(hres == S_OK, "put_paddingTop failed: %08x\n", hres); + + hres = IHTMLStyle_get_paddingTop(style, &v); + ok(hres == S_OK, "get_paddingTop: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + str = a2bstr("1"); hres = IHTMLStyle_put_padding(style, str); ok(hres == S_OK, "put_padding failed: %08x\n", hres);

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value SetMatrix() test.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: 52e1409111a322233567d5acc010b88e7dcfea44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52e1409111a322233567d5acc… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 26 11:40:54 2012 +0100 d3dx9/tests: Add effect parameter value SetMatrix() test. --- dlls/d3dx9_36/tests/effect.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index f3c5cf6..e3c6dde 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1898,6 +1898,39 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); } + + /* SetMatrix */ + fvalue = 1.33; + for (l = 0; l < 16; ++l) + { + *(input_value + l) = *(DWORD *)&fvalue; + fvalue += 1.12; + } + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + hr = effect->lpVtbl->SetMatrix(effect, parameter, (D3DXMATRIX *)input_value); + if (!res_desc->Elements && res_desc->Class == D3DXPC_MATRIX_ROWS) + { + for (l = 0; l < 4; ++l) + { + UINT m; + + for (m = 0; m < 4; ++m) + { + if (m < res_desc->Rows && l < res_desc->Columns) + set_number(expected_value + l + m * res_desc->Columns, res_desc->Type, + input_value + l + m * 4, D3DXPT_FLOAT); + } + + } + ok(hr == D3D_OK, "%u - %s: SetMatrix failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrix failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + } + test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); + test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Christian Costa : d3dxof: Use buffer start followed by offset when accessing data.
by Alexandre Julliard Jan. 25, 2012

Jan. 25, 2012

Module: wine Branch: master Commit: bb4c210888286302e05dcacddbaf028e3db3d3dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb4c210888286302e05dcacdd… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jan 23 21:37:48 2012 +0100 d3dxof: Use buffer start followed by offset when accessing data. --- dlls/d3dxof/parsing.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 3d7a4d0..5b8b44b 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1225,12 +1225,12 @@ static BOOL parse_object_members_list(parse_buffer * buf) return FALSE; if (pt->members[i].type == TOKEN_WORD) { - *(((WORD*)(buf->cur_pos_data + buf->pdata))) = (WORD)(*(DWORD*)buf->value); + *(((WORD*)(buf->pdata + buf->cur_pos_data))) = (WORD)(*(DWORD*)buf->value); buf->cur_pos_data += 2; } else if (pt->members[i].type == TOKEN_DWORD) { - *(((DWORD*)(buf->cur_pos_data + buf->pdata))) = (DWORD)(*(DWORD*)buf->value); + *(((DWORD*)(buf->pdata + buf->cur_pos_data))) = (DWORD)(*(DWORD*)buf->value); buf->cur_pos_data += 4; } else @@ -1247,7 +1247,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) return FALSE; if (pt->members[i].type == TOKEN_FLOAT) { - *(((float*)(buf->cur_pos_data + buf->pdata))) = (float)(*(float*)buf->value); + *(((float*)(buf->pdata + buf->cur_pos_data))) = (float)(*(float*)buf->value); buf->cur_pos_data += 4; } else @@ -1271,7 +1271,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) return FALSE; } strcpy((char*)buf->cur_pstrings, (char*)buf->value); - *(((LPCSTR*)(buf->cur_pos_data + buf->pdata))) = (char*)buf->cur_pstrings; + *(((LPCSTR*)(buf->pdata + buf->cur_pos_data))) = (char*)buf->cur_pstrings; buf->cur_pstrings += len; buf->cur_pos_data += sizeof(LPSTR); }

1 0

Andrew Eikum : wineoss.drv: Decouple MMDevAPI buffer and OSS buffer.
by Alexandre Julliard Jan. 25, 2012

Jan. 25, 2012

Module: wine Branch: master Commit: 92e835111bbb22b8c0002ce5d61a24565176a443 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92e835111bbb22b8c0002ce5d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jan 25 11:14:03 2012 -0600 wineoss.drv: Decouple MMDevAPI buffer and OSS buffer. --- dlls/wineoss.drv/mmdevdrv.c | 222 ++++++++++++------------------------------- 1 files changed, 59 insertions(+), 163 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=92e835111bbb22b8c0002…

1 0