October 2009 - Wine-commits

Jacek Caban : mshtml: Added IHTMLAnchorElement::get_href implementation.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 407e54be8957733feccae5ae609d86a6ecf0ec01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=407e54be8957733feccae5ae6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 13:52:36 2009 +0200 mshtml: Added IHTMLAnchorElement::get_href implementation. --- dlls/mshtml/htmlanchor.c | 33 +++++++++++++++++++++++++++++++-- dlls/mshtml/nsiface.idl | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 7797e7e..09c7eda 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -36,6 +36,8 @@ typedef struct { HTMLElement element; const IHTMLAnchorElementVtbl *lpHTMLAnchorElementVtbl; + + nsIDOMHTMLAnchorElement *nsanchor; } HTMLAnchorElement; #define HTMLANCHOR(x) (&(x)->lpHTMLAnchorElementVtbl) @@ -104,8 +106,26 @@ static HRESULT WINAPI HTMLAnchorElement_put_href(IHTMLAnchorElement *iface, BSTR static HRESULT WINAPI HTMLAnchorElement_get_href(IHTMLAnchorElement *iface, BSTR *p) { HTMLAnchorElement *This = HTMLANCHOR_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString href_str; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&href_str, NULL); + nsres = nsIDOMHTMLAnchorElement_GetHref(This->nsanchor, &href_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *href; + + nsAString_GetData(&href_str, &href); + hres = nsuri_to_url(href, TRUE, p); + }else { + ERR("GetHref failed: %08x\n", nsres); + hres = E_FAIL; + } + + nsAString_Finish(&href_str); + return hres; } static HRESULT WINAPI HTMLAnchorElement_put_target(IHTMLAnchorElement *iface, BSTR v) @@ -464,6 +484,10 @@ static HRESULT HTMLAnchorElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) static void HTMLAnchorElement_destructor(HTMLDOMNode *iface) { HTMLAnchorElement *This = HTMLANCHOR_NODE_THIS(iface); + + if(This->nsanchor) + nsIDOMHTMLAnchorElement_Release(This->nsanchor); + HTMLElement_destructor(&This->element.node); } @@ -497,11 +521,16 @@ static dispex_static_data_t HTMLAnchorElement_dispex = { HTMLElement *HTMLAnchorElement_Create(nsIDOMHTMLElement *nselem) { HTMLAnchorElement *ret = heap_alloc_zero(sizeof(HTMLAnchorElement)); + nsresult nsres; ret->lpHTMLAnchorElementVtbl = &HTMLAnchorElementVtbl; ret->element.node.vtbl = &HTMLAnchorElementImplVtbl; HTMLElement_Init(&ret->element, &HTMLAnchorElement_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLAnchorElement, (void**)&ret->nsanchor); + if(NS_FAILED(nsres)) + ERR("Could not get nsIDOMHTMLAnchorElement iface: %08x\n", nsres); + return &ret->element; } diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index cb8f768..571c023 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -1353,6 +1353,42 @@ interface nsIDOMHTMLImageElement : nsIDOMHTMLElement [ object, + uuid(a6cf90aa-15b3-11d2-932e-00805f8add32), + local + /* FROZEN */ +] +interface nsIDOMHTMLAnchorElement : nsIDOMHTMLElement +{ + nsresult GetAccessKey(nsAString *aAccessKey); + nsresult SetAccessKey(const nsAString *aAccessKey); + nsresult GetCharset(nsAString *aCharset); + nsresult SetCharset(const nsAString *aCharset); + nsresult GetCoords(nsAString *aCoords); + nsresult SetCoords(const nsAString *aCoords); + nsresult GetHref(nsAString *aHref); + nsresult SetHref(const nsAString *aHref); + nsresult GetHreflang(nsAString *aHreflang); + nsresult SetHreflang(const nsAString *aHreflang); + nsresult GetName(nsAString *aName); + nsresult SetName(const nsAString *aName); + nsresult GetRel(nsAString *aRel); + nsresult SetRel(const nsAString *aRel); + nsresult GetRev(nsAString *aRev); + nsresult SetRev(const nsAString *aRev); + nsresult GetShape(nsAString *aShape); + nsresult SetShape(const nsAString *aShape); + nsresult GetTabIndex(PRInt32 *aTabIndex); + nsresult SetTabIndex(PRInt32 aTabIndex); + nsresult GetTarget(nsAString *aTarget); + nsresult SetTarget(const nsAString *aTarget); + nsresult GetType(nsAString *aType); + nsresult SetType(const nsAString *aType); + nsresult Blur(); + nsresult Focus(); +} + +[ + object, uuid(a6cf90b2-15b3-11d2-932e-00805f8add32), local /* FROZEN */

1 0

Jacek Caban : mshtml: Added IHTMLAnchorElement::get_href tests.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: d3a3af755b59e14e188776f899073ec00aac1ba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3a3af755b59e14e188776f89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 13:53:17 2009 +0200 mshtml: Added IHTMLAnchorElement::get_href tests. --- dlls/mshtml/tests/dom.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b8a7e8a..862d281 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -42,7 +42,7 @@ static const char range_test2_str[] = static const char elem_test_str[] = "<html><head><title>test</title><style>.body { margin-right: 0px; }</style>" "<body onload=\"Testing()\">text test" - "<a href=\"http://test\" name=\"x\">link</a>" + "<a id=\"a\" href=\"http://test\" name=\"x\">link</a>" "<input id=\"in\" class=\"testclass\" tabIndex=\"2\" title=\"test title\" />" "<select id=\"s\"><option id=\"x\" value=\"val1\">opt1</option><option id=\"y\">opt2</option></select>" "<textarea id=\"X\">text text</textarea>" @@ -610,6 +610,17 @@ static IHTMLImgElement *_get_img_iface(unsigned line, IUnknown *unk) return img; } +#define get_anchor_iface(u) _get_anchor_iface(__LINE__,u) +static IHTMLAnchorElement *_get_anchor_iface(unsigned line, IUnknown *unk) +{ + IHTMLAnchorElement *anchor; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLAnchorElement, (void**)&anchor); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLAnchorElement: %08x\n", hres); + return anchor; +} + #define test_node_name(u,n) _test_node_name(__LINE__,u,n) static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) { @@ -898,6 +909,21 @@ static IHTMLElement *_get_doc_elem(unsigned line, IHTMLDocument2 *doc) return elem; } +#define test_anchor_href(a,h) _test_anchor_href(__LINE__,a,h) +static void _test_anchor_href(unsigned line, IUnknown *unk, const char *exhref) +{ + IHTMLAnchorElement *anchor = _get_anchor_iface(line, unk); + BSTR str; + HRESULT hres; + + hres = IHTMLAnchorElement_get_href(anchor, &str); + ok_(__FILE__,line)(hres == S_OK, "get_href failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp_wa(str, exhref), "href = %s, expected %s\n", wine_dbgstr_w(str), exhref); + SysFreeString(str); + + _test_disp_value(line, unk, exhref); +} + #define test_option_text(o,t) _test_option_text(__LINE__,o,t) static void _test_option_text(unsigned line, IHTMLOptionElement *option, const char *text) { @@ -4932,6 +4958,12 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + elem = get_elem_by_id(doc, "a", TRUE); + if(elem) { + test_anchor_href((IUnknown*)elem, "http://test/"); + IHTMLElement_Release(elem); + } + hres = IHTMLDocument2_get_body(doc, &elem); ok(hres == S_OK, "get_body failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Use document.defaultView to get iframe contentWindow.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: b1a9b4fd2d014f95a16922caa2b3a1a534404303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1a9b4fd2d014f95a16922caa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 13:53:52 2009 +0200 mshtml: Use document.defaultView to get iframe contentWindow. --- dlls/mshtml/htmliframe.c | 40 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index 5f3cafb..a482a5b 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -43,6 +43,40 @@ typedef struct { #define HTMLFRAMEBASE2(x) (&(x)->lpIHTMLFrameBase2Vtbl) +static HRESULT create_content_window(HTMLIFrame *This, nsIDOMHTMLDocument *nsdoc, HTMLWindow **ret) +{ + nsIDOMDocumentView *nsdocview; + nsIDOMAbstractView *nsview; + nsIDOMWindow *nswindow; + nsresult nsres; + HRESULT hres; + + nsres = nsIDOMHTMLDocument_QueryInterface(nsdoc, &IID_nsIDOMDocumentView, (void**)&nsdocview); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMDocumentView: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMDocumentView_GetDefaultView(nsdocview, &nsview); + nsIDOMDocumentView_Release(nsdocview); + if(NS_FAILED(nsres)) { + ERR("GetDefaultView failed: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMAbstractView_QueryInterface(nsview, &IID_nsIDOMWindow, (void**)&nswindow); + nsIDOMAbstractView_Release(nsview); + if(NS_FAILED(nsres)) { + ERR("Coult not get nsIDOMWindow iface: %08x\n", nsres); + return E_FAIL; + } + + hres = HTMLWindow_Create(This->element.node.doc->basedoc.doc_obj, nswindow, ret); + + nsIDOMWindow_Release(nswindow); + return hres; +} + #define HTMLFRAMEBASE2_THIS(iface) DEFINE_THIS(HTMLIFrame, IHTMLFrameBase2, iface) static HRESULT WINAPI HTMLIFrameBase2_QueryInterface(IHTMLFrameBase2 *iface, REFIID riid, void **ppv) @@ -130,10 +164,10 @@ static HRESULT WINAPI HTMLIFrameBase2_get_contentWindow(IHTMLFrameBase2 *iface, return E_FAIL; } - hres = HTMLWindow_Create(This->element.node.doc->basedoc.doc_obj, NULL, &window); + hres = create_content_window(This, nshtmldoc, &window); if(FAILED(hres)) { - nsIDOMDocument_Release(nsdoc); - return hres; + nsIDOMHTMLDocument_Release(nshtmldoc); + return E_FAIL; } hres = create_doc_from_nsdoc(nshtmldoc, This->element.node.doc->basedoc.doc_obj, window, &content_doc);

1 0

Jacek Caban : mshtml: Added IHTMLDOMNode::cloneNode implementation.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: d0e9681969b4d565af59e583b7efdfac2e5a1471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e9681969b4d565af59e583b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 13:54:22 2009 +0200 mshtml: Added IHTMLDOMNode::cloneNode implementation. --- dlls/mshtml/htmlnode.c | 18 +++++++++++++- dlls/mshtml/tests/dom.c | 55 +++++++++++++++++++++++++++++++++++++++------- 2 files changed, 62 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 8c83e56..1c7b7cb 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -536,8 +536,22 @@ static HRESULT WINAPI HTMLDOMNode_cloneNode(IHTMLDOMNode *iface, VARIANT_BOOL fD IHTMLDOMNode **clonedNode) { HTMLDOMNode *This = HTMLDOMNODE_THIS(iface); - FIXME("(%p)->(%x %p)\n", This, fDeep, clonedNode); - return E_NOTIMPL; + nsIDOMNode *nsnode; + HTMLDOMNode *node; + nsresult nsres; + + TRACE("(%p)->(%x %p)\n", This, fDeep, clonedNode); + + nsres = nsIDOMNode_CloneNode(This->nsnode, fDeep != VARIANT_FALSE, &nsnode); + if(NS_FAILED(nsres) || !nsnode) { + ERR("CloneNode failed: %08x\n", nsres); + return E_FAIL; + } + + node = get_node(This->doc, nsnode, TRUE); + IHTMLDOMNode_AddRef(HTMLDOMNODE(node)); + *clonedNode = HTMLDOMNODE(node); + return S_OK; } static HRESULT WINAPI HTMLDOMNode_removeNode(IHTMLDOMNode *iface, VARIANT_BOOL fDeep, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 862d281..dba424b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -656,6 +656,22 @@ static IHTMLDocument2 *_get_owner_doc(unsigned line, IUnknown *unk) return doc; } +#define clone_node(n,d) _clone_node(__LINE__,n,d) +static IHTMLDOMNode *_clone_node(unsigned line, IUnknown *unk, VARIANT_BOOL deep) +{ + IHTMLDOMNode *node = _get_node_iface(line, unk); + IHTMLDOMNode *ret = NULL; + HRESULT hres; + + hres = IHTMLDOMNode_cloneNode(node, deep, &ret); + IHTMLDOMNode_Release(node); + ok_(__FILE__,line)(hres == S_OK, "cloneNode failed: %08x\n", hres); + ok_(__FILE__,line)(ret != NULL, "ret == NULL\n"); + + return ret; + +} + #define test_elem_tag(u,n) _test_elem_tag(__LINE__,u,n) static void _test_elem_tag(unsigned line, IUnknown *unk, const char *extag) { @@ -1287,6 +1303,21 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, IHTMLElementCollection_Release(col); } +#define test_elem_all(c,t,l) _test_elem_all(__LINE__,c,t,l) +static void _test_elem_all(unsigned line, IUnknown *unk, const elem_type_t *elem_types, LONG exlen) +{ + IHTMLElement *elem = _get_elem_iface(line, unk); + IDispatch *disp; + HRESULT hres; + + hres = IHTMLElement_get_all(elem, &disp); + IHTMLElement_Release(elem); + ok_(__FILE__,line)(hres == S_OK, "get_all failed: %08x\n", hres); + + _test_elem_collection(line, (IUnknown*)disp, elem_types, exlen); + IDispatch_Release(disp); +} + #define test_elem_getelembytag(u,t,l) _test_elem_getelembytag(__LINE__,u,t,l) static void _test_elem_getelembytag(unsigned line, IUnknown *unk, elem_type_t type, LONG exlen) { @@ -4462,9 +4493,11 @@ static void test_table_elem(IHTMLElement *elem) { IHTMLElementCollection *col; IHTMLTable *table; + IHTMLDOMNode *node; HRESULT hres; static const elem_type_t row_types[] = {ET_TR,ET_TR}; + static const elem_type_t all_types[] = {ET_TBODY,ET_TR,ET_TR,ET_TD,ET_TD}; hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLTable, (void**)&table); ok(hres == S_OK, "Could not get IHTMLTable iface: %08x\n", hres); @@ -4479,6 +4512,18 @@ static void test_table_elem(IHTMLElement *elem) test_elem_collection((IUnknown*)col, row_types, sizeof(row_types)/sizeof(*row_types)); IHTMLElementCollection_Release(col); + test_elem_all((IUnknown*)table, all_types, sizeof(all_types)/sizeof(*all_types)); + + node = clone_node((IUnknown*)table, VARIANT_TRUE); + test_elem_tag((IUnknown*)node, "TABLE"); + test_elem_all((IUnknown*)node, all_types, sizeof(all_types)/sizeof(*all_types)); + IHTMLDOMNode_Release(node); + + node = clone_node((IUnknown*)table, VARIANT_FALSE); + test_elem_tag((IUnknown*)node, "TABLE"); + test_elem_all((IUnknown*)node, NULL, 0); + IHTMLDOMNode_Release(node); + IHTMLTable_Release(table); } @@ -4748,16 +4793,8 @@ static void test_elems(IHTMLDocument2 *doc) } elem = get_doc_elem(doc); - ok(hres == S_OK, "get_documentElement failed: %08x\n", hres); - hres = IHTMLElement_get_all(elem, &disp); + test_elem_all((IUnknown*)elem, all_types+1, sizeof(all_types)/sizeof(all_types[0])-1); IHTMLElement_Release(elem); - ok(hres == S_OK, "get_all failed: %08x\n", hres); - - hres = IDispatch_QueryInterface(disp, &IID_IHTMLElementCollection, (void**)&col); - IDispatch_Release(disp); - ok(hres == S_OK, "Could not get IHTMLElementCollection: %08x\n", hres); - test_elem_collection((IUnknown*)col, all_types+1, sizeof(all_types)/sizeof(all_types[0])-1); - IHTMLElementCollection_Release(col); get_elem_by_id(doc, "xxx", FALSE); elem = get_doc_elem_by_id(doc, "xxx");

1 0

Jacek Caban : jscript: Added FIXME about IClassFactoryEx.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 960d7f9fdb0b57a5e6a74a05039f1d1b93576263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=960d7f9fdb0b57a5e6a74a050… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 13:54:51 2009 +0200 jscript: Added FIXME about IClassFactoryEx. --- dlls/jscript/activex.c | 15 +++++++++++++-- dlls/jscript/jscript_main.c | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/activex.c b/dlls/jscript/activex.c index 2029edf..e37abd2 100644 --- a/dlls/jscript/activex.c +++ b/dlls/jscript/activex.c @@ -21,6 +21,7 @@ #include "jscript.h" #include "objsafe.h" +#include "mshtmhst.h" #include "wine/debug.h" @@ -59,6 +60,8 @@ static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid) { IInternetHostSecurityManager *secmgr; struct CONFIRMSAFETY cs; + IClassFactoryEx *cfex; + IClassFactory *cf; DWORD policy_size; BYTE *bpolicy; IUnknown *obj; @@ -82,9 +85,17 @@ static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid) if(FAILED(hres) || policy != URLPOLICY_ALLOW) return NULL; - /* FIXME: Use IClassFactoryEx */ + hres = CoGetClassObject(&guid, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, NULL, &IID_IClassFactory, (void**)&cf); + if(FAILED(hres)) + return NULL; + + hres = IClassFactory_QueryInterface(cf, &IID_IClassFactoryEx, (void**)&cfex); + if(SUCCEEDED(hres)) { + FIXME("Use IClassFactoryEx\n"); + IClassFactoryEx_Release(cfex); + } - hres = CoCreateInstance(&guid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void**)&obj); + hres = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&obj); if(FAILED(hres)) return NULL; diff --git a/dlls/jscript/jscript_main.c b/dlls/jscript/jscript_main.c index 4f59ecb..78f8f00 100644 --- a/dlls/jscript/jscript_main.c +++ b/dlls/jscript/jscript_main.c @@ -24,6 +24,7 @@ #include "advpub.h" #include "activaut.h" #include "objsafe.h" +#include "mshtmhst.h" #include "wine/debug.h"

1 0

Jacek Caban : mshtml.idl: Moved IHTMLElement dispinterface declaration to macro.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 328b1d9ddb77bceab273e979bbb5a572159af783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=328b1d9ddb77bceab273e979b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 13:56:12 2009 +0200 mshtml.idl: Moved IHTMLElement dispinterface declaration to macro. --- include/mshtml.idl | 3535 +++++----------------------------------------------- 1 files changed, 284 insertions(+), 3251 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=328b1d9ddb77bceab273e…

1 0

Stefan Dösinger : wined3d: SetRenderTarget bypasses stateblock recording.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 4a3f04cb5633d073b8ecdbc298e09ff71ba70c35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a3f04cb5633d073b8ecdbc29… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 30 18:58:04 2009 +0200 wined3d: SetRenderTarget bypasses stateblock recording. --- dlls/wined3d/device.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6cbf115..e4b5cd1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6130,7 +6130,6 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, DWORD RenderTargetIndex, IWineD3DSurface *pRenderTarget) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - WINED3DVIEWPORT viewport; int dxVersion = ( (IWineD3DImpl *) This->wineD3D)->dxVersion; TRACE("(%p) : Setting rendertarget %d to %p\n", This, RenderTargetIndex, pRenderTarget); @@ -6165,14 +6164,16 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, /* Render target 0 is special */ if(RenderTargetIndex == 0 && dxVersion > 7) { - /* Finally, reset the viewport as the MSDN states. */ - viewport.Height = ((IWineD3DSurfaceImpl *)This->render_targets[0])->currentDesc.Height; - viewport.Width = ((IWineD3DSurfaceImpl *)This->render_targets[0])->currentDesc.Width; - viewport.X = 0; - viewport.Y = 0; - viewport.MaxZ = 1.0f; - viewport.MinZ = 0.0f; - IWineD3DDeviceImpl_SetViewport(iface, &viewport); + /* Finally, reset the viewport as the MSDN states. Tests show that stateblock recording is ignored. + * the change goes directly into the primary stateblock. + */ + This->stateBlock->viewport.Height = ((IWineD3DSurfaceImpl *)This->render_targets[0])->currentDesc.Height; + This->stateBlock->viewport.Width = ((IWineD3DSurfaceImpl *)This->render_targets[0])->currentDesc.Width; + This->stateBlock->viewport.X = 0; + This->stateBlock->viewport.Y = 0; + This->stateBlock->viewport.MaxZ = 1.0f; + This->stateBlock->viewport.MinZ = 0.0f; + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VIEWPORT); } return WINED3D_OK; }

1 0

Stefan Dösinger : wined3d: SetRenderTarget resets the scissor rect.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: cb5ce03de4e821257a21ac70bc82c0dcf91900d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb5ce03de4e821257a21ac70b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 30 18:59:41 2009 +0200 wined3d: SetRenderTarget resets the scissor rect. --- dlls/wined3d/device.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e4b5cd1..90da2a0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6164,8 +6164,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, /* Render target 0 is special */ if(RenderTargetIndex == 0 && dxVersion > 7) { - /* Finally, reset the viewport as the MSDN states. Tests show that stateblock recording is ignored. - * the change goes directly into the primary stateblock. + /* Finally, reset the viewport and scissor rect as the MSDN states. + * Tests show that stateblock recording is ignored, the change goes + * directly into the primary stateblock. */ This->stateBlock->viewport.Height = ((IWineD3DSurfaceImpl *)This->render_targets[0])->currentDesc.Height; This->stateBlock->viewport.Width = ((IWineD3DSurfaceImpl *)This->render_targets[0])->currentDesc.Width; @@ -6174,6 +6175,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, This->stateBlock->viewport.MaxZ = 1.0f; This->stateBlock->viewport.MinZ = 0.0f; IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VIEWPORT); + + This->stateBlock->scissorRect.top = 0; + This->stateBlock->scissorRect.left = 0; + This->stateBlock->scissorRect.right = This->stateBlock->viewport.Width; + This->stateBlock->scissorRect.bottom = This->stateBlock->viewport.Height; + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SCISSORRECT); } return WINED3D_OK; }

1 0

Michael Stefaniuc : user32/tests: Use LONG instead of long.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: bd93d0b5d8a6a9299e8367ca49351a3e94132aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd93d0b5d8a6a9299e8367ca4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 2 12:18:42 2009 +0200 user32/tests: Use LONG instead of long. --- dlls/user32/tests/msg.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 57931cf..761f3aa 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5257,7 +5257,7 @@ static WNDPROC old_button_proc; static LRESULT CALLBACK button_hook_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct recvd_message msg; @@ -5458,7 +5458,7 @@ static WNDPROC old_static_proc; static LRESULT CALLBACK static_hook_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct recvd_message msg; @@ -5553,7 +5553,7 @@ static WNDPROC old_combobox_proc; static LRESULT CALLBACK combobox_hook_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct recvd_message msg; @@ -9011,7 +9011,7 @@ static WNDPROC old_edit_proc; static LRESULT CALLBACK edit_hook_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct recvd_message msg;

1 0

Michael Stefaniuc : oleaut32/tests: Use LONG instead of long.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 8b2723d48d922cb4fc0a2ae5192505978d606ab4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b2723d48d922cb4fc0a2ae51… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 2 12:18:50 2009 +0200 oleaut32/tests: Use LONG instead of long. --- dlls/oleaut32/tests/olefont.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 8e26a0f..b457f36 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -57,9 +57,9 @@ static HRESULT (WINAPI *pOleCreateFontIndirect)(LPFONTDESC,REFIID,LPVOID*); /* check that resulting hfont has height hfont_height. */ /* Various checks along the way. */ -static void test_ifont_sizes(long lo_size, long hi_size, - long ratio_logical, long ratio_himetric, - long hfont_height, const char * test_name) +static void test_ifont_sizes(LONG lo_size, LONG hi_size, + LONG ratio_logical, LONG ratio_himetric, + LONG hfont_height, const char * test_name) { FONTDESC fd; LPVOID pvObj = NULL; @@ -91,8 +91,8 @@ static void test_ifont_sizes(long lo_size, long hi_size, ok(hres == S_OK,"%s: IFont_get_size returns 0x%08x instead of S_OK.\n", test_name, hres); ok(S(psize).Lo == lo_size && S(psize).Hi == 0, - "%s: get_Size: Lo=%d, Hi=%d; expected Lo=%ld, Hi=%ld.\n", - test_name, S(psize).Lo, S(psize).Hi, lo_size, 0L); + "%s: get_Size: Lo=%d, Hi=%d; expected Lo=%d, Hi=0.\n", + test_name, S(psize).Lo, S(psize).Hi, lo_size); /* Change ratio, check size unchanged. Standard is 72, 2540. */ hres = IFont_SetRatio(ifnt, ratio_logical, ratio_himetric); @@ -102,8 +102,8 @@ static void test_ifont_sizes(long lo_size, long hi_size, ok(hres == S_OK,"%s: IFont_get_size returns 0x%08x instead of S_OK.\n", test_name, hres); ok(S(psize).Lo == lo_size && S(psize).Hi == 0, - "%s: gS after SR: Lo=%d, Hi=%d; expected Lo=%ld, Hi=%ld.\n", - test_name, S(psize).Lo, S(psize).Hi, lo_size, 0L); + "%s: gS after SR: Lo=%d, Hi=%d; expected Lo=%d, Hi=0.\n", + test_name, S(psize).Lo, S(psize).Hi, lo_size); /* Check hFont size with this ratio. This tests an important */ /* conversion for which MSDN is very wrong. */ @@ -112,7 +112,7 @@ static void test_ifont_sizes(long lo_size, long hi_size, test_name, hres); hres = GetObject (hfont, sizeof(LOGFONT), &lf); ok(lf.lfHeight == hfont_height, - "%s: hFont has lf.lfHeight=%d, expected %ld.\n", + "%s: hFont has lf.lfHeight=%d, expected %d.\n", test_name, lf.lfHeight, hfont_height); /* Free IFont. */

1 0