wine-commits October 2017

wine-commits@winehq.org

2 participants
478 discussions

Andrey Gusev : winsta: Add WinStationUnRegisterConsoleNotification stub.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: 981dec4986e7ac1982049dbede1ca2aa72f5e70c URL: http://source.winehq.org/git/wine.git/?a=commit;h=981dec4986e7ac1982049dbed… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Oct 18 20:36:51 2017 +0300 winsta: Add WinStationUnRegisterConsoleNotification stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winsta/main.c | 7 +++++++ dlls/winsta/winsta.h | 1 + dlls/winsta/winsta.spec | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/winsta/main.c b/dlls/winsta/main.c index 59efef2..7568310 100644 --- a/dlls/winsta/main.c +++ b/dlls/winsta/main.c @@ -68,6 +68,13 @@ BOOLEAN WINAPI WinStationRegisterConsoleNotification( HANDLE server, HWND hwnd, return FALSE; } +BOOLEAN WINAPI WinStationUnRegisterConsoleNotification( HANDLE server, HWND hwnd ) +{ + FIXME( "%p %p\n", server, hwnd ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + BOOLEAN WINAPI WinStationGetAllProcesses( HANDLE server, ULONG level, ULONG *process_count, PTS_ALL_PROCESSES_INFO *info ) { diff --git a/dlls/winsta/winsta.h b/dlls/winsta/winsta.h index a97f4c4..d908aa8 100644 --- a/dlls/winsta/winsta.h +++ b/dlls/winsta/winsta.h @@ -94,5 +94,6 @@ BOOLEAN WINAPI WinStationGetAllProcesses(HANDLE,ULONG,PULONG,PTS_ALL_PROCESSES_I BOOLEAN WINAPI WinStationGetProcessSid(HANDLE,ULONG,FILETIME *,PVOID,PULONG); BOOLEAN WINAPI WinStationQueryInformationW(HANDLE,ULONG,WINSTATIONINFOCLASS,PVOID,ULONG,PULONG); BOOLEAN WINAPI WinStationRegisterConsoleNotification(HANDLE,HWND,ULONG); +BOOLEAN WINAPI WinStationUnRegisterConsoleNotification(HANDLE,HWND); #endif /* _WINSTA_H */ diff --git a/dlls/winsta/winsta.spec b/dlls/winsta/winsta.spec index 20db0ca..1f38a23 100644 --- a/dlls/winsta/winsta.spec +++ b/dlls/winsta/winsta.spec @@ -69,7 +69,7 @@ @ stub WinStationShadowStop @ stub WinStationShutdownSystem @ stub WinStationTerminateProcess -@ stub WinStationUnRegisterConsoleNotification +@ stdcall WinStationUnRegisterConsoleNotification(ptr ptr) @ stdcall WinStationVirtualOpen(ptr ptr ptr) @ stub WinStationWaitSystemEvent @ stub _NWLogonQueryAdmin

1 0

Sergio Gómez Del Real : uxtheme: Add a stub for IsCompositionActive().
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: 731136d8d32b36cf088a2c7182ca08d28e0e75a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=731136d8d32b36cf088a2c718… Author: Sergio Gómez Del Real <sergio.g.delreal(a)gmail.com> Date: Wed Oct 18 08:40:10 2017 -0500 uxtheme: Add a stub for IsCompositionActive(). Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/system.c | 12 ++++++++++++ dlls/uxtheme/uxtheme.spec | 1 + include/uxtheme.h | 1 + 3 files changed, 14 insertions(+) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 625be24..08996e1 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -562,6 +562,18 @@ BOOL WINAPI IsThemeActive(void) return bThemeActive; } +/************************************************************ +* IsCompositionActive (UXTHEME.@) +*/ +BOOL WINAPI IsCompositionActive(void) +{ + FIXME(": stub\n"); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + + return FALSE; +} + /*********************************************************************** * EnableTheming (UXTHEME.@) * diff --git a/dlls/uxtheme/uxtheme.spec b/dlls/uxtheme/uxtheme.spec index 7d2a7d7..5b68fde 100644 --- a/dlls/uxtheme/uxtheme.spec +++ b/dlls/uxtheme/uxtheme.spec @@ -100,6 +100,7 @@ @ stdcall GetWindowTheme(ptr) @ stdcall HitTestThemeBackground(ptr long long long long ptr long int64 ptr) @ stdcall IsAppThemed() +@ stdcall IsCompositionActive() @ stdcall IsThemeActive() @ stdcall IsThemeBackgroundPartiallyTransparent(ptr long long) @ stdcall IsThemeDialogTextureEnabled(ptr) diff --git a/include/uxtheme.h b/include/uxtheme.h index 7606306..374b530 100644 --- a/include/uxtheme.h +++ b/include/uxtheme.h @@ -209,6 +209,7 @@ HTHEME WINAPI GetWindowTheme(HWND); HRESULT WINAPI HitTestThemeBackground(HTHEME,HDC,int,int,DWORD,const RECT*, HRGN,POINT,WORD*); BOOL WINAPI IsAppThemed(void); +BOOL WINAPI IsCompositionActive(void); BOOL WINAPI IsThemeActive(void); BOOL WINAPI IsThemeBackgroundPartiallyTransparent(HTHEME,int,int); BOOL WINAPI IsThemeDialogTextureEnabled(HWND);

1 0

Jacek Caban : mshtml: Update event_info array.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: 5a9f5470ef2f72f3336aad2bf8988a5067c0cf4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a9f5470ef2f72f3336aad2bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 18 16:40:31 2017 +0200 mshtml: Update event_info array. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 159 +++++++++++++++++++++++++----------------------- 1 file changed, 84 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a9f5470ef2f72f3336aa…

1 0

Jacek Caban : mshtml: Store event target as EventTarget in HTMLEventObj.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: 969583850e4b11e17b526a20f8d2ffb5e41e1779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=969583850e4b11e17b526a20f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 18 16:40:20 2017 +0200 mshtml: Store event target as EventTarget in HTMLEventObj. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index dedd311..30fdf3b 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -220,7 +220,7 @@ struct HTMLEventObj { LONG ref; - HTMLDOMNode *target; + EventTarget *target; const event_info_t *type; nsIDOMEvent *nsevent; VARIANT return_value; @@ -274,7 +274,7 @@ static ULONG WINAPI HTMLEventObj_Release(IHTMLEventObj *iface) if(!ref) { if(This->target) - IHTMLDOMNode_Release(&This->target->IHTMLDOMNode_iface); + IDispatchEx_Release(&This->target->dispex.IDispatchEx_iface); if(This->nsevent) nsIDOMEvent_Release(This->nsevent); release_dispex(&This->dispex); @@ -323,7 +323,7 @@ static HRESULT WINAPI HTMLEventObj_get_srcElement(IHTMLEventObj *iface, IHTMLEle *p = NULL; if(This->target) - IHTMLDOMNode_QueryInterface(&This->target->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)p); + IDispatchEx_QueryInterface(&This->target->dispex.IDispatchEx_iface, &IID_IHTMLElement, (void**)p); return S_OK; } @@ -803,7 +803,7 @@ static HTMLEventObj *create_event(void) return ret; } -static HRESULT set_event_info(HTMLEventObj *event, HTMLDOMNode *target, eventid_t eid, nsIDOMEvent *nsevent) +static HRESULT set_event_info(HTMLEventObj *event, EventTarget *target, eventid_t eid, HTMLDocumentNode *doc, nsIDOMEvent *nsevent) { event->type = event_info+eid; event->nsevent = nsevent; @@ -815,7 +815,7 @@ static HRESULT set_event_info(HTMLEventObj *event, HTMLDOMNode *target, eventid_ nsresult nsres; nsAString_InitDepend(&type_str, event_types[event_info[eid].type]); - nsres = nsIDOMHTMLDocument_CreateEvent(target->doc->nsdoc, &type_str, &event->nsevent); + nsres = nsIDOMHTMLDocument_CreateEvent(doc->nsdoc, &type_str, &event->nsevent); nsAString_Finish(&type_str); if(NS_FAILED(nsres)) { ERR("Could not create event: %08x\n", nsres); @@ -825,7 +825,7 @@ static HRESULT set_event_info(HTMLEventObj *event, HTMLDOMNode *target, eventid_ event->target = target; if(target) - IHTMLDOMNode_AddRef(&target->IHTMLDOMNode_iface); + IDispatchEx_AddRef(&target->dispex.IDispatchEx_iface); return S_OK; } @@ -1175,7 +1175,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, HTMLDOMNod if(!event_obj) return; - hres = set_event_info(event_obj, target, eid, nsevent); + hres = set_event_info(event_obj, &target->event_target, eid, doc, nsevent); if(FAILED(hres)) { IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); return; @@ -1225,7 +1225,7 @@ HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *even } if(event_obj) { - hres = set_event_info(event_obj, node, eid, NULL); + hres = set_event_info(event_obj, &node->event_target, eid, node->doc, NULL); if(SUCCEEDED(hres)) fire_event_obj(node->doc, eid, event_obj, node);

1 0

Jacek Caban : mshtml: Call default event handles through event target vtbl.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: ec5d0d44baa122b451a823f28c2b21cb34f2e462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec5d0d44baa122b451a823f28… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 18 16:40:02 2017 +0200 mshtml: Call default event handles through event target vtbl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 1 + dlls/mshtml/htmlelem.c | 10 ++++++++++ dlls/mshtml/htmlevent.c | 5 +++-- dlls/mshtml/htmlevent.h | 1 + 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 540ede0..3ce044d 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5048,6 +5048,7 @@ static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { NULL }, HTMLDocumentNode_bind_event, + NULL, HTMLDocumentNode_get_cp_container }; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 7a2c4fc..28f885f 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5347,6 +5347,15 @@ static void HTMLElement_bind_event(DispatchEx *dispex, eventid_t eid) } } +static HRESULT HTMLElement_handle_event_default(DispatchEx *dispex, eventid_t eid, nsIDOMEvent *nsevent, BOOL *prevent_default) +{ + HTMLElement *This = impl_from_DispatchEx(dispex); + + if(!This->node.vtbl->handle_event) + return S_OK; + return This->node.vtbl->handle_event(&This->node, eid, nsevent, prevent_default); +} + static ConnectionPointContainer *HTMLElement_get_cp_container(DispatchEx *dispex) { HTMLElement *This = impl_from_DispatchEx(dispex); @@ -5385,6 +5394,7 @@ static event_target_vtbl_t HTMLElement_event_target_vtbl = { HTMLElement_populate_props }, HTMLElement_bind_event, + HTMLElement_handle_event_default, HTMLElement_get_cp_container }; diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 4e25bf3..dedd311 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1137,8 +1137,9 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e break; if(node) { - if(node->vtbl->handle_event) - hres = node->vtbl->handle_event(node, eid, event_obj ? event_obj->nsevent : NULL, &prevent_default); + const event_target_vtbl_t *vtbl = dispex_get_vtbl(&node->event_target.dispex); + if(vtbl && vtbl->handle_event_default) + hres = vtbl->handle_event_default(&node->event_target.dispex, eid, event_obj ? event_obj->nsevent : NULL, &prevent_default); node_release(node); if(FAILED(hres) || prevent_default || (event_obj && event_obj->cancel_bubble)) break; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index ebb8e4c..e4128f2 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -83,6 +83,7 @@ void detach_nsevent(HTMLDocumentNode*,const WCHAR*) DECLSPEC_HIDDEN; typedef struct { dispex_static_data_vtbl_t dispex_vtbl; void (*bind_event)(DispatchEx*,eventid_t); + HRESULT (*handle_event_default)(DispatchEx*,eventid_t,nsIDOMEvent*,BOOL*); ConnectionPointContainer *(*get_cp_container)(DispatchEx*); } event_target_vtbl_t;

1 0

Jacek Caban : mshtml: Always use event target as script this in call_event_handlers.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: 62c7dd0576dc0c0cd8f0f667922be6d1df928b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62c7dd0576dc0c0cd8f0f6679… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 18 16:39:40 2017 +0200 mshtml: Always use event target as script this in call_event_handlers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlevent.c | 24 ++++++++++-------------- dlls/mshtml/htmlevent.h | 4 ++-- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsevents.c | 10 +++++----- dlls/mshtml/persist.c | 4 ++-- dlls/mshtml/script.c | 4 ++-- dlls/mshtml/xmlhttprequest.c | 3 +-- 9 files changed, 25 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=62c7dd0576dc0c0cd8f0f…

1 0

Jacek Caban : mshtml: Use vtbl to get ConnectionPointContainer from event target.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: 0c35bf7c8e76314c2366f2b597e4cc8a45b41c50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c35bf7c8e76314c2366f2b59… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 18 16:39:22 2017 +0200 mshtml: Use vtbl to get ConnectionPointContainer from event target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 14 ++++++-- dlls/mshtml/htmlelem.c | 11 ++++-- dlls/mshtml/htmlevent.c | 82 +++++++++++++++++++++----------------------- dlls/mshtml/htmlevent.h | 3 +- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/xmlhttprequest.c | 2 +- 6 files changed, 62 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c35bf7c8e76314c2366f…

1 0

Jacek Caban : mshtml: Use separated struct for event target vtbl.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: e5c0759c0cad6739a485f439fe77f972844cb34d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5c0759c0cad6739a485f439f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 18 16:38:51 2017 +0200 mshtml: Use separated struct for event target vtbl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 2 +- dlls/mshtml/htmldoc.c | 18 ++++++++++-------- dlls/mshtml/htmlelem.c | 22 ++++++++++++---------- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlevent.h | 6 ++++++ dlls/mshtml/htmlwindow.c | 20 +++++++++++--------- dlls/mshtml/mshtml_private.h | 4 +--- dlls/mshtml/xmlhttprequest.c | 12 ++++-------- 8 files changed, 46 insertions(+), 40 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index de478f3..f434545 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1767,7 +1767,7 @@ void dispex_unlink(DispatchEx *This) } } -const dispex_static_data_vtbl_t *dispex_get_vtbl(DispatchEx *dispex) +const void *dispex_get_vtbl(DispatchEx *dispex) { return dispex->info->desc->vtbl; } diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index c6bc7ac..fc2d676 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5024,18 +5024,20 @@ static compat_mode_t HTMLDocumentNode_get_compat_mode(DispatchEx *dispex) return This->document_mode; } -static void HTMLDocumentNode_bind_event(DispatchEx *dispex, int eid) +static void HTMLDocumentNode_bind_event(DispatchEx *dispex, eventid_t eid) { HTMLDocumentNode *This = impl_from_DispatchEx(dispex); ensure_doc_nsevent_handler(This, eid); } -static const dispex_static_data_vtbl_t HTMLDocumentNode_dispex_vtbl = { - NULL, - NULL, - HTMLDocumentNode_invoke, - HTMLDocumentNode_get_compat_mode, - NULL, +static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { + { + NULL, + NULL, + HTMLDocumentNode_invoke, + HTMLDocumentNode_get_compat_mode, + NULL + }, HTMLDocumentNode_bind_event }; @@ -5076,7 +5078,7 @@ static void HTMLDocumentNode_init_dispex_info(dispex_data_t *info, compat_mode_t } static dispex_static_data_t HTMLDocumentNode_dispex = { - &HTMLDocumentNode_dispex_vtbl, + &HTMLDocumentNode_event_target_vtbl.dispex_vtbl, DispHTMLDocument_tid, HTMLDocumentNode_iface_tids, HTMLDocumentNode_init_dispex_info diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 9cf143d..3cd85e6 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5332,7 +5332,7 @@ static HRESULT HTMLElement_populate_props(DispatchEx *dispex) return S_OK; } -static void HTMLElement_bind_event(DispatchEx *dispex, int eid) +static void HTMLElement_bind_event(DispatchEx *dispex, eventid_t eid) { HTMLElement *This = impl_from_DispatchEx(dispex); @@ -5343,7 +5343,7 @@ static void HTMLElement_bind_event(DispatchEx *dispex, int eid) add_nsevent_listener(This->node.doc, This->node.nsnode, loadW); return; default: - dispex_get_vtbl(&This->node.doc->node.event_target.dispex)->bind_event(&This->node.doc->node.event_target.dispex, eid); + ensure_doc_nsevent_handler(This->node.doc, eid); } } @@ -5369,17 +5369,19 @@ static const tid_t HTMLElement_iface_tids[] = { 0 }; -static dispex_static_data_vtbl_t HTMLElement_dispex_vtbl = { - NULL, - HTMLElement_get_dispid, - HTMLElement_invoke, - NULL, - HTMLElement_populate_props, +static event_target_vtbl_t HTMLElement_event_target_vtbl = { + { + NULL, + HTMLElement_get_dispid, + HTMLElement_invoke, + NULL, + HTMLElement_populate_props + }, HTMLElement_bind_event }; static dispex_static_data_t HTMLElement_dispex = { - &HTMLElement_dispex_vtbl, + &HTMLElement_event_target_vtbl.dispex_vtbl, DispHTMLUnknownElement_tid, HTMLElement_iface_tids, HTMLElement_init_dispex_info @@ -5398,7 +5400,7 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMHTMLElemen This->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl; if(dispex_data && !dispex_data->vtbl) - dispex_data->vtbl = &HTMLElement_dispex_vtbl; + dispex_data->vtbl = &HTMLElement_event_target_vtbl.dispex_vtbl; if(nselem) { HTMLDOMNode_Init(doc, &This->node, (nsIDOMNode*)nselem, dispex_data ? dispex_data : &HTMLElement_dispex); diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 1c27c13..1e72220 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -843,7 +843,7 @@ HRESULT create_event_obj(IHTMLEventObj **ret) static handler_vector_t *get_handler_vector(EventTarget *event_target, eventid_t eid, BOOL alloc) { - const dispex_static_data_vtbl_t *vtbl; + const event_target_vtbl_t *vtbl; handler_vector_t *handler_vector; struct wine_rb_entry *entry; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index eda6013..7da2f5b 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -79,6 +79,12 @@ void release_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; void add_nsevent_listener(HTMLDocumentNode*,nsIDOMNode*,LPCWSTR) DECLSPEC_HIDDEN; void detach_nsevent(HTMLDocumentNode*,const WCHAR*) DECLSPEC_HIDDEN; +/* We extend dispex vtbl for EventTarget functions to avoid separated vtbl. */ +typedef struct { + dispex_static_data_vtbl_t dispex_vtbl; + void (*bind_event)(DispatchEx*,eventid_t); +} event_target_vtbl_t; + static inline EventTarget *get_node_event_prop_target(HTMLDOMNode *node, eventid_t eid) { return node->vtbl->get_event_prop_target ? node->vtbl->get_event_prop_target(node, eid) : &node->event_target; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 13963da..2999ef0 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2995,10 +2995,10 @@ static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD return hres; } -static void HTMLWindow_bind_event(DispatchEx *dispex, int eid) +static void HTMLWindow_bind_event(DispatchEx *dispex, eventid_t eid) { HTMLInnerWindow *This = impl_from_DispatchEx(dispex); - dispex_get_vtbl(&This->doc->node.event_target.dispex)->bind_event(&This->doc->node.event_target.dispex, eid); + ensure_doc_nsevent_handler(This->doc, eid); } static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compat_mode) @@ -3006,12 +3006,14 @@ static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compa dispex_info_add_interface(info, IHTMLWindow5_tid, NULL); } -static const dispex_static_data_vtbl_t HTMLWindow_dispex_vtbl = { - NULL, - NULL, - HTMLWindow_invoke, - NULL, - NULL, +static const event_target_vtbl_t HTMLWindow_event_target_vtbl = { + { + NULL, + NULL, + HTMLWindow_invoke, + NULL, + NULL + }, HTMLWindow_bind_event }; @@ -3024,7 +3026,7 @@ static const tid_t HTMLWindow_iface_tids[] = { }; static dispex_static_data_t HTMLWindow_dispex = { - &HTMLWindow_dispex_vtbl, + &HTMLWindow_event_target_vtbl.dispex_vtbl, DispHTMLWindow2_tid, HTMLWindow_iface_tids, HTMLWindow_init_dispex_info diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ae2f6cb..93d3ff7 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -270,8 +270,6 @@ typedef struct { HRESULT (*invoke)(DispatchEx*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); compat_mode_t (*get_compat_mode)(DispatchEx*); HRESULT (*populate_props)(DispatchEx*); - /* We abuse this vtbl for EventTarget functions to avoid separated vtbl. */ - void (*bind_event)(DispatchEx*,int); } dispex_static_data_vtbl_t; typedef struct { @@ -330,7 +328,7 @@ void dispex_traverse(DispatchEx*,nsCycleCollectionTraversalCallback*) DECLSPEC_H void dispex_unlink(DispatchEx*) DECLSPEC_HIDDEN; void release_typelib(void) DECLSPEC_HIDDEN; HRESULT get_class_typeinfo(const CLSID*,ITypeInfo**) DECLSPEC_HIDDEN; -const dispex_static_data_vtbl_t *dispex_get_vtbl(DispatchEx*) DECLSPEC_HIDDEN; +const void *dispex_get_vtbl(DispatchEx*) DECLSPEC_HIDDEN; void dispex_info_add_interface(dispex_data_t*,tid_t,const DISPID*) DECLSPEC_HIDDEN; compat_mode_t dispex_compat_mode(DispatchEx*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index f868c3a..0b02a2c 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -733,7 +733,7 @@ static inline HTMLXMLHttpRequest *impl_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLXMLHttpRequest, event_target.dispex); } -static void HTMLXMLHttpRequest_bind_event(DispatchEx *dispex, int eid) +static void HTMLXMLHttpRequest_bind_event(DispatchEx *dispex, eventid_t eid) { HTMLXMLHttpRequest *This = impl_from_DispatchEx(dispex); nsIDOMEventTarget *nstarget; @@ -768,12 +768,8 @@ static void HTMLXMLHttpRequest_bind_event(DispatchEx *dispex, int eid) ERR("AddEventListener failed: %08x\n", nsres); } -static dispex_static_data_vtbl_t HTMLXMLHttpRequest_dispex_vtbl = { - NULL, - NULL, - NULL, - NULL, - NULL, +static event_target_vtbl_t HTMLXMLHttpRequest_event_target_vtbl = { + {NULL}, HTMLXMLHttpRequest_bind_event }; @@ -782,7 +778,7 @@ static const tid_t HTMLXMLHttpRequest_iface_tids[] = { 0 }; static dispex_static_data_t HTMLXMLHttpRequest_dispex = { - &HTMLXMLHttpRequest_dispex_vtbl, + &HTMLXMLHttpRequest_event_target_vtbl.dispex_vtbl, DispHTMLXMLHttpRequest_tid, HTMLXMLHttpRequest_iface_tids };

1 0

Józef Kucia : d3d11/tests: Add test for shaders interstage interface.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: 9a5e0bdb3d660f2ee2a6e5ea38ed5af3d0d4bcc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a5e0bdb3d660f2ee2a6e5ea3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 18 00:25:10 2017 +0200 d3d11/tests: Add test for shaders interstage interface. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 162 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 162 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 8df683e..163d1a2 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11970,6 +11970,167 @@ static void test_shader_stage_input_output_matching(void) release_test_context(&test_context); } +static void test_shader_interstage_interface(void) +{ + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11InputLayout *input_layout; + ID3D11Texture2D *render_target; + ID3D11DeviceContext *context; + ID3D11RenderTargetView *rtv; + ID3D11VertexShader *vs; + ID3D11PixelShader *ps; + ID3D11Device *device; + UINT stride, offset; + ID3D11Buffer *vb; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + struct vertex + { + float4 position : SV_Position; + float2 t0 : TEXCOORD0; + nointerpolation float t1 : TEXCOORD1; + uint t2 : TEXCOORD2; + uint t3 : TEXCOORD3; + float t4 : TEXCOORD4; + }; + + void main(in vertex vin, out vertex vout) + { + vout = vin; + } +#endif + 0x43425844, 0xd55780bf, 0x76866b06, 0x45d697a2, 0xafac2ecd, 0x00000001, 0x000002bc, 0x00000003, + 0x0000002c, 0x000000e4, 0x0000019c, 0x4e475349, 0x000000b0, 0x00000006, 0x00000008, 0x00000098, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x000000a4, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000303, 0x000000a4, 0x00000001, 0x00000000, 0x00000003, 0x00000002, + 0x00000101, 0x000000a4, 0x00000002, 0x00000000, 0x00000001, 0x00000003, 0x00000101, 0x000000a4, + 0x00000003, 0x00000000, 0x00000001, 0x00000004, 0x00000101, 0x000000a4, 0x00000004, 0x00000000, + 0x00000003, 0x00000005, 0x00000101, 0x505f5653, 0x7469736f, 0x006e6f69, 0x43584554, 0x44524f4f, + 0xababab00, 0x4e47534f, 0x000000b0, 0x00000006, 0x00000008, 0x00000098, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x000000a4, 0x00000000, 0x00000000, 0x00000003, 0x00000001, + 0x00000c03, 0x000000a4, 0x00000004, 0x00000000, 0x00000003, 0x00000001, 0x00000b04, 0x000000a4, + 0x00000001, 0x00000000, 0x00000003, 0x00000002, 0x00000e01, 0x000000a4, 0x00000002, 0x00000000, + 0x00000001, 0x00000002, 0x00000d02, 0x000000a4, 0x00000003, 0x00000000, 0x00000001, 0x00000002, + 0x00000b04, 0x505f5653, 0x7469736f, 0x006e6f69, 0x43584554, 0x44524f4f, 0xababab00, 0x52444853, + 0x00000118, 0x00010040, 0x00000046, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x00101032, + 0x00000001, 0x0300005f, 0x00101012, 0x00000002, 0x0300005f, 0x00101012, 0x00000003, 0x0300005f, + 0x00101012, 0x00000004, 0x0300005f, 0x00101012, 0x00000005, 0x04000067, 0x001020f2, 0x00000000, + 0x00000001, 0x03000065, 0x00102032, 0x00000001, 0x03000065, 0x00102042, 0x00000001, 0x03000065, + 0x00102012, 0x00000002, 0x03000065, 0x00102022, 0x00000002, 0x03000065, 0x00102042, 0x00000002, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x00102032, 0x00000001, + 0x00101046, 0x00000001, 0x05000036, 0x00102042, 0x00000001, 0x0010100a, 0x00000005, 0x05000036, + 0x00102012, 0x00000002, 0x0010100a, 0x00000002, 0x05000036, 0x00102022, 0x00000002, 0x0010100a, + 0x00000003, 0x05000036, 0x00102042, 0x00000002, 0x0010100a, 0x00000004, 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 + void main(float4 position : SV_Position, float2 t0 : TEXCOORD0, + nointerpolation float t1 : TEXCOORD1, uint t2 : TEXCOORD2, + uint t3 : TEXCOORD3, float t4 : TEXCOORD4, out float4 o : SV_Target) + { + o.x = t0.y + t1; + o.y = t2 + t3; + o.z = t4; + o.w = t0.x; + } +#endif + 0x43425844, 0x8a7ef706, 0xc8f2cbf1, 0x83a05df1, 0xfab8e613, 0x00000001, 0x000001dc, 0x00000003, + 0x0000002c, 0x000000e4, 0x00000118, 0x4e475349, 0x000000b0, 0x00000006, 0x00000008, 0x00000098, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x000000a4, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000303, 0x000000a4, 0x00000004, 0x00000000, 0x00000003, 0x00000001, + 0x00000404, 0x000000a4, 0x00000001, 0x00000000, 0x00000003, 0x00000002, 0x00000101, 0x000000a4, + 0x00000002, 0x00000000, 0x00000001, 0x00000002, 0x00000202, 0x000000a4, 0x00000003, 0x00000000, + 0x00000001, 0x00000002, 0x00000404, 0x505f5653, 0x7469736f, 0x006e6f69, 0x43584554, 0x44524f4f, + 0xababab00, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, + 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000bc, + 0x00000040, 0x0000002f, 0x03001062, 0x00101032, 0x00000001, 0x03001062, 0x00101042, 0x00000001, + 0x03000862, 0x00101012, 0x00000002, 0x03000862, 0x00101022, 0x00000002, 0x03000862, 0x00101042, + 0x00000002, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0700001e, 0x00100012, + 0x00000000, 0x0010101a, 0x00000002, 0x0010102a, 0x00000002, 0x05000056, 0x00102022, 0x00000000, + 0x0010000a, 0x00000000, 0x07000000, 0x00102012, 0x00000000, 0x0010101a, 0x00000001, 0x0010100a, + 0x00000002, 0x05000036, 0x001020c2, 0x00000000, 0x001012a6, 0x00000001, 0x0100003e, + }; + static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = + { + {"SV_POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 8, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"TEXCOORD", 1, DXGI_FORMAT_R32_FLOAT, 0, 16, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"TEXCOORD", 2, DXGI_FORMAT_R32_UINT, 0, 20, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"TEXCOORD", 3, DXGI_FORMAT_R32_UINT, 0, 24, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"TEXCOORD", 4, DXGI_FORMAT_R32_FLOAT, 0, 28, D3D11_INPUT_PER_VERTEX_DATA, 0}, + }; + static const struct + { + struct vec2 position; + struct vec2 t0; + float t1; + unsigned int t2; + unsigned int t3; + float t4; + } + quad[] = + { + {{-1.0f, -1.0f}, {3.0f, 5.0f}, 5.0f, 2, 6, 7.0f}, + {{-1.0f, 1.0f}, {3.0f, 5.0f}, 5.0f, 2, 6, 7.0f}, + {{ 1.0f, -1.0f}, {3.0f, 5.0f}, 5.0f, 2, 6, 7.0f}, + {{ 1.0f, 1.0f}, {3.0f, 5.0f}, 5.0f, 2, 6, 7.0f}, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const struct vec4 expected_result = {10.0f, 8.0f, 7.0f, 3.0f}; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), NULL, &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &render_target); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)render_target, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + hr = ID3D11Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), + vs_code, sizeof(vs_code), &input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + vb = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, sizeof(quad), quad); + + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, white); + + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + ID3D11DeviceContext_VSSetShader(context, vs, NULL, 0); + ID3D11DeviceContext_IASetInputLayout(context, input_layout); + ID3D11DeviceContext_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + offset = 0; + stride = sizeof(*quad); + ID3D11DeviceContext_IASetVertexBuffers(context, 0, 1, &vb, &stride, &offset); + ID3D11DeviceContext_Draw(context, 4, 0); + check_texture_vec4(render_target, &expected_result, 0); + + ID3D11InputLayout_Release(input_layout); + ID3D11RenderTargetView_Release(rtv); + ID3D11Texture2D_Release(render_target); + ID3D11PixelShader_Release(ps); + ID3D11VertexShader_Release(vs); + ID3D11Buffer_Release(vb); + release_test_context(&test_context); +} + static void test_sm4_if_instruction(void) { struct d3d11_test_context test_context; @@ -21341,6 +21502,7 @@ START_TEST(d3d11) test_cb_relative_addressing(); test_getdc(); test_shader_stage_input_output_matching(); + test_shader_interstage_interface(); test_sm4_if_instruction(); test_sm4_breakc_instruction(); test_sm4_continuec_instruction();

1 0

Józef Kucia : wined3d: Pack interpolation modes.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: 9cb69d91b2132876bdd3941384408bce91cf884b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb69d91b2132876bdd394138… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 18 00:25:09 2017 +0200 wined3d: Pack interpolation modes. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 25 +++++++++++++++------ dlls/wined3d/shader.c | 18 ++++++++++++---- dlls/wined3d/wined3d_private.h | 49 ++++++++++++++++++++++++++++++++++++++---- 3 files changed, 77 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e4aa6c5..a03f179 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2141,10 +2141,18 @@ static const char *shader_glsl_interpolation_qualifiers(enum wined3d_shader_inte } } +static enum wined3d_shader_interpolation_mode wined3d_extract_interpolation_mode( + const DWORD *packed_interpolation_mode, unsigned int register_idx) +{ + return wined3d_extract_bits(packed_interpolation_mode, + register_idx * WINED3D_PACKED_INTERPOLATION_BIT_COUNT, WINED3D_PACKED_INTERPOLATION_BIT_COUNT); +} + static void shader_glsl_declare_shader_inputs(const struct wined3d_gl_info *gl_info, struct wined3d_string_buffer *buffer, unsigned int element_count, - const enum wined3d_shader_interpolation_mode *interpolation_mode, BOOL unroll) + const DWORD *interpolation_mode, BOOL unroll) { + enum wined3d_shader_interpolation_mode mode; unsigned int i; if (shader_glsl_use_interface_blocks(gl_info)) @@ -2154,8 +2162,8 @@ static void shader_glsl_declare_shader_inputs(const struct wined3d_gl_info *gl_i shader_addline(buffer, "in shader_in_out {\n"); for (i = 0; i < element_count; ++i) { - shader_addline(buffer, "%s vec4 reg%u;\n", - shader_glsl_interpolation_qualifiers(interpolation_mode[i]), i); + mode = wined3d_extract_interpolation_mode(interpolation_mode, i); + shader_addline(buffer, "%s vec4 reg%u;\n", shader_glsl_interpolation_qualifiers(mode), i); } shader_addline(buffer, "} shader_in;\n"); } @@ -2172,8 +2180,9 @@ static void shader_glsl_declare_shader_inputs(const struct wined3d_gl_info *gl_i static void shader_glsl_declare_shader_outputs(const struct wined3d_gl_info *gl_info, struct wined3d_string_buffer *buffer, unsigned int element_count, BOOL rasterizer_setup, - const enum wined3d_shader_interpolation_mode *interpolation_mode) + const DWORD *interpolation_mode) { + enum wined3d_shader_interpolation_mode mode; unsigned int i; if (shader_glsl_use_interface_blocks(gl_info)) @@ -2185,7 +2194,10 @@ static void shader_glsl_declare_shader_outputs(const struct wined3d_gl_info *gl_ { const char *interpolation_qualifiers = ""; if (needs_interpolation_qualifiers_for_shader_outputs(gl_info)) - interpolation_qualifiers = shader_glsl_interpolation_qualifiers(interpolation_mode[i]); + { + mode = wined3d_extract_interpolation_mode(interpolation_mode, i); + interpolation_qualifiers = shader_glsl_interpolation_qualifiers(mode); + } shader_addline(buffer, "%s vec4 reg%u;\n", interpolation_qualifiers, i); } shader_addline(buffer, "} shader_out;\n"); @@ -7063,8 +7075,7 @@ static GLuint shader_glsl_generate_vs3_rasterizer_input_setup(struct shader_glsl static void shader_glsl_generate_sm4_output_setup(struct shader_glsl_priv *priv, const struct wined3d_shader *shader, unsigned int input_count, - const struct wined3d_gl_info *gl_info, BOOL rasterizer_setup, - const enum wined3d_shader_interpolation_mode *interpolation_mode) + const struct wined3d_gl_info *gl_info, BOOL rasterizer_setup, const DWORD *interpolation_mode) { const char *prefix = shader_glsl_get_prefix(shader->reg_maps.shader_version.type); struct wined3d_string_buffer *buffer = &priv->shader_buffer; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2c741c8..f80467b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -961,6 +961,16 @@ static HRESULT shader_record_shader_phase(struct wined3d_shader *shader, return WINED3D_OK; } +static void wined3d_insert_interpolation_mode(DWORD *packed_interpolation_mode, + unsigned int register_idx, enum wined3d_shader_interpolation_mode mode) +{ + if (mode > WINED3DSIM_LINEAR_NOPERSPECTIVE_SAMPLE) + FIXME("Unexpected interpolation mode %#x.\n", mode); + + wined3d_insert_bits(packed_interpolation_mode, + register_idx * WINED3D_PACKED_INTERPOLATION_BIT_COUNT, WINED3D_PACKED_INTERPOLATION_BIT_COUNT, mode); +} + /* Note that this does not count the loop register as an address register. */ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const struct wined3d_shader_frontend *fe, struct wined3d_shader_reg_maps *reg_maps, struct wined3d_shader_signature *input_signature, @@ -1151,13 +1161,13 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st else if (ins.handler_idx == WINED3DSIH_DCL_INPUT_PS) { unsigned int reg_idx = ins.declaration.dst.reg.idx[0].offset; - if (reg_idx >= ARRAY_SIZE(shader->u.ps.interpolation_mode)) + if (reg_idx >= MAX_REG_INPUT) { ERR("Invalid register index %u.\n", reg_idx); break; } if (shader_version.type == WINED3D_SHADER_TYPE_PIXEL) - shader->u.ps.interpolation_mode[reg_idx] = ins.flags; + wined3d_insert_interpolation_mode(shader->u.ps.interpolation_mode, reg_idx, ins.flags); else FIXME("Invalid instruction %#x for shader type %#x.\n", ins.handler_idx, shader_version.type); @@ -3400,13 +3410,13 @@ HRESULT CDECL wined3d_shader_set_local_constants_float(struct wined3d_shader *sh return WINED3D_OK; } -static void init_interpolation_compile_args(enum wined3d_shader_interpolation_mode *interpolation_args, +static void init_interpolation_compile_args(DWORD *interpolation_args, const struct wined3d_shader *pixel_shader, const struct wined3d_gl_info *gl_info) { if (!needs_interpolation_qualifiers_for_shader_outputs(gl_info) || !pixel_shader || pixel_shader->reg_maps.shader_version.major < 4) { - memset(interpolation_args, 0, MAX_REG_INPUT * sizeof(*interpolation_args)); + memset(interpolation_args, 0, sizeof(pixel_shader->u.ps.interpolation_mode)); return; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 26bda61..fad3fad 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -561,6 +561,9 @@ enum wined3d_shader_interpolation_mode WINED3DSIM_LINEAR_NOPERSPECTIVE_SAMPLE = 7, }; +#define WINED3D_PACKED_INTERPOLATION_SIZE 3 +#define WINED3D_PACKED_INTERPOLATION_BIT_COUNT 3 + enum wined3d_shader_global_flags { WINED3DSGF_REFACTORING_ALLOWED = 0x1, @@ -1363,7 +1366,7 @@ struct vs_compile_args BYTE padding : 1; WORD swizzle_map; /* MAX_ATTRIBS, 16 */ unsigned int next_shader_input_count; - enum wined3d_shader_interpolation_mode interpolation_mode[MAX_REG_INPUT]; + DWORD interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; }; struct ds_compile_args @@ -1374,13 +1377,13 @@ struct ds_compile_args unsigned int next_shader_type : 3; unsigned int render_offscreen : 1; unsigned int padding : 12; - enum wined3d_shader_interpolation_mode interpolation_mode[MAX_REG_INPUT]; + DWORD interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; }; struct gs_compile_args { unsigned int output_count; - enum wined3d_shader_interpolation_mode interpolation_mode[MAX_REG_INPUT]; + DWORD interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; }; struct wined3d_context; @@ -3916,7 +3919,7 @@ struct wined3d_pixel_shader BOOL force_early_depth_stencil; enum wined3d_shader_register_type depth_output; - enum wined3d_shader_interpolation_mode interpolation_mode[MAX_REG_INPUT]; + DWORD interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; }; struct wined3d_compute_shader @@ -4293,6 +4296,44 @@ static inline BOOL needs_interpolation_qualifiers_for_shader_outputs(const struc return gl_info->glsl_version < MAKEDWORD_VERSION(4, 40); } +static inline DWORD wined3d_extract_bits(const DWORD *bitstream, + unsigned int offset, unsigned int count) +{ + const unsigned int word_bit_count = sizeof(*bitstream) * CHAR_BIT; + const unsigned int idx = offset / word_bit_count; + const unsigned int shift = offset % word_bit_count; + DWORD mask = (1u << count) - 1; + DWORD ret; + + ret = (bitstream[idx] >> shift) & mask; + if (shift + count > word_bit_count) + { + const unsigned int extracted_bit_count = word_bit_count - shift; + const unsigned int remaining_bit_count = count - extracted_bit_count; + mask = (1u << remaining_bit_count) - 1; + ret |= (bitstream[idx + 1] & mask) << extracted_bit_count; + } + return ret; +} + +static inline void wined3d_insert_bits(DWORD *bitstream, + unsigned int offset, unsigned int count, DWORD bits) +{ + const unsigned int word_bit_count = sizeof(*bitstream) * CHAR_BIT; + const unsigned int idx = offset / word_bit_count; + const unsigned int shift = offset % word_bit_count; + DWORD mask = (1u << count) - 1; + + bitstream[idx] |= (bits & mask) << shift; + if (shift + count > word_bit_count) + { + const unsigned int inserted_bit_count = word_bit_count - shift; + const unsigned int remaining_bit_count = count - inserted_bit_count; + mask = (1u << remaining_bit_count) - 1; + bitstream[idx + 1] |= (bits >> inserted_bit_count) & mask; + } +} + static inline struct wined3d_surface *context_get_rt_surface(const struct wined3d_context *context) { struct wined3d_texture *texture = context->current_rt.texture;

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2017