October 2009 - Wine-commits

Jacek Caban : mshtml: Added IHTMLElement::click implementation.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 6e319087a997da62e4330e7882b7cc4e5e3680c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e319087a997da62e4330e788… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 00:42:22 2009 +0200 mshtml: Added IHTMLElement::click implementation. --- dlls/mshtml/htmlelem.c | 6 ++++-- dlls/mshtml/htmlevent.c | 16 ++++++++++++++++ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlinput.c | 21 +++++++++++++++++++++ dlls/mshtml/htmlselect.c | 1 + dlls/mshtml/htmltextarea.c | 1 + dlls/mshtml/mshtml_private.h | 1 + 7 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 28421bb..d019634 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1103,8 +1103,10 @@ static HRESULT WINAPI HTMLElement_get_isTextEdit(IHTMLElement *iface, VARIANT_BO static HRESULT WINAPI HTMLElement_click(IHTMLElement *iface) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + return call_event(&This->node, EVENTID_CLICK); } static HRESULT WINAPI HTMLElement_get_filters(IHTMLElement *iface, diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index b006478..a6c95a3 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -877,6 +877,22 @@ HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *even return S_OK; } +HRESULT call_event(HTMLDOMNode *node, eventid_t eid) +{ + HRESULT hres; + + if(node->vtbl->call_event) { + BOOL handled = FALSE; + + hres = node->vtbl->call_event(node, eid, &handled); + if(handled) + return hres; + } + + fire_event(node->doc, eid, node->nsnode, NULL); + return S_OK; +} + static inline event_target_t *get_event_target(event_target_t **event_target_ptr) { if(!*event_target_ptr) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 6c716a8..21e7ff0 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -46,6 +46,7 @@ HRESULT set_event_handler(event_target_t**,HTMLDocument*,eventid_t,VARIANT*); HRESULT get_event_handler(event_target_t**,eventid_t,VARIANT*); HRESULT attach_event(event_target_t**,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*); HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*); +HRESULT call_event(HTMLDOMNode*,eventid_t); static inline event_target_t **get_node_event_target(HTMLDOMNode *node) { diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 7db777c..488e2b1 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -28,6 +28,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlevent.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -1129,6 +1130,25 @@ static void HTMLInputElement_destructor(HTMLDOMNode *iface) HTMLElement_destructor(&This->element.node); } +static HRESULT HTMLInputElementImpl_call_event(HTMLDOMNode *iface, eventid_t eid, BOOL *handled) +{ + HTMLInputElement *This = HTMLINPUT_NODE_THIS(iface); + + if(eid == EVENTID_CLICK) { + nsresult nsres; + + *handled = TRUE; + + nsres = nsIDOMHTMLInputElement_Click(This->nsinput); + if(NS_FAILED(nsres)) { + ERR("Click failed: %08x\n", nsres); + return E_FAIL; + } + } + + return S_OK; +} + static HRESULT HTMLInputElementImpl_put_disabled(HTMLDOMNode *iface, VARIANT_BOOL v) { HTMLInputElement *This = HTMLINPUT_NODE_THIS(iface); @@ -1147,6 +1167,7 @@ static const NodeImplVtbl HTMLInputElementImplVtbl = { HTMLInputElement_QI, HTMLInputElement_destructor, NULL, + HTMLInputElementImpl_call_event, HTMLInputElementImpl_put_disabled, HTMLInputElementImpl_get_disabled, }; diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index f3dd757..ded73f6 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -481,6 +481,7 @@ static const NodeImplVtbl HTMLSelectElementImplVtbl = { HTMLSelectElement_QI, HTMLSelectElement_destructor, NULL, + NULL, HTMLSelectElementImpl_put_disabled, HTMLSelectElementImpl_get_disabled }; diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 2ff5c25..c34c841 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -406,6 +406,7 @@ static const NodeImplVtbl HTMLTextAreaElementImplVtbl = { HTMLTextAreaElement_QI, HTMLTextAreaElement_destructor, NULL, + NULL, HTMLTextAreaElementImpl_put_disabled, HTMLTextAreaElementImpl_get_disabled }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 44a816e..51074ed 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -425,6 +425,7 @@ typedef struct { HRESULT (*qi)(HTMLDOMNode*,REFIID,void**); void (*destructor)(HTMLDOMNode*); event_target_t **(*get_event_target)(HTMLDOMNode*); + HRESULT (*call_event)(HTMLDOMNode*,DWORD,BOOL*); HRESULT (*put_disabled)(HTMLDOMNode*,VARIANT_BOOL); HRESULT (*get_disabled)(HTMLDOMNode*,VARIANT_BOOL*); } NodeImplVtbl;

1 0

Jacek Caban : mshtml: Added more events tests.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 8272ecd3f2235b923f2ec67bb51d051bdfbf466f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8272ecd3f2235b923f2ec67bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 00:42:37 2009 +0200 mshtml: Added more events tests. --- dlls/mshtml/tests/events.c | 98 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 86 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index d0ddadb..9d23775 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -65,6 +65,7 @@ DEFINE_EXPECT(timeout); static HWND container_hwnd = NULL; static IHTMLWindow2 *window; static IOleDocumentView *view; +static BOOL xy_todo; typedef struct { LONG x; @@ -209,6 +210,18 @@ static IHTMLElement2 *_get_elem2_iface(unsigned line, IUnknown *unk) return elem2; } +#define get_elem3_iface(u) _get_elem3_iface(__LINE__,u) +static IHTMLElement3 *_get_elem3_iface(unsigned line, IUnknown *unk) +{ + IHTMLElement3 *elem3; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLElement3, (void**)&elem3); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement3 iface: %08x\n", hres); + + return elem3; +} + #define doc_get_body(d) _doc_get_body(__LINE__,d) static IHTMLElement *_doc_get_body(unsigned line, IHTMLDocument2 *doc) { @@ -268,6 +281,22 @@ static IHTMLEventObj *_get_event_obj(unsigned line) return event; } +#define elem_fire_event(a,b,c) _elem_fire_event(__LINE__,a,b,c) +static void _elem_fire_event(unsigned line, IUnknown *unk, const char *event, VARIANT *evobj) +{ + IHTMLElement3 *elem3 = _get_elem3_iface(line, unk); + VARIANT_BOOL b; + BSTR str; + HRESULT hres; + + b = 100; + str = a2bstr(event); + hres = IHTMLElement3_fireEvent(elem3, str, evobj, &b); + SysFreeString(str); + ok_(__FILE__,line)(hres == S_OK, "fireEvent failed: %08x\n", hres); + ok_(__FILE__,line)(b == VARIANT_TRUE, "fireEvent returned %x\n", b); +} + #define test_event_args(a,b,c,d,e,f,g) _test_event_args(__LINE__,a,b,c,d,e,f,g) static void _test_event_args(unsigned line, const IID *dispiid, DISPID id, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) @@ -465,10 +494,14 @@ static void _test_event_clientx(unsigned line, IHTMLEventObj *event, LONG exl) hres = IHTMLEventObj_get_clientX(event, &l); ok_(__FILE__,line)(hres == S_OK, "get_clientX failed: %08x\n", hres); - if(exl == -10) /* don't test the exact value */ - ok_(__FILE__,line)(l > 0, "clientX = %d\n", l); - else + if(exl == -10) {/* don't test the exact value */ + if(xy_todo) + todo_wine ok_(__FILE__,line)(l > 0, "clientX = %d\n", l); + else + ok_(__FILE__,line)(l > 0, "clientX = %d\n", l); + }else { ok_(__FILE__,line)(l == exl, "clientX = %d, expected %d\n", l, exl); + } } static void _test_event_clienty(unsigned line, IHTMLEventObj *event, LONG exl) @@ -478,10 +511,14 @@ static void _test_event_clienty(unsigned line, IHTMLEventObj *event, LONG exl) hres = IHTMLEventObj_get_clientY(event, &l); ok_(__FILE__,line)(hres == S_OK, "get_clientY failed: %08x\n", hres); - if(exl == -10) /* don't test the exact value */ - ok_(__FILE__,line)(l > 0, "clientY = %d\n", l); - else + if(exl == -10) {/* don't test the exact value */ + if(xy_todo) + todo_wine ok_(__FILE__,line)(l > 0, "clientY = %d\n", l); + else + ok_(__FILE__,line)(l > 0, "clientY = %d\n", l); + }else { ok_(__FILE__,line)(l == exl, "clientY = %d, expected %d\n", l, exl); + } } static void _test_event_offsetx(unsigned line, IHTMLEventObj *event, LONG exl) @@ -517,10 +554,14 @@ static void _test_event_screenx(unsigned line, IHTMLEventObj *event, LONG exl) hres = IHTMLEventObj_get_screenX(event, &l); ok_(__FILE__,line)(hres == S_OK, "get_screenX failed: %08x\n", hres); - if(exl == -10) /* don't test the exact value */ - ok_(__FILE__,line)(l > 0, "screenX = %d\n", l); - else + if(exl == -10) { /* don't test the exact value */ + if(xy_todo) + todo_wine ok_(__FILE__,line)(l > 0, "screenX = %d\n", l); + else + ok_(__FILE__,line)(l > 0, "screenX = %d\n", l); + }else { ok_(__FILE__,line)(l == exl, "screenX = %d, expected %d\n", l, exl); + } } static void _test_event_screeny(unsigned line, IHTMLEventObj *event, LONG exl) @@ -530,10 +571,14 @@ static void _test_event_screeny(unsigned line, IHTMLEventObj *event, LONG exl) hres = IHTMLEventObj_get_screenY(event, &l); ok_(__FILE__,line)(hres == S_OK, "get_screenY failed: %08x\n", hres); - if(exl == -10) /* don't test the exact value */ - ok_(__FILE__,line)(l > 0, "screenY = %d\n", l); - else + if(exl == -10) { /* don't test the exact value */ + if(xy_todo) + todo_wine ok_(__FILE__,line)(l > 0, "screenY = %d\n", l); + else + ok_(__FILE__,line)(l > 0, "screenY = %d\n", l); + }else { ok_(__FILE__,line)(l == exl, "screenY = %d, expected %d\n", l, exl); + } } static void _test_event_type(unsigned line, IHTMLEventObj *event, const char *exstr) @@ -918,6 +963,34 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(document_onclick); } + xy_todo = TRUE; + + SET_EXPECT(div_onclick); + SET_EXPECT(div_onclick_attached); + SET_EXPECT(body_onclick); + SET_EXPECT(document_onclick); + + hres = IHTMLElement_click(div); + ok(hres == S_OK, "click failed: %08x\n", hres); + + CHECK_CALLED(div_onclick); + CHECK_CALLED(div_onclick_attached); + CHECK_CALLED(body_onclick); + CHECK_CALLED(document_onclick); + + SET_EXPECT(div_onclick); + SET_EXPECT(div_onclick_attached); + SET_EXPECT(body_onclick); + SET_EXPECT(document_onclick); + + V_VT(&v) = VT_EMPTY; + elem_fire_event((IUnknown*)div, "onclick", &v); + + CHECK_CALLED(div_onclick); + CHECK_CALLED(div_onclick_attached); + CHECK_CALLED(body_onclick); + CHECK_CALLED(document_onclick); + IHTMLElement_Release(div); IHTMLElement_Release(body); } @@ -1482,6 +1555,7 @@ static void run_test(const char *str, testfunc_t test) MSG msg; HRESULT hres; + xy_todo = FALSE; doc = create_document(); set_client_site(doc, TRUE); doc_load_string(doc, str);

1 0

Nikolay Sivov : comctl32/monthcal: Simplify painting operations, split painting to several helpers.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 840a39e90a29bc0bb63853cbdb77ce4f694a0673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=840a39e90a29bc0bb63853cbd… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Oct 13 04:05:31 2009 +0400 comctl32/monthcal: Simplify painting operations, split painting to several helpers. --- dlls/comctl32/monthcal.c | 519 +++++++++++++++++++++------------------------- include/commctrl.h | 1 + 2 files changed, 241 insertions(+), 279 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=840a39e90a29bc0bb6385…

1 0

Nikolay Sivov : comctl32/monthcal: Implement handler for WM_ERASEBKGND.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 7beaa88ed9efcb048595f56e403dca16363a4486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7beaa88ed9efcb048595f56e4… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Oct 13 04:16:31 2009 +0400 comctl32/monthcal: Implement handler for WM_ERASEBKGND. --- dlls/comctl32/monthcal.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index dc61d01..8440e15 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1015,8 +1015,7 @@ static void MONTHCAL_PaintCalendar(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTS static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps) { - RECT *title=&infoPtr->title; - HBRUSH hbr; + RECT *title = &infoPtr->title; COLORREF old_text_clr, old_bk_clr; HFONT old_font; RECT r_temp; @@ -1025,11 +1024,6 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT old_bk_clr = GetBkColor(hdc); old_font = GetCurrentObject(hdc, OBJ_FONT); - /* fill background */ - hbr = CreateSolidBrush (infoPtr->bk); - FillRect(hdc, &ps->rcPaint, hbr); - DeleteObject(hbr); - /* draw title, redraw all its elements */ if(IntersectRect(&r_temp, &(ps->rcPaint), title)) MONTHCAL_PaintTitle(infoPtr, hdc, ps); @@ -1048,7 +1042,6 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT SetTextColor(hdc, old_text_clr); } - static LRESULT MONTHCAL_GetMinReqRect(const MONTHCAL_INFO *infoPtr, LPRECT lpRect) { @@ -2114,6 +2107,22 @@ MONTHCAL_Paint(MONTHCAL_INFO *infoPtr, HDC hdc_paint) } static LRESULT +MONTHCAL_EraseBkgnd(const MONTHCAL_INFO *infoPtr, HDC hdc) +{ + HBRUSH hbr; + RECT rc; + + if (!GetClipBox(hdc, &rc)) return FALSE; + + /* fill background */ + hbr = CreateSolidBrush (infoPtr->bk); + FillRect(hdc, &rc, hbr); + DeleteObject(hbr); + + return TRUE; +} + +static LRESULT MONTHCAL_SetFocus(const MONTHCAL_INFO *infoPtr) { TRACE("\n"); @@ -2529,6 +2538,9 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_PAINT: return MONTHCAL_Paint(infoPtr, (HDC)wParam); + case WM_ERASEBKGND: + return MONTHCAL_EraseBkgnd(infoPtr, (HDC)wParam); + case WM_SETFOCUS: return MONTHCAL_SetFocus(infoPtr);

1 0

Nikolay Sivov : comctl32/monthcal: Add separate handler for WM_PRINTCLIENT.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: e58b5349fbb040032da86bfe5542fedc075e4b68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e58b5349fbb040032da86bfe5… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Oct 13 04:21:27 2009 +0400 comctl32/monthcal: Add separate handler for WM_PRINTCLIENT. --- dlls/comctl32/monthcal.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 8440e15..67a0363 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -2123,6 +2123,23 @@ MONTHCAL_EraseBkgnd(const MONTHCAL_INFO *infoPtr, HDC hdc) } static LRESULT +MONTHCAL_PrintClient(MONTHCAL_INFO *infoPtr, HDC hdc, DWORD options) +{ + FIXME("Partial Stub: (hdc=%p options=0x%08x)\n", hdc, options); + + if ((options & PRF_CHECKVISIBLE) && !IsWindowVisible(infoPtr->hwndSelf)) + return 0; + + if (options & PRF_ERASEBKGND) + MONTHCAL_EraseBkgnd(infoPtr, hdc); + + if (options & PRF_CLIENT) + MONTHCAL_Paint(infoPtr, hdc); + + return 0; +} + +static LRESULT MONTHCAL_SetFocus(const MONTHCAL_INFO *infoPtr) { TRACE("\n"); @@ -2534,10 +2551,12 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_LBUTTONUP: return MONTHCAL_LButtonUp(infoPtr, lParam); - case WM_PRINTCLIENT: case WM_PAINT: return MONTHCAL_Paint(infoPtr, (HDC)wParam); + case WM_PRINTCLIENT: + return MONTHCAL_PrintClient(infoPtr, (HDC)wParam, (DWORD)lParam); + case WM_ERASEBKGND: return MONTHCAL_EraseBkgnd(infoPtr, (HDC)wParam);

1 0

Paul Vriens : comctl32/tests: Fix a test failure on older comctl32 versions .
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 3c130309d31c763be5e8da59b0b3e834ecb21e45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c130309d31c763be5e8da59b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Oct 13 08:09:09 2009 +0200 comctl32/tests: Fix a test failure on older comctl32 versions. --- dlls/comctl32/tests/monthcal.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index b8e64cc..2e84af5 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1402,7 +1402,9 @@ static void test_monthcal_monthrange(void) expect(1752, st_visible[0].wYear); expect(9, st_visible[0].wMonth); - expect(14, st_visible[0].wDay); + ok(14 == st_visible[0].wDay || + broken(1 == st_visible[0].wDay), /* comctl32 <= 4.72 */ + "Expected 14, got %d\n", st_visible[0].wDay); expect(1752, st_visible[1].wYear); expect(9, st_visible[1].wMonth);

1 0

Henri Verbeet : wined3d: Vertex state stateblocks should also record the vertex declaration.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 526839068f34c721c03e8d5a8f3b3d32f8b2ebee URL: http://source.winehq.org/git/wine.git/?a=commit;h=526839068f34c721c03e8d5a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 13 10:38:00 2009 +0200 wined3d: Vertex state stateblocks should also record the vertex declaration. --- dlls/wined3d/stateblock.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index cd70605..258fea0 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -301,6 +301,7 @@ static void stateblock_savedstates_set_vertex(SAVEDSTATES *states, const struct WORD sampler_mask = 0; unsigned int i; + states->vertexDecl = 1; states->vertexShader = 1; for (i = 0; i < sizeof(vertex_states_render) / sizeof(*vertex_states_render); ++i) @@ -974,6 +975,12 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) This->streamSource[i] = targetStateBlock->streamSource[i]; } } + if (This->vertexDecl != targetStateBlock->vertexDecl) + { + if (targetStateBlock->vertexDecl) IWineD3DVertexDeclaration_AddRef(targetStateBlock->vertexDecl); + if (This->vertexDecl) IWineD3DVertexDeclaration_Release(This->vertexDecl); + This->vertexDecl = targetStateBlock->vertexDecl; + } if(This->vertexShader != targetStateBlock->vertexShader) { if(targetStateBlock->vertexShader) IWineD3DVertexShader_AddRef(targetStateBlock->vertexShader); if(This->vertexShader) IWineD3DVertexShader_Release(This->vertexShader); @@ -1176,6 +1183,7 @@ should really perform a delta so that only the changes get updated*/ } } else if(This->blockType == WINED3DSBT_VERTEXSTATE) { IWineD3DDevice_SetVertexShader(pDevice, This->vertexShader); + IWineD3DDevice_SetVertexDeclaration(pDevice, This->vertexDecl); for (i = 0; i < GL_LIMITS(vshader_constantsF); i++) { IWineD3DDevice_SetVertexShaderConstantF(pDevice, i, This->vertexShaderConstantF + i * 4, 1); @@ -1751,7 +1759,7 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * if (stateblock->vertexShader) IWineD3DVertexShader_AddRef(stateblock->vertexShader); - stateblock->vertexDecl = NULL; + if (stateblock->vertexDecl) IWineD3DVertexDeclaration_AddRef(stateblock->vertexDecl); stateblock->pIndexData = NULL; stateblock->pixelShader = NULL; }

1 0

Henri Verbeet : wined3d: Capture on a recorded stateblock doesn' t record the vertexdeclaration in d3d9.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: da5b4916061491d2dc168234e000e0d54c6ae4a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da5b4916061491d2dc168234e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 13 10:38:01 2009 +0200 wined3d: Capture on a recorded stateblock doesn't record the vertexdeclaration in d3d9. --- dlls/wined3d/stateblock.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 258fea0..e574d3a 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -765,7 +765,9 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) This->IndexFmt = targetStateBlock->IndexFmt; } - if(This->changed.vertexDecl && This->vertexDecl != targetStateBlock->vertexDecl){ + if (This->changed.vertexDecl && This->vertexDecl != targetStateBlock->vertexDecl + && ((IWineD3DImpl *)This->wineD3DDevice->wineD3D)->dxVersion != 9) + { TRACE("Updating vertex declaration from %p to %p\n", This->vertexDecl, targetStateBlock->vertexDecl); if (targetStateBlock->vertexDecl) IWineD3DVertexDeclaration_AddRef(targetStateBlock->vertexDecl);

1 0

Henri Verbeet : d3d8: Add some stateblock tests for device resources.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 6bd741e3ce4e4cb8764dbce496db431900e7fb89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bd741e3ce4e4cb8764dbce49… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 13 10:38:02 2009 +0200 d3d8: Add some stateblock tests for device resources. --- dlls/d3d8/tests/stateblock.c | 319 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 316 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6bd741e3ce4e4cb8764db…

1 0

Hans Leidekker : iphlpapi: Allow both direct and indirect default routes in GetBestRoute.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: a57d86068e564c2cca63673c9a695f5290c49de6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a57d86068e564c2cca63673c9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 12 13:39:30 2009 +0200 iphlpapi: Allow both direct and indirect default routes in GetBestRoute. --- dlls/iphlpapi/iphlpapi_main.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 522d1d5..011e21a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -869,9 +869,7 @@ DWORD WINAPI GetBestRoute(DWORD dwDestAddr, DWORD dwSourceAddr, PMIB_IPFORWARDRO matchedBits = numShifts; matchedNdx = ndx; } - else if (!matchedBits && table->table[ndx].dwForwardType == - MIB_IPROUTE_TYPE_INDIRECT) { - /* default to a default gateway */ + else if (!matchedBits) { matchedNdx = ndx; } }

1 0