September 2012 - Wine-Commits

Jacek Caban : mshtml: Added more events tests.
by Alexandre Julliard Sept. 13, 2012

Sept. 13, 2012

Module: wine Branch: master Commit: fae1fff830f4ba4fda0d400ce59ad58382f8cc3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fae1fff830f4ba4fda0d400ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 13 12:29:05 2012 +0200 mshtml: Added more events tests. --- dlls/mshtml/tests/events.html | 52 +++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/rsrc.rc | 3 ++ dlls/mshtml/tests/script.c | 1 + 3 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html new file mode 100644 index 0000000..fbac741 --- /dev/null +++ b/dlls/mshtml/tests/events.html @@ -0,0 +1,52 @@ +<html> +<head> +<script> +function ok(b,m) { + return external.ok(b, m); +} + +function ondataavailable_test() { + var evobj, div, b = false; + + div = document.getElementById("divid"); + + function ondataavailableHandler() { + b = true; + ok(window.event === evobj, "window.event != evobj"); + + ok(evobj.srcElement === div, "evobj.srcElement = " + evobj.srcElement); + ok(evobj.fromElement === null, "evobj.srcElement = " + evobj.fromElement); + ok(evobj.toElement === null, "evobj.srcElement = " + evobj.toElement); + ok(evobj.type === "dataavailable", "evobj.type = " + evobj.type); + } + + div.attachEvent("ondataavailable", ondataavailableHandler); + + evobj = document.createEventObject(); + ok(evobj.srcElement === null, "evobj.srcElement = " + evobj.srcElement); + ok(evobj.fromElement === null, "evobj.srcElement = " + evobj.fromElement); + ok(evobj.toElement === null, "evobj.srcElement = " + evobj.toElement); + ok(evobj.type === "", "evobj.type = " + evobj.type); + + div.fireEvent("ondataavailable", evobj); + ok(b, "ondataavailable handler not called?"); + + ok(evobj.srcElement === div, "evobj.srcElement = " + evobj.srcElement); + ok(evobj.type === "dataavailable", "evobj.type = " + evobj.type); +} + +function runTests() { + try { + ondataavailable_test(); + }catch(e) { + ok(false, "Got an exception: " + e.message); + } + + external.reportSuccess(); +} +</script> +</head> +<body onload="runTests()"> +<div id="divid"></div> +</body> +</html> diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index fb74c45..52b4534 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -24,3 +24,6 @@ jstest.html HTML "jstest.html" /* @makedep: vbtest.html */ vbtest.html HTML "vbtest.html" + +/* @makedep: events.html */ +events.html HTML "events.html" diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index b5bd91b..59d03dd 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2745,6 +2745,7 @@ static void run_js_tests(void) run_js_script("jstest.html"); run_js_script("exectest.html"); run_js_script("vbtest.html"); + run_js_script("events.html"); } static BOOL init_registry(BOOL init)

1 0

Henri Verbeet : server: Only remove WM_INPUT messages from the queue if PM_REMOVE is set.
by Alexandre Julliard Sept. 13, 2012

Sept. 13, 2012

Module: wine Branch: master Commit: 54efd8a430e52d6fd8977d169bfc01df0385f845 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54efd8a430e52d6fd8977d169… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 13 09:18:17 2012 +0200 server: Only remove WM_INPUT messages from the queue if PM_REMOVE is set. --- server/queue.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/server/queue.c b/server/queue.c index f290c0b..7aa9b14 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1888,7 +1888,8 @@ static int check_hw_message_filter( user_handle_t win, unsigned int msg_code, /* find a hardware message for the given queue */ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user_handle_t filter_win, - unsigned int first, unsigned int last, struct get_message_reply *reply ) + unsigned int first, unsigned int last, unsigned int flags, + struct get_message_reply *reply ) { struct thread_input *input = thread->queue->input; struct thread *win_thread; @@ -1968,7 +1969,8 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user data->hw_id = msg->unique_id; set_reply_data( msg->data, msg->data_size ); - if (msg->msg == WM_INPUT) release_hardware_message( current->queue, data->hw_id, 1, 0 ); + if (msg->msg == WM_INPUT && (flags & PM_REMOVE)) + release_hardware_message( current->queue, data->hw_id, 1, 0 ); return 1; } /* nothing found, clear the hardware queue bits */ @@ -2405,7 +2407,7 @@ DECL_HANDLER(get_message) /* then check for any raw hardware message */ if ((filter & QS_INPUT) && filter_contains_hw_range( req->get_first, req->get_last ) && - get_hardware_message( current, req->hw_id, get_win, req->get_first, req->get_last, reply )) + get_hardware_message( current, req->hw_id, get_win, req->get_first, req->get_last, req->flags, reply )) return; /* now check for WM_PAINT */

1 0

Piotr Caban : msvcrt: Fixed RTTI base pointer calculation if signature==0.
by Alexandre Julliard Sept. 13, 2012

Sept. 13, 2012

Module: wine Branch: master Commit: f4e323baa47ca43bdc0d05406346536b29dca940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e323baa47ca43bdc0d05406… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 13 13:29:29 2012 +0200 msvcrt: Fixed RTTI base pointer calculation if signature==0. --- dlls/msvcrt/cpp.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index f8e0387..8a8af42 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -87,7 +87,7 @@ static void dump_obj_locator( const rtti_object_locator *ptr ) static void dump_obj_locator( const rtti_object_locator *ptr ) { int i; - char *base = ptr->signature == 0 ? (char*)GetModuleHandleW(NULL) : (char*)ptr - ptr->object_locator; + char *base = ptr->signature == 0 ? (char*)RtlPcToFileHeader((void*)ptr, (void**)&base) : (char*)ptr - ptr->object_locator; const rtti_object_hierarchy *h = (const rtti_object_hierarchy*)(base + ptr->type_hierarchy); const type_info *type_descriptor = (const type_info*)(base + ptr->type_descriptor); @@ -887,7 +887,7 @@ const type_info* CDECL MSVCRT___RTtypeid(void *cppobj) char *base; if(obj_locator->signature == 0) - base = (char*)GetModuleHandleW(NULL); + base = (char*)RtlPcToFileHeader((void*)obj_locator, (void**)&base); else base = (char*)obj_locator - obj_locator->object_locator; @@ -1015,7 +1015,7 @@ void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown, if (TRACE_ON(msvcrt)) dump_obj_locator(obj_locator); if(obj_locator->signature == 0) - base = (char*)GetModuleHandleW(NULL); + base = (char*)RtlPcToFileHeader((void*)obj_locator, (void**)&base); else base = (char*)obj_locator - obj_locator->object_locator;

1 0

Jacek Caban : mshtml: Added IHTMLDocument4:: createEventObject implementation.
by Alexandre Julliard Sept. 13, 2012

Sept. 13, 2012

Module: wine Branch: master Commit: fffb717b1be3049425ce34adb6ee746ff384bfa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fffb717b1be3049425ce34adb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 13 12:27:56 2012 +0200 mshtml: Added IHTMLDocument4::createEventObject implementation. --- dlls/mshtml/htmldoc3.c | 11 +++++++++-- dlls/mshtml/htmlevent.c | 29 ++++++++++++++++++++++++++--- dlls/mshtml/htmlevent.h | 1 + 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index 5241325..6256450 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -762,8 +762,15 @@ static HRESULT WINAPI HTMLDocument4_createEventObject(IHTMLDocument4 *iface, VARIANT *pvarEventObject, IHTMLEventObj **ppEventObj) { HTMLDocument *This = impl_from_IHTMLDocument4(iface); - FIXME("(%p)->(%p %p)\n", This, pvarEventObject, ppEventObj); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(pvarEventObject), ppEventObj); + + if(pvarEventObject && V_VT(pvarEventObject) != VT_ERROR && V_VT(pvarEventObject) != VT_EMPTY) { + FIXME("unsupported pvarEventObject %s\n", debugstr_variant(pvarEventObject)); + return E_NOTIMPL; + } + + return create_event_obj(ppEventObj); } static HRESULT WINAPI HTMLDocument4_fireEvent(IHTMLDocument4 *iface, BSTR bstrEventName, diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 333a26e..eecff1c 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -364,6 +364,11 @@ static HRESULT WINAPI HTMLEventObj_get_srcElement(IHTMLEventObj *iface, IHTMLEle TRACE("(%p)->(%p)\n", This, p); + if(!This->target) { + *p = NULL; + return S_OK; + } + return IHTMLDOMNode_QueryInterface(&This->target->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)p); } @@ -581,6 +586,11 @@ static HRESULT WINAPI HTMLEventObj_get_type(IHTMLEventObj *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); + if(!This->type) { + *p = NULL; + return S_OK; + } + *p = SysAllocString(This->type->name); return *p ? S_OK : E_OUTOFMEMORY; } @@ -800,12 +810,12 @@ static HTMLEventObj *create_event(HTMLDOMNode *target, eventid_t eid, nsIDOMEven ret->IHTMLEventObj_iface.lpVtbl = &HTMLEventObjVtbl; ret->ref = 1; - ret->type = event_info+eid; + ret->type = eid != EVENTID_LAST ? event_info+eid : NULL; ret->nsevent = nsevent; if(nsevent) { nsIDOMEvent_AddRef(nsevent); - }else if(event_types[event_info[eid].type]) { + }else if(eid != EVENTID_LAST && event_types[event_info[eid].type]) { nsAString type_str; nsresult nsres; @@ -820,13 +830,26 @@ static HTMLEventObj *create_event(HTMLDOMNode *target, eventid_t eid, nsIDOMEven } ret->target = target; - IHTMLDOMNode_AddRef(&target->IHTMLDOMNode_iface); + if(target) + IHTMLDOMNode_AddRef(&target->IHTMLDOMNode_iface); init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLEventObj_iface, &HTMLEventObj_dispex); return ret; } +HRESULT create_event_obj(IHTMLEventObj **ret) +{ + HTMLEventObj *event; + + event = create_event(NULL, EVENTID_LAST, NULL); + if(!event) + return E_OUTOFMEMORY; + + *ret = &event->IHTMLEventObj_iface; + return S_OK; +} + static HRESULT call_disp_func(IDispatch *disp, DISPPARAMS *dp, VARIANT *retv) { IDispatchEx *dispex; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index f781e5c..2917dee 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -60,6 +60,7 @@ HRESULT call_fire_event(HTMLDOMNode*,eventid_t) DECLSPEC_HIDDEN; void update_cp_events(HTMLInnerWindow*,event_target_t**,cp_static_data_t*,nsIDOMNode*) DECLSPEC_HIDDEN; HRESULT doc_init_events(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_events(HTMLDocumentNode *doc) DECLSPEC_HIDDEN; +HRESULT create_event_obj(IHTMLEventObj**) DECLSPEC_HIDDEN; void init_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; void release_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Added HTMLElement::ondataavailable implementation.
by Alexandre Julliard Sept. 13, 2012

Sept. 13, 2012

Module: wine Branch: master Commit: 74453fb0fd685c2cb288ab601050a675b3714765 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74453fb0fd685c2cb288ab601… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 13 12:27:43 2012 +0200 mshtml: Added HTMLElement::ondataavailable implementation. --- dlls/mshtml/htmlelem.c | 12 ++++++++---- dlls/mshtml/htmlevent.c | 5 +++++ dlls/mshtml/htmlevent.h | 1 + 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index e44f97d..a12b8de 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1358,15 +1358,19 @@ static HRESULT WINAPI HTMLElement_get_ondatasetchanged(IHTMLElement *iface, VARI static HRESULT WINAPI HTMLElement_put_ondataavailable(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + FIXME("(%p)->(%s) semi-stub\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_DATAAVAILABLE, &v); } static HRESULT WINAPI HTMLElement_get_ondataavailable(IHTMLElement *iface, VARIANT *p) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_DATAAVAILABLE, p); } static HRESULT WINAPI HTMLElement_put_ondatasetcomplete(IHTMLElement *iface, VARIANT v) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index f9f21df..333a26e 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -59,6 +59,9 @@ static const WCHAR onclickW[] = {'o','n','c','l','i','c','k',0}; static const WCHAR contextmenuW[] = {'c','o','n','t','e','x','t','m','e','n','u',0}; static const WCHAR oncontextmenuW[] = {'o','n','c','o','n','t','e','x','t','m','e','n','u',0}; +static const WCHAR dataavailableW[] = {'d','a','t','a','a','v','a','i','l','a','b','l','e',0}; +static const WCHAR ondataavailableW[] = {'o','n','d','a','t','a','a','v','a','i','l','a','b','l','e',0}; + static const WCHAR dblclickW[] = {'d','b','l','c','l','i','c','k',0}; static const WCHAR ondblclickW[] = {'o','n','d','b','l','c','l','i','c','k',0}; @@ -166,6 +169,8 @@ static const event_info_t event_info[] = { EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE|EVENT_HASDEFAULTHANDLERS}, {contextmenuW, oncontextmenuW, EVENTT_MOUSE, DISPID_EVMETH_ONCONTEXTMENU, EVENT_BUBBLE|EVENT_CANCELABLE}, + {dataavailableW, ondataavailableW, EVENTT_NONE, DISPID_EVMETH_ONDATAAVAILABLE, + EVENT_BUBBLE}, {dblclickW, ondblclickW, EVENTT_MOUSE, DISPID_EVMETH_ONDBLCLICK, EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE}, {dragW, ondragW, EVENTT_MOUSE, DISPID_EVMETH_ONDRAG, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 983d128..f781e5c 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -22,6 +22,7 @@ typedef enum { EVENTID_CHANGE, EVENTID_CLICK, EVENTID_CONTEXTMENU, + EVENTID_DATAAVAILABLE, EVENTID_DBLCLICK, EVENTID_DRAG, EVENTID_DRAGSTART,

1 0

Alexandre Julliard : user32: Don' t send messages on position changes in UpdateLayeredWindow.
by Alexandre Julliard Sept. 13, 2012

Sept. 13, 2012

Module: wine Branch: master Commit: 9f29dcdc2e39368870873eee62e5c8da95096734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f29dcdc2e39368870873eee6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 13:50:15 2012 +0200 user32: Don't send messages on position changes in UpdateLayeredWindow. --- dlls/user32/win.c | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 2a0848e..95c5c4e 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3594,23 +3594,38 @@ BOOL WINAPI UpdateLayeredWindowIndirect( HWND hwnd, const UPDATELAYEREDWINDOWINF if (!(info->dwFlags & ULW_EX_NORESIZE) && (info->pptDst || info->psize)) { - int x = 0, y = 0, cx = 0, cy = 0; - DWORD flags = SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW | SWP_NOSENDCHANGING; + DWORD flags = SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE; + RECT window_rect, client_rect; + SIZE offset; + + WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); if (info->pptDst) { - x = info->pptDst->x; - y = info->pptDst->y; + offset.cx = info->pptDst->x - window_rect.left; + offset.cy = info->pptDst->y - window_rect.top; + OffsetRect( &client_rect, offset.cx, offset.cy ); + OffsetRect( &window_rect, offset.cx, offset.cy ); flags &= ~SWP_NOMOVE; } if (info->psize) { - cx = info->psize->cx; - cy = info->psize->cy; + if (info->psize->cx <= 0 || info->psize->cy <= 0) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + offset.cx = info->psize->cx - (window_rect.right - window_rect.left); + offset.cy = info->psize->cy - (window_rect.bottom - window_rect.top); + client_rect.right += offset.cx; + client_rect.bottom += offset.cy; + window_rect.right += offset.cx; + window_rect.bottom += offset.cy; flags &= ~SWP_NOSIZE; } - TRACE( "moving window %p pos %d,%d %dx%d\n", hwnd, x, y, cx, cy ); - SetWindowPos( hwnd, 0, x, y, cx, cy, flags ); + TRACE( "moving window %p win %s client %s\n", hwnd, + wine_dbgstr_rect(&window_rect), wine_dbgstr_rect(&client_rect) ); + set_window_pos( hwnd, 0, flags, &window_rect, &client_rect, NULL ); } if (info->hdcSrc)

1 0

Alexandre Julliard : user32: Refresh the frame when the style bits of a layered window are changed.
by Alexandre Julliard Sept. 13, 2012

Sept. 13, 2012

Module: wine Branch: master Commit: b0fce2a02b5b3b5dda61b6fe1a653b2fe994de0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0fce2a02b5b3b5dda61b6fe1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 13:50:34 2012 +0200 user32: Refresh the frame when the style bits of a layered window are changed. --- dlls/user32/defwnd.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 0ac308c..af566bf 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -719,6 +719,16 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa SendMessageW( GetParent(hwnd), msg, wParam, lParam ); break; + case WM_STYLECHANGED: + if (wParam == GWL_STYLE && (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED)) + { + STYLESTRUCT *style = (STYLESTRUCT *)lParam; + if ((style->styleOld ^ style->styleNew) & (WS_CAPTION|WS_THICKFRAME|WS_VSCROLL|WS_HSCROLL)) + SetWindowPos( hwnd, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOZORDER | + SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE ); + } + break; + case WM_APPCOMMAND: { HWND parent = GetParent(hwnd);

1 0

Alexandre Julliard : winex11: Don' t use a window surface for embedded windows.
by Alexandre Julliard Sept. 13, 2012

Sept. 13, 2012

Module: wine Branch: master Commit: 0682355af23f2f7c6939f491ccd48c8cb1aeb2d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0682355af23f2f7c6939f491c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 10:31:52 2012 +0200 winex11: Don't use a window surface for embedded windows. --- dlls/winex11.drv/window.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 00c86b9..3f94758 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1992,6 +1992,7 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag /* create the window surface if necessary */ if (!data->whole_window) return; + if (data->embedded) return; if (swp_flags & SWP_HIDEWINDOW) return; if (data->whole_window == root_window) return; if (has_gl_drawable( hwnd )) return;

1 0

Henri Verbeet : d3d10core/tests: Add a small test for ID3D10Device_CreateDepthStencilView().
by Alexandre Julliard Sept. 13, 2012

Sept. 13, 2012

Module: wine Branch: master Commit: 9235336894bc05f119a7738bf42789894bb0a31d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9235336894bc05f119a7738bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 13 09:18:15 2012 +0200 d3d10core/tests: Add a small test for ID3D10Device_CreateDepthStencilView(). --- dlls/d3d10core/tests/device.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index e9ade68..6b40d73 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -202,6 +202,42 @@ static void test_create_texture3d(ID3D10Device *device) ID3D10Texture3D_Release(texture); } +static void test_create_depthstencil_view(ID3D10Device *device) +{ + D3D10_DEPTH_STENCIL_VIEW_DESC dsv_desc; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10DepthStencilView *dsview; + ID3D10Texture2D *texture; + HRESULT hr; + + texture_desc.Width = 512; + texture_desc.Height = 512; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_DEPTH_STENCIL; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr); + + hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, NULL, &dsview); + ok(SUCCEEDED(hr), "Failed to create a depthstencil view, hr %#x\n", hr); + + ID3D10DepthStencilView_GetDesc(dsview, &dsv_desc); + ok(dsv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", dsv_desc.Format); + ok(dsv_desc.ViewDimension == D3D10_DSV_DIMENSION_TEXTURE2D, + "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); + ok(U(dsv_desc).Texture2D.MipSlice == 0, "Got Unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); + + ID3D10DepthStencilView_Release(dsview); + ID3D10Texture2D_Release(texture); +} + static void test_create_rendertarget_view(ID3D10Device *device) { D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; @@ -409,6 +445,7 @@ START_TEST(device) test_device_interfaces(device); test_create_texture2d(device); test_create_texture3d(device); + test_create_depthstencil_view(device); test_create_rendertarget_view(device); test_create_shader(device);

1 0

Henri Verbeet : d3d10core: Implement d3d10_depthstencil_view_GetDesc().
by Alexandre Julliard Sept. 13, 2012

Sept. 13, 2012

Module: wine Branch: master Commit: 05d1fbb392c71b4fd81c30d58961a49f9242119c URL: http://source.winehq.org/git/wine.git/?a=commit;h=05d1fbb392c71b4fd81c30d58… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 13 09:18:14 2012 +0200 d3d10core: Implement d3d10_depthstencil_view_GetDesc(). --- dlls/d3d10core/d3d10core_private.h | 3 +- dlls/d3d10core/device.c | 2 +- dlls/d3d10core/view.c | 115 +++++++++++++++++++++++++++++++++++- 3 files changed, 116 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index f45fd34..25fda7c 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -129,11 +129,12 @@ struct d3d10_depthstencil_view ID3D10DepthStencilView ID3D10DepthStencilView_iface; LONG refcount; + D3D10_DEPTH_STENCIL_VIEW_DESC desc; ID3D10Resource *resource; }; HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, - ID3D10Resource *resource) DECLSPEC_HIDDEN; + ID3D10Resource *resource, const D3D10_DEPTH_STENCIL_VIEW_DESC *desc) DECLSPEC_HIDDEN; /* ID3D10RenderTargetView */ struct d3d10_rendertarget_view diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index d184c02..e6c26c2 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -803,7 +803,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilView(ID3D10Devic return E_OUTOFMEMORY; } - if (FAILED(hr = d3d10_depthstencil_view_init(object, resource))) + if (FAILED(hr = d3d10_depthstencil_view_init(object, resource, desc))) { WARN("Failed to initialize depthstencil view, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 9bf4fcb..40712fc 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -45,6 +45,101 @@ static struct wined3d_resource *wined3d_resource_from_resource(ID3D10Resource *r } } +static HRESULT set_dsdesc_from_resource(D3D10_DEPTH_STENCIL_VIEW_DESC *desc, ID3D10Resource *resource) +{ + D3D10_RESOURCE_DIMENSION dimension; + HRESULT hr; + + ID3D10Resource_GetType(resource, &dimension); + + switch (dimension) + { + case D3D10_RESOURCE_DIMENSION_TEXTURE1D: + { + D3D10_TEXTURE1D_DESC texture_desc; + ID3D10Texture1D *texture; + + if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture1D, (void **)&texture))) + { + ERR("Resource of type TEXTURE1D doesn't implement ID3D10Texture1D.\n"); + return E_INVALIDARG; + } + + ID3D10Texture1D_GetDesc(texture, &texture_desc); + ID3D10Texture1D_Release(texture); + + desc->Format = texture_desc.Format; + if (texture_desc.ArraySize == 1) + { + desc->ViewDimension = D3D10_DSV_DIMENSION_TEXTURE1D; + desc->u.Texture1D.MipSlice = 0; + } + else + { + desc->ViewDimension = D3D10_DSV_DIMENSION_TEXTURE1DARRAY; + desc->u.Texture1DArray.MipSlice = 0; + desc->u.Texture1DArray.FirstArraySlice = 0; + desc->u.Texture1DArray.ArraySize = 1; + } + + return S_OK; + } + + case D3D10_RESOURCE_DIMENSION_TEXTURE2D: + { + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10Texture2D *texture; + + if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture2D, (void **)&texture))) + { + ERR("Resource of type TEXTURE2D doesn't implement ID3D10Texture2D.\n"); + return E_INVALIDARG; + } + + ID3D10Texture2D_GetDesc(texture, &texture_desc); + ID3D10Texture2D_Release(texture); + + desc->Format = texture_desc.Format; + if (texture_desc.ArraySize == 1) + { + if (texture_desc.SampleDesc.Count == 1) + { + desc->ViewDimension = D3D10_DSV_DIMENSION_TEXTURE2D; + desc->u.Texture2D.MipSlice = 0; + } + else + { + desc->ViewDimension = D3D10_DSV_DIMENSION_TEXTURE2DMS; + } + } + else + { + if (texture_desc.SampleDesc.Count == 1) + { + desc->ViewDimension = D3D10_DSV_DIMENSION_TEXTURE2DARRAY; + desc->u.Texture2DArray.MipSlice = 0; + desc->u.Texture2DArray.FirstArraySlice = 0; + desc->u.Texture2DArray.ArraySize = 1; + } + else + { + desc->ViewDimension = D3D10_DSV_DIMENSION_TEXTURE2DMSARRAY; + desc->u.Texture2DMSArray.FirstArraySlice = 0; + desc->u.Texture2DMSArray.ArraySize = 1; + } + } + + return S_OK; + } + + default: + FIXME("Unhandled resource dimension %#x.\n", dimension); + case D3D10_RESOURCE_DIMENSION_BUFFER: + case D3D10_RESOURCE_DIMENSION_TEXTURE3D: + return E_INVALIDARG; + } +} + static HRESULT set_rtdesc_from_resource(D3D10_RENDER_TARGET_VIEW_DESC *desc, ID3D10Resource *resource) { D3D10_RESOURCE_DIMENSION dimension; @@ -269,7 +364,11 @@ static void STDMETHODCALLTYPE d3d10_depthstencil_view_GetResource(ID3D10DepthSte static void STDMETHODCALLTYPE d3d10_depthstencil_view_GetDesc(ID3D10DepthStencilView *iface, D3D10_DEPTH_STENCIL_VIEW_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d10_depthstencil_view *view = impl_from_ID3D10DepthStencilView(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = view->desc; } static const struct ID3D10DepthStencilViewVtbl d3d10_depthstencil_view_vtbl = @@ -290,11 +389,23 @@ static const struct ID3D10DepthStencilViewVtbl d3d10_depthstencil_view_vtbl = }; HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, - ID3D10Resource *resource) + ID3D10Resource *resource, const D3D10_DEPTH_STENCIL_VIEW_DESC *desc) { + HRESULT hr; + view->ID3D10DepthStencilView_iface.lpVtbl = &d3d10_depthstencil_view_vtbl; view->refcount = 1; + if (!desc) + { + if (FAILED(hr = set_dsdesc_from_resource(&view->desc, resource))) + return hr; + } + else + { + view->desc = *desc; + } + view->resource = resource; ID3D10Resource_AddRef(resource);

1 0