October 2012 - Wine-Commits

Jacek Caban : mshtml: Added IHTMLIFrameElement:: height property implementation.
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: a741a3f99c8835daf59501d55ae09beb26ef9360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a741a3f99c8835daf59501d55… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 23 13:41:33 2012 +0200 mshtml: Added IHTMLIFrameElement::height property implementation. --- dlls/mshtml/htmliframe.c | 33 +++++++++++++++++++++++++++--- dlls/mshtml/tests/dom.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index 0e7b218..c1f1264 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -217,15 +217,40 @@ static HRESULT WINAPI HTMLIFrameElement2_Invoke(IHTMLIFrameElement2 *iface, DISP static HRESULT WINAPI HTMLIFrameElement2_put_height(IHTMLIFrameElement2 *iface, VARIANT v) { HTMLIFrame *This = impl_from_IHTMLIFrameElement2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + if(V_VT(&v) != VT_BSTR) { + FIXME("Unsupported %s\n", debugstr_variant(&v)); + return E_NOTIMPL; + } + + nsAString_InitDepend(&nsstr, V_BSTR(&v)); + nsres = nsIDOMHTMLIFrameElement_SetHeight(This->framebase.nsiframe, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("SetHeight failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLIFrameElement2_get_height(IHTMLIFrameElement2 *iface, VARIANT *p) { HTMLIFrame *This = impl_from_IHTMLIFrameElement2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLIFrameElement_GetHeight(This->framebase.nsiframe, &nsstr); + + V_VT(p) = VT_BSTR; + return return_nsstr(nsres, &nsstr, &V_BSTR(p)); } static HRESULT WINAPI HTMLIFrameElement2_put_width(IHTMLIFrameElement2 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ef036da..3c1b0e2 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -878,6 +878,17 @@ static IHTMLLinkElement *_get_link_iface(unsigned line, IUnknown *unk) return ret; } +#define get_iframe2_iface(u) _get_iframe2_iface(__LINE__,u) +static IHTMLIFrameElement2 *_get_iframe2_iface(unsigned line, IUnknown *unk) +{ + IHTMLIFrameElement2 *ret; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLIFrameElement2, (void**)&ret); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLIFrameElement: %08x\n", hres); + return ret; +} + #define test_node_name(u,n) _test_node_name(__LINE__,u,n) static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) { @@ -5239,6 +5250,39 @@ static void test_frame_doc(IUnknown *frame_elem, BOOL iframe) IHTMLDocument2_Release(window_doc); } +#define test_iframe_height(a,b) _test_iframe_height(__LINE__,a,b) +static void _test_iframe_height(unsigned line, IHTMLElement *elem, const char *exval) +{ + IHTMLIFrameElement2 *iframe = _get_iframe2_iface(line, (IUnknown*)elem); + VARIANT v; + HRESULT hres; + + hres = IHTMLIFrameElement2_get_height(iframe, &v); + ok_(__FILE__,line)(hres == S_OK, "get_height failed: %08x\n", hres); + ok_(__FILE__,line)(V_VT(&v) == VT_BSTR, "V_VT(height) = %d\n", V_VT(&v)); + if(exval) + ok_(__FILE__,line)(!strcmp_wa(V_BSTR(&v), exval), "height = %s, expected %s\n", wine_dbgstr_w(V_BSTR(&v)), exval); + else + ok_(__FILE__,line)(!V_BSTR(&v), "height = %s, expected NULL\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + IHTMLIFrameElement2_Release(iframe); +} + +#define set_iframe_height(a,b) _set_iframe_height(__LINE__,a,b) +static void _set_iframe_height(unsigned line, IHTMLElement *elem, const char *val) +{ + IHTMLIFrameElement2 *iframe = _get_iframe2_iface(line, (IUnknown*)elem); + VARIANT v; + HRESULT hres; + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr(val); + hres = IHTMLIFrameElement2_put_height(iframe, v); + ok_(__FILE__,line)(hres == S_OK, "put_height failed: %08x\n", hres); + VariantClear(&v); + IHTMLIFrameElement2_Release(iframe); +} + static void test_iframe_elem(IHTMLElement *elem) { IHTMLDocument2 *content_doc, *owner_doc; @@ -5281,6 +5325,11 @@ static void test_iframe_elem(IHTMLElement *elem) win_skip("IHTMLIFrameElement3 not supported\n"); } + test_iframe_height(elem, NULL); + set_iframe_height(elem, "100px"); + set_iframe_height(elem, "50%"); + test_iframe_height(elem, "50%"); + str = a2bstr("text/html"); V_VT(&errv) = VT_ERROR; disp = NULL;

1 0

Jacek Caban : mshtml: Added IHTMLStyle::clear property implementation.
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: 04c97d08ebcd6762346bde625a882e1dc75f58b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04c97d08ebcd6762346bde625… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 23 13:41:13 2012 +0200 mshtml: Added IHTMLStyle::clear property implementation. --- dlls/mshtml/htmlstyle.c | 15 +++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 15 +++++++++++++++ 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index cb164dc..6427bee 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -91,6 +91,8 @@ static const WCHAR attrBorderWidth[] = {'b','o','r','d','e','r','-','w','i','d','t','h',0}; static const WCHAR attrBottom[] = {'b','o','t','t','o','m',0}; +static const WCHAR attrClear[] = + {'c','l','e','a','r',0}; static const WCHAR attrClip[] = {'c','l','i','p',0}; static const WCHAR attrColor[] = @@ -212,6 +214,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrBorderTopWidth, DISPID_IHTMLSTYLE_BORDERTOPWIDTH}, {attrBorderWidth, DISPID_IHTMLSTYLE_BORDERWIDTH}, {attrBottom, DISPID_IHTMLSTYLE2_BOTTOM}, + {attrClear, DISPID_IHTMLSTYLE_CLEAR}, {attrClip, DISPID_IHTMLSTYLE_CLIP}, {attrColor, DISPID_IHTMLSTYLE_COLOR}, {attrCursor, DISPID_IHTMLSTYLE_CURSOR}, @@ -2063,15 +2066,19 @@ static HRESULT WINAPI HTMLStyle_get_styleFloat(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_clear(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_style_attr(This, STYLEID_CLEAR, v, 0); } static HRESULT WINAPI HTMLStyle_get_clear(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_style_attr(This, STYLEID_CLEAR, p); } static HRESULT WINAPI HTMLStyle_put_display(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 571931b..0a45e05 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -61,6 +61,7 @@ typedef enum { STYLEID_BORDER_TOP_WIDTH, STYLEID_BORDER_WIDTH, STYLEID_BOTTOM, + STYLEID_CLEAR, STYLEID_CLIP, STYLEID_COLOR, STYLEID_CURSOR, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 0584ef4..fd0f78e 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1910,6 +1910,21 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(str, "rect(0px 1px 500px 505px)"), "clip = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + /* clear */ + hres = IHTMLStyle_get_clear(style, &str); + ok(hres == S_OK, "get_clear failed: %08x\n", hres); + ok(!str, "clear = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("both"); + hres = IHTMLStyle_put_clear(style, str); + ok(hres == S_OK, "put_clear failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLStyle_get_clear(style, &str); + ok(hres == S_OK, "get_clear failed: %08x\n", hres); + ok(!strcmp_wa(str, "both"), "clear = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + /* pageBreakAfter */ hres = IHTMLStyle_get_pageBreakAfter(style, &str); ok(hres == S_OK, "get_pageBreakAfter failed: %08x\n", hres);

1 0

Nikolay Sivov : dwrite: Separate format data and keep it in both layout and text format.
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: 2e977e112fc96f1d3eead6f67ae19c3664b2ab8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e977e112fc96f1d3eead6f67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 23 08:32:34 2012 -0400 dwrite: Separate format data and keep it in both layout and text format. --- dlls/dwrite/layout.c | 54 +++++++++++++++++++++++++++++-------------------- 1 files changed, 32 insertions(+), 22 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 91360ee..a2d1ef9 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -32,17 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); -struct dwrite_textlayout { - IDWriteTextLayout IDWriteTextLayout_iface; - LONG ref; - - WCHAR *str; -}; - -struct dwrite_textformat { - IDWriteTextFormat IDWriteTextFormat_iface; - LONG ref; - +struct dwrite_textformat_data { WCHAR *family_name; WCHAR *locale; @@ -55,6 +45,27 @@ struct dwrite_textformat { IDWriteFontCollection *collection; }; +struct dwrite_textlayout { + IDWriteTextLayout IDWriteTextLayout_iface; + LONG ref; + + WCHAR *str; + struct dwrite_textformat_data format; +}; + +struct dwrite_textformat { + IDWriteTextFormat IDWriteTextFormat_iface; + LONG ref; + struct dwrite_textformat_data format; +}; + +static void release_format_data(struct dwrite_textformat_data *data) +{ + if (data->collection) IDWriteFontCollection_Release(data->collection); + heap_free(data->family_name); + heap_free(data->locale); +} + static inline struct dwrite_textlayout *impl_from_IDWriteTextLayout(IDWriteTextLayout *iface) { return CONTAINING_RECORD(iface, struct dwrite_textlayout, IDWriteTextLayout_iface); @@ -665,6 +676,7 @@ HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextLayout **layo This->IDWriteTextLayout_iface.lpVtbl = &dwritetextlayoutvtbl; This->ref = 1; This->str = heap_strdupnW(str, len); + memset(&This->format, 0, sizeof(This->format)); *layout = &This->IDWriteTextLayout_iface; @@ -707,9 +719,7 @@ static ULONG WINAPI dwritetextformat_Release(IDWriteTextFormat *iface) if (!ref) { - if (This->collection) IDWriteFontCollection_Release(This->collection); - heap_free(This->family_name); - heap_free(This->locale); + release_format_data(&This->format); heap_free(This); } @@ -838,7 +848,7 @@ static HRESULT WINAPI dwritetextformat_GetFontCollection(IDWriteTextFormat *ifac TRACE("(%p)->(%p)\n", This, collection); - *collection = This->collection; + *collection = This->format.collection; IDWriteFontCollection_AddRef(*collection); return S_OK; @@ -943,20 +953,20 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle This->IDWriteTextFormat_iface.lpVtbl = &dwritetextformatvtbl; This->ref = 1; - This->family_name = heap_strdupW(family_name); - This->locale = heap_strdupW(locale); - This->weight = weight; - This->style = style; - This->size = size; + This->format.family_name = heap_strdupW(family_name); + This->format.locale = heap_strdupW(locale); + This->format.weight = weight; + This->format.style = style; + This->format.size = size; if (collection) { - This->collection = collection; + This->format.collection = collection; IDWriteFontCollection_AddRef(collection); } else { - HRESULT hr = get_system_fontcollection(&This->collection); + HRESULT hr = get_system_fontcollection(&This->format.collection); if (hr != S_OK) { IDWriteTextFormat_Release(&This->IDWriteTextFormat_iface);

1 0

André Hentschel : atl: Warn when CoRegisterClassObject fails.
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: 010e311b042404acf7f79b3aeb6590b7595157cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=010e311b042404acf7f79b3ae… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 22 23:49:49 2012 +0200 atl: Warn when CoRegisterClassObject fails. --- dlls/atl/atl_main.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 2898835..5b47f5e 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -179,7 +179,6 @@ HRESULT WINAPI AtlModuleRegisterClassObjects(_ATL_MODULEW *pM, DWORD dwClsContex DWORD dwFlags) { _ATL_OBJMAP_ENTRYW_V1 *obj; - HRESULT hRes = S_OK; int i=0; TRACE("(%p %i %i)\n",pM, dwClsContext, dwFlags); @@ -199,15 +198,19 @@ HRESULT WINAPI AtlModuleRegisterClassObjects(_ATL_MODULEW *pM, DWORD dwClsContex (LPVOID*)&pUnknown); if (SUCCEEDED (rc) ) { - CoRegisterClassObject(obj->pclsid, pUnknown, dwClsContext, - dwFlags, &obj->dwRegister); + rc = CoRegisterClassObject(obj->pclsid, pUnknown, dwClsContext, + dwFlags, &obj->dwRegister); + + if (FAILED (rc) ) + WARN("Failed to register object %i: 0x%08x\n", i, rc); + if (pUnknown) IUnknown_Release(pUnknown); } } } - return hRes; + return S_OK; } HRESULT WINAPI AtlModuleUnregisterServerEx(_ATL_MODULEW* pM, BOOL bUnRegTypeLib, const CLSID* pCLSID)

1 0

André Hentschel : wing32: Use the correct size for memcpy (coverity).
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: 7b07e015a9c75867e4c3dc7d40a8bdfa5d1e127f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b07e015a9c75867e4c3dc7d4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 22 19:56:41 2012 +0200 wing32: Use the correct size for memcpy (coverity). --- dlls/wing32/wing32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wing32/wing32.c b/dlls/wing32/wing32.c index dc6dfd6..b6702ba 100644 --- a/dlls/wing32/wing32.c +++ b/dlls/wing32/wing32.c @@ -72,7 +72,7 @@ void * WINAPI WinGGetDIBPointer( HBITMAP hbmp, BITMAPINFO *bmi ) if (GetObjectW( hbmp, sizeof(ds), &ds ) == sizeof(ds)) { - memcpy( &bmi->bmiHeader, &ds.dsBmih, sizeof(bmi->bmiHeader) ); + bmi->bmiHeader = ds.dsBmih; return ds.dsBm.bmBits; } return NULL;

1 0

Henri Verbeet : wined3d: Get rid of the mostly unused "num_textures_used" field from arbfp_ffp_desc.
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: 672ad0610876f344f0cf1309b8a0747ebab3a93a URL: http://source.winehq.org/git/wine.git/?a=commit;h=672ad0610876f344f0cf1309b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 11:23:44 2012 +0200 wined3d: Get rid of the mostly unused "num_textures_used" field from arbfp_ffp_desc. --- dlls/wined3d/arb_program_shader.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 87e89fd..2a74171 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5618,7 +5618,6 @@ struct arbfp_ffp_desc { struct ffp_frag_desc parent; GLuint shader; - unsigned int num_textures_used; }; /* Context activation and GL locking are done by the caller. */ @@ -6421,13 +6420,6 @@ static void fragment_prog_arbfp(struct wined3d_context *context, const struct wi ERR("Out of memory\n"); return; } - new_desc->num_textures_used = 0; - for (i = 0; i < gl_info->limits.texture_stages; ++i) - { - if (settings.op[i].cop == WINED3D_TOP_DISABLE) - break; - new_desc->num_textures_used = i; - } memcpy(&new_desc->parent.settings, &settings, sizeof(settings)); new_desc->shader = gen_arbfp_ffp_shader(&settings, gl_info);

1 0

Frédéric Delanoy : cmd/tests: Add tests for GEQ comparison operator in "if" statements.
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: 43f5471cbaadc4655a363da351712e24b88eb94e URL: http://source.winehq.org/git/wine.git/?a=commit;h=43f5471cbaadc4655a363da35… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 23 03:10:27 2012 +0200 cmd/tests: Add tests for GEQ comparison operator in "if" statements. --- programs/cmd/tests/test_builtins.cmd | 12 ++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 25 +++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index e940b2d..b7e72ec 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -699,6 +699,11 @@ for %%i in (%STR_PARMS%) do call :NEQtest %%i B for %%i in (%STR_PARMS%) do call :NEQtest %%i AB for %%i in (%STR_PARMS%) do call :NEQtest %%i BA for %%i in (%STR_PARMS%) do call :NEQtest %%i AA +for %%i in (%STR_PARMS%) do call :GEQtest %%i A +for %%i in (%STR_PARMS%) do call :GEQtest %%i B +for %%i in (%STR_PARMS%) do call :GEQtest %%i AB +for %%i in (%STR_PARMS%) do call :GEQtest %%i BA +for %%i in (%STR_PARMS%) do call :GEQtest %%i AA echo ------ for numbers if -1 LSS 1 (echo negative numbers handled) if not -1 LSS -10 (echo negative numbers handled) @@ -728,6 +733,10 @@ for %%i in (%INT_PARMS%) do call :NEQtest %%i 0 for %%i in (%INT_PARMS%) do call :NEQtest %%i 1 for %%i in (%INT_PARMS%) do call :NEQtest %%i 10 for %%i in (%INT_PARMS%) do call :NEQtest %%i 9 +for %%i in (%INT_PARMS%) do call :GEQtest %%i 0 +for %%i in (%INT_PARMS%) do call :GEQtest %%i 1 +for %%i in (%INT_PARMS%) do call :GEQtest %%i 10 +for %%i in (%INT_PARMS%) do call :GEQtest %%i 9 goto :endIfCompOpsSubroutines rem IF subroutines helpers @@ -743,6 +752,9 @@ goto :eof :NEQtest if %1 NEQ %2 echo %1 NEQ %2 goto :eof +:GEQtest +if %1 GEQ %2 echo %1 GEQ %2 +goto :eof :endIfCompOpsSubroutines set STR_PARMS= diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index c04c775..81686ff 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -507,6 +507,21 @@ LSS string can be used as operand for LSS comparison @todo_wine(a)B NEQ AA @todo_wine(a)AB NEQ AA @todo_wine(a)BA NEQ AA +(a)todo_wine@A GEQ A +(a)todo_wine@B GEQ A +(a)todo_wine@AB GEQ A +(a)todo_wine@BA GEQ A +(a)todo_wine@AA GEQ A +(a)todo_wine@B GEQ B +(a)todo_wine@BA GEQ B +(a)todo_wine@B GEQ AB +(a)todo_wine@AB GEQ AB +(a)todo_wine@BA GEQ AB +(a)todo_wine@BA GEQ BA +(a)todo_wine@B GEQ AA +(a)todo_wine@AB GEQ AA +(a)todo_wine@BA GEQ AA +(a)todo_wine@AA GEQ AA ------ for numbers negative numbers handled negative numbers handled @@ -551,6 +566,16 @@ also in negative form @todo_wine(a)0 NEQ 9 @todo_wine(a)1 NEQ 9 @todo_wine(a)10 NEQ 9 +(a)todo_wine@0 GEQ 0 +(a)todo_wine@1 GEQ 0 +(a)todo_wine@10 GEQ 0 +(a)todo_wine@9 GEQ 0 +(a)todo_wine@1 GEQ 1 +(a)todo_wine@10 GEQ 1 +(a)todo_wine@9 GEQ 1 +(a)todo_wine@10 GEQ 10 +(a)todo_wine@10 GEQ 9 +(a)todo_wine@9 GEQ 9 ------------ Testing for ------------ --- plain FOR A

1 0

Henri Verbeet : wined3d: Move shader_is_pshader_version() and shader_is_vshader_version() to the ARB program shader backend.
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: 6f025deba66821f2f3702d87de125058992e7d06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f025deba66821f2f3702d87d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 11:23:42 2012 +0200 wined3d: Move shader_is_pshader_version() and shader_is_vshader_version() to the ARB program shader backend. --- dlls/wined3d/arb_program_shader.c | 10 ++++++++++ dlls/wined3d/wined3d_private.h | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5201998..87e89fd 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -39,6 +39,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); WINE_DECLARE_DEBUG_CHANNEL(d3d_constants); WINE_DECLARE_DEBUG_CHANNEL(d3d); +static BOOL shader_is_pshader_version(enum wined3d_shader_type type) +{ + return type == WINED3D_SHADER_TYPE_PIXEL; +} + +static BOOL shader_is_vshader_version(enum wined3d_shader_type type) +{ + return type == WINED3D_SHADER_TYPE_VERTEX; +} + /* Extract a line. Note that this modifies the source string. */ static char *get_line(char **ptr) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 06f75de..2116aa6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2654,16 +2654,6 @@ void shader_generate_main(const struct wined3d_shader *shader, struct wined3d_sh const struct wined3d_shader_reg_maps *reg_maps, const DWORD *byte_code, void *backend_ctx) DECLSPEC_HIDDEN; BOOL shader_match_semantic(const char *semantic_name, enum wined3d_decl_usage usage) DECLSPEC_HIDDEN; -static inline BOOL shader_is_pshader_version(enum wined3d_shader_type type) -{ - return type == WINED3D_SHADER_TYPE_PIXEL; -} - -static inline BOOL shader_is_vshader_version(enum wined3d_shader_type type) -{ - return type == WINED3D_SHADER_TYPE_VERTEX; -} - static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg) { switch (reg->type)

1 0

André Hentschel : winedbg: Fix check for register number (coverity).
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: 72836c0b7eb13d8d840a73c1c999c35e38c2264e URL: http://source.winehq.org/git/wine.git/?a=commit;h=72836c0b7eb13d8d840a73c1c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 22 19:46:44 2012 +0200 winedbg: Fix check for register number (coverity). --- programs/winedbg/gdbproxy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index ff845d2..b3978ae 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1547,7 +1547,7 @@ static enum packet_return packet_write_register(struct gdb_context* gdbctx) assert(gdbctx->in_trap); reg = strtoul(gdbctx->in_packet, &ptr, 16); - if (ptr == NULL || reg > cpu_num_regs || *ptr++ != '=') + if (ptr == NULL || reg >= cpu_num_regs || *ptr++ != '=') { if (gdbctx->trace & GDBPXY_TRC_COMMAND_ERROR) fprintf(stderr, "Invalid register index %s\n", gdbctx->in_packet);

1 0

Nikolay Sivov : dwrite: Added basic GetFirstMatchingFont() for font family.
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: 22508806fc8c2abef7816c4f5c06dc0917a6e5f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22508806fc8c2abef7816c4f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 23 08:18:32 2012 -0400 dwrite: Added basic GetFirstMatchingFont() for font family. --- dlls/dwrite/font.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index bdc84ee..4b697e9 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -607,8 +607,16 @@ static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *i DWRITE_FONT_STRETCH stretch, DWRITE_FONT_STYLE style, IDWriteFont **font) { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily(iface); - FIXME("(%p)->(%d %d %d %p): stub\n", This, weight, stretch, style, font); - return E_NOTIMPL; + LOGFONTW lf; + + TRACE("(%p)->(%d %d %d %p)\n", This, weight, stretch, style, font); + + memset(&lf, 0, sizeof(lf)); + lf.lfWeight = weight; + lf.lfItalic = style == DWRITE_FONT_STYLE_ITALIC; + strcpyW(lf.lfFaceName, This->familyname); + + return create_font_from_logfont(&lf, font); } static HRESULT WINAPI dwritefontfamily_GetMatchingFonts(IDWriteFontFamily *iface, DWRITE_FONT_WEIGHT weight,

1 0