June 2019 - Wine-Devel - list.winehq.org

[PATCH] mshtml: Add IDisplayServices interface stub.
by Dmitry Timoshkov June 3, 2019

June 3, 2019

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mshtml/htmldoc.c | 96 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 2 + 3 files changed, 99 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 9dec890d1a..3d82dd4f53 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5014,6 +5014,99 @@ static const IMarkupContainerVtbl MarkupContainerVtbl = { MarkupContainer_OwningDoc }; +/********************************************************** + * IDisplayServices implementation + */ +static inline HTMLDocument *impl_from_IDisplayServices(IDisplayServices *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IDisplayServices_iface); +} + +static HRESULT WINAPI DisplayServices_QueryInterface(IDisplayServices *iface, REFIID riid, void **ppvObject) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + return htmldoc_query_interface(This, riid, ppvObject); +} + +static ULONG WINAPI DisplayServices_AddRef(IDisplayServices *iface) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + return htmldoc_addref(This); +} + +static ULONG WINAPI DisplayServices_Release(IDisplayServices *iface) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + return htmldoc_release(This); +} + +static HRESULT WINAPI DisplayServices_CreateDisplayPointer(IDisplayServices *iface, IDisplayPointer **ppDispPointer) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%p)\n", This, ppDispPointer); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayServices_TransformRect(IDisplayServices *iface, + RECT *pRect, COORD_SYSTEM eSource, COORD_SYSTEM eDestination, IHTMLElement *pIElement) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%s,%d,%d,%p)\n", This, wine_dbgstr_rect(pRect), eSource, eDestination, pIElement); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayServices_TransformPoint(IDisplayServices *iface, + POINT *pPoint, COORD_SYSTEM eSource, COORD_SYSTEM eDestination, IHTMLElement *pIElement) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%s,%d,%d,%p)\n", This, wine_dbgstr_point(pPoint), eSource, eDestination, pIElement); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayServices_GetCaret(IDisplayServices *iface, IHTMLCaret **ppCaret) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%p)\n", This, ppCaret); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayServices_GetComputedStyle(IDisplayServices *iface, + IMarkupPointer *pPointer, IHTMLComputedStyle **ppComputedStyle) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%p,%p)\n", This, pPointer, ppComputedStyle); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayServices_ScrollRectIntoView(IDisplayServices *iface, + IHTMLElement *pIElement, RECT rect) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%p,%s)\n", This, pIElement, wine_dbgstr_rect(&rect)); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayServices_HasFlowLayout(IDisplayServices *iface, + IHTMLElement *pIElement, BOOL *pfHasFlowLayout) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%p,%p)\n", This, pIElement, pfHasFlowLayout); + return E_NOTIMPL; +} + +static const IDisplayServicesVtbl DisplayServicesVtbl = { + DisplayServices_QueryInterface, + DisplayServices_AddRef, + DisplayServices_Release, + DisplayServices_CreateDisplayPointer, + DisplayServices_TransformRect, + DisplayServices_TransformPoint, + DisplayServices_GetCaret, + DisplayServices_GetComputedStyle, + DisplayServices_ScrollRectIntoView, + DisplayServices_HasFlowLayout +}; + static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) { *ppv = NULL; @@ -5096,6 +5189,8 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IMarkupServices_iface; else if(IsEqualGUID(&IID_IMarkupContainer, riid)) *ppv = &This->IMarkupContainer_iface; + else if(IsEqualGUID(&IID_IDisplayServices, riid)) + *ppv = &This->IDisplayServices_iface; else if(IsEqualGUID(&CLSID_CMarkup, riid)) { FIXME("(%p)->(CLSID_CMarkup %p)\n", This, ppv); *ppv = NULL; @@ -5145,6 +5240,7 @@ static void init_doc(HTMLDocument *doc, IUnknown *outer, IDispatchEx *dispex) doc->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl; doc->IMarkupServices_iface.lpVtbl = &MarkupServicesVtbl; doc->IMarkupContainer_iface.lpVtbl = &MarkupContainerVtbl; + doc->IDisplayServices_iface.lpVtbl = &DisplayServicesVtbl; doc->outer_unk = outer; doc->dispex = dispex; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7dc9367493..8beea346e8 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -625,6 +625,7 @@ struct HTMLDocument { IProvideMultipleClassInfo IProvideMultipleClassInfo_iface; IMarkupServices IMarkupServices_iface; IMarkupContainer IMarkupContainer_iface; + IDisplayServices IDisplayServices_iface; IUnknown *outer_unk; IDispatchEx *dispex; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8a08282957..01c6191a6e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -173,6 +173,7 @@ static const IID * const doc_node_iids[] = { &IID_IHTMLDocument5, &IID_IDocumentSelector, &IID_IDispatchEx, + &IID_IDisplayServices, &IID_IConnectionPointContainer, &IID_IInternetHostSecurityManager, &IID_IMarkupContainer, @@ -191,6 +192,7 @@ static const IID * const doc_obj_iids[] = { &IID_IHTMLDocument5, &IID_IDocumentSelector, &IID_IDispatchEx, + &IID_IDisplayServices, &IID_IConnectionPointContainer, &IID_ICustomDoc, &IID_IMarkupContainer, -- 2.20.1

2 1

[PATCH] mshtml.idl: Add forward declaration for IHTMLWindow flavours.
by Dmitry Timoshkov June 3, 2019

June 3, 2019

This helps to make sure that getComputedStyle() gets picked up before GetComputedStyle(), and correct tlb is generated as a result. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/mshtml.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/mshtml.idl b/include/mshtml.idl index de15c6c2ce..f7ebd9e71a 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -407,6 +407,12 @@ interface IHTMLFrameBase; interface IHTMLStorage; interface IHTMLStyleSheetsCollection; interface IHTMLTableSection; +interface IHTMLWindow2; +interface IHTMLWindow3; +interface IHTMLWindow4; +interface IHTMLWindow5; +interface IHTMLWindow6; +interface IHTMLWindow7; interface IDOMEvent; interface IDisplayPointer; interface IDisplayServices; -- 2.20.1

2 1

[PATCH] mshtml.idl: Work around IDisplayServices and IHTMLWindow7 conflict for getComputedStyle.
by Jacek Caban June 3, 2019

June 3, 2019

Generated typelib will use one name entry for both interface (although they differ in 'g' case). Make sure the right variant is used. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtml.idl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

2 5

winetricks gmdls directmusic dsdmo doesn't work.
by Dr. Makoto Sakurai June 3, 2019

June 3, 2019

Dear all, I have imported gm.dls and dsdmo works fine. But, winetricks directmusic doesn't work. regsvr32: 'DLLRegisterServer' is not implemented in DLL 'dsound.dll' (translated form Japanese to English) What should I do? I need it to play MIDI on wine. Best, Makoto Sakurai

2 1

[PATCH 1/3] include/mshtml.idl: Add more interface declarations.
by Dmitry Timoshkov June 3, 2019

June 3, 2019

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/mshtmdid.h | 32 ++++- include/mshtml.idl | 342 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 356 insertions(+), 18 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index a8c010d3b1..82055f690b 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -38,9 +38,11 @@ #define DISPID_HEADER DISPID_NORMAL_FIRST #define DISPID_HEDELEMS DISPID_NORMAL_FIRST #define DISPID_HR DISPID_NORMAL_FIRST +#define DISPID_IHTMLCOMPUTEDSTYLE DISPID_NORMAL_FIRST +#define DISPID_ILINEINFO DISPID_NORMAL_FIRST +#define DISPID_IMGBASE DISPID_NORMAL_FIRST #define DISPID_LABEL DISPID_NORMAL_FIRST #define DISPID_LI DISPID_NORMAL_FIRST -#define DISPID_IMGBASE DISPID_NORMAL_FIRST #define DISPID_MENU DISPID_NORMAL_FIRST #define DISPID_OL DISPID_NORMAL_FIRST #define DISPID_PARA DISPID_NORMAL_FIRST @@ -1683,6 +1685,34 @@ #define DISPID_IHTMLDOCUMENT8_ONMSMANIPULATIONSTATECHANGED DISPID_EVPROP_ONMSMANIPULATIONSTATECHANGED #define DISPID_IHTMLDOCUMENT8_MSCAPSLOCKWARNINGOFF DISPID_OMDOCUMENT+141 +/* ILineInfo */ +#define DISPID_ILINEINFO_X (DISPID_ILINEINFO+1) +#define DISPID_ILINEINFO_BASELINE (DISPID_ILINEINFO+2) +#define DISPID_ILINEINFO_TEXTDESCENT (DISPID_ILINEINFO+3) +#define DISPID_ILINEINFO_TEXTHEIGHT (DISPID_ILINEINFO+4) +#define DISPID_ILINEINFO_LINEDIRECTION (DISPID_ILINEINFO+5) + +/* IHTMLComputedStyle */ +#define DISPID_IHTMLCOMPUTEDSTYLE_BOLD (DISPID_IHTMLCOMPUTEDSTYLE+1) +#define DISPID_IHTMLCOMPUTEDSTYLE_ITALIC (DISPID_IHTMLCOMPUTEDSTYLE+2) +#define DISPID_IHTMLCOMPUTEDSTYLE_UNDERLINE (DISPID_IHTMLCOMPUTEDSTYLE+3) +#define DISPID_IHTMLCOMPUTEDSTYLE_OVERLINE (DISPID_IHTMLCOMPUTEDSTYLE+4) +#define DISPID_IHTMLCOMPUTEDSTYLE_STRIKEOUT (DISPID_IHTMLCOMPUTEDSTYLE+5) +#define DISPID_IHTMLCOMPUTEDSTYLE_SUBSCRIPT (DISPID_IHTMLCOMPUTEDSTYLE+6) +#define DISPID_IHTMLCOMPUTEDSTYLE_SUPERSCRIPT (DISPID_IHTMLCOMPUTEDSTYLE+7) +#define DISPID_IHTMLCOMPUTEDSTYLE_EXPLICITFACE (DISPID_IHTMLCOMPUTEDSTYLE+8) +#define DISPID_IHTMLCOMPUTEDSTYLE_FONTWEIGHT (DISPID_IHTMLCOMPUTEDSTYLE+9) +#define DISPID_IHTMLCOMPUTEDSTYLE_FONTSIZE (DISPID_IHTMLCOMPUTEDSTYLE+10) +#define DISPID_IHTMLCOMPUTEDSTYLE_FONTNAME (DISPID_IHTMLCOMPUTEDSTYLE+11) +#define DISPID_IHTMLCOMPUTEDSTYLE_HASBGCOLOR (DISPID_IHTMLCOMPUTEDSTYLE+12) +#define DISPID_IHTMLCOMPUTEDSTYLE_TEXTCOLOR (DISPID_IHTMLCOMPUTEDSTYLE+13) +#define DISPID_IHTMLCOMPUTEDSTYLE_BACKGROUNDCOLOR (DISPID_IHTMLCOMPUTEDSTYLE+14) +#define DISPID_IHTMLCOMPUTEDSTYLE_PREFORMATTED (DISPID_IHTMLCOMPUTEDSTYLE+15) +#define DISPID_IHTMLCOMPUTEDSTYLE_DIRECTION (DISPID_IHTMLCOMPUTEDSTYLE+16) +#define DISPID_IHTMLCOMPUTEDSTYLE_BLOCKDIRECTION (DISPID_IHTMLCOMPUTEDSTYLE+17) +#define DISPID_IHTMLCOMPUTEDSTYLE_OL (DISPID_IHTMLCOMPUTEDSTYLE+18) +#define DISPID_IHTMLCOMPUTEDSTYLE_ISEQUAL + /* DWebBridgeEvents */ #define DISPID_DWEBBRIDGEEVENTS_ONSCRIPTLETEVENT 1 #define DISPID_DWEBBRIDGEEVENTS_ONREADYSTATECHANGE DISPID_HTMLDOCUMENTEVENTS_ONREADYSTATECHANGE diff --git a/include/mshtml.idl b/include/mshtml.idl index 7cc9e93af2..de15c6c2ce 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -45,6 +45,15 @@ cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") cpp_quote("#undef FindText") cpp_quote("#endif") +[ + version(4.0), + uuid(3050F1C5-98B5-11CF-BB82-00AA00BDCE0B) +] +library MSHTML +{ + +importlib("stdole2.tlb"); + typedef enum { POINTER_GRAVITY_Left, POINTER_GRAVITY_Right, @@ -100,14 +109,155 @@ typedef enum _SELECTION_TYPE { SELECTION_TYPE_Max = 2147483647 } SELECTION_TYPE; -[ - version(4.0), - uuid(3050F1C5-98B5-11CF-BB82-00AA00BDCE0B) -] -library MSHTML -{ - -importlib("stdole2.tlb"); +typedef enum _ELEMENT_TAG_ID { + TAGID_NULL, + TAGID_UNKNOWN, + TAGID_A, + TAGID_ACRONYM, + TAGID_ADDRESS, + TAGID_APPLET, + TAGID_AREA, + TAGID_B, + TAGID_BASE, + TAGID_BASEFONT, + TAGID_BDO, + TAGID_BGSOUND, + TAGID_BIG, + TAGID_BLINK, + TAGID_BLOCKQUOTE, + TAGID_BODY, + TAGID_BR, + TAGID_BUTTON, + TAGID_CAPTION, + TAGID_CENTER, + TAGID_CITE, + TAGID_CODE, + TAGID_COL, + TAGID_COLGROUP, + TAGID_COMMENT, + TAGID_COMMENT_RAW, + TAGID_DD, + TAGID_DEL, + TAGID_DFN, + TAGID_DIR, + TAGID_DIV, + TAGID_DL, + TAGID_DT, + TAGID_EM, + TAGID_EMBED, + TAGID_FIELDSET, + TAGID_FONT, + TAGID_FORM, + TAGID_FRAME, + TAGID_FRAMESET, + TAGID_GENERIC, + TAGID_H1, + TAGID_H2, + TAGID_H3, + TAGID_H4, + TAGID_H5, + TAGID_H6, + TAGID_HEAD, + TAGID_HR, + TAGID_HTML, + TAGID_I, + TAGID_IFRAME, + TAGID_IMG, + TAGID_INPUT, + TAGID_INS, + TAGID_KBD, + TAGID_LABEL, + TAGID_LEGEND, + TAGID_LI, + TAGID_LINK, + TAGID_LISTING, + TAGID_MAP, + TAGID_MARQUEE, + TAGID_MENU, + TAGID_META, + TAGID_NEXTID, + TAGID_NOBR, + TAGID_NOEMBED, + TAGID_NOFRAMES, + TAGID_NOSCRIPT, + TAGID_OBJECT, + TAGID_OL, + TAGID_OPTION, + TAGID_P, + TAGID_PARAM, + TAGID_PLAINTEXT, + TAGID_PRE, + TAGID_Q, + TAGID_RP, + TAGID_RT, + TAGID_RUBY, + TAGID_S, + TAGID_SAMP, + TAGID_SCRIPT, + TAGID_SELECT, + TAGID_SMALL, + TAGID_SPAN, + TAGID_STRIKE, + TAGID_STRONG, + TAGID_STYLE, + TAGID_SUB, + TAGID_SUP, + TAGID_TABLE, + TAGID_TBODY, + TAGID_TC, + TAGID_TD, + TAGID_TEXTAREA, + TAGID_TFOOT, + TAGID_TH, + TAGID_THEAD, + TAGID_TITLE, + TAGID_TR, + TAGID_TT, + TAGID_U, + TAGID_UL, + TAGID_VAR, + TAGID_WBR, + TAGID_XMP, + TAGID_ROOT, + TAGID_OPTGROUP, + TAGID_ABBR, + TAGID_COUNT, + TAGID_LAST_PREDEFINED = 10000, + ELEMENT_TAG_ID_Max = 2147483647 +} ELEMENT_TAG_ID; + +typedef enum _COORD_SYSTEM { + COORD_SYSTEM_GLOBAL, + COORD_SYSTEM_PARENT, + COORD_SYSTEM_CONTAINER, + COORD_SYSTEM_CONTENT, + COORD_SYSTEM_FRAME, + COORD_SYSTEM_Max = 2147483647 +} COORD_SYSTEM; + +typedef enum _DISPLAY_MOVEUNIT { + DISPLAY_MOVEUNIT_PreviousLine = 1, + DISPLAY_MOVEUNIT_NextLine, + DISPLAY_MOVEUNIT_CurrentLineStart, + DISPLAY_MOVEUNIT_CurrentLineEnd, + DISPLAY_MOVEUNIT_TopOfWindow, + DISPLAY_MOVEUNIT_BottomOfWindow, + DISPLAY_MOVEUNIT_Max = 2147483647 +} DISPLAY_MOVEUNIT; + +typedef enum _DISPLAY_GRAVITY { + DISPLAY_GRAVITY_PreviousLine = 1, + DISPLAY_GRAVITY_NextLine, + DISPLAY_GRAVITY_Max = 2147483647 +} DISPLAY_GRAVITY; + +typedef enum _CARET_DIRECTION { + CARET_DIRECTION_INDETERMINATE, + CARET_DIRECTION_SAME, + CARET_DIRECTION_BACKWARD, + CARET_DIRECTION_FORWARD, + CARET_DIRECTION_Max = 2147483647 +} CARET_DIRECTION; typedef enum _DomConstructor { DomConstructorObject = 0, @@ -245,13 +395,25 @@ interface IHTMLDOMConstructor : IDispatch [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] \ IDispatch *constructor() +interface IHTMLCaret; +interface IHTMLComputedStyle; interface IHTMLDocument2; interface IHTMLDocument7; +interface IHTMLElement; interface IHTMLElement2; -interface IHTMLStyleSheetsCollection; +interface IHTMLElementCollection; +interface IHTMLEventObj; interface IHTMLFrameBase; interface IHTMLStorage; +interface IHTMLStyleSheetsCollection; +interface IHTMLTableSection; interface IDOMEvent; +interface IDisplayPointer; +interface IDisplayServices; +interface ILineInfo; +interface IMarkupPointer; +interface IMarkupContainer; +interface ISVGSVGElement; /***************************************************************************** * IHTMLCSSStyleDeclaration interface @@ -8706,8 +8868,6 @@ methods: IDispatch *item([in] LONG index); } -interface IHTMLElementCollection; - /***************************************************************************** * IHTMLElement interface */ @@ -12518,8 +12678,6 @@ methods: VARIANT_BOOL onreset(); } -interface IHTMLEventObj; - [ hidden, uuid(3050F614-98B5-11CF-BB82-00AA00BDCE0B) @@ -16122,8 +16280,6 @@ interface ISVGAnimatedEnumeration : IDispatch HRESULT animVal([out, retval] USHORT *p); } -interface ISVGSVGElement; - /***************************************************************************** * ISVGElement interface */ @@ -25111,8 +25267,6 @@ interface IHTMLTableCaption : IDispatch HRESULT vAlign([retval, out] BSTR *p); } -interface IHTMLTableSection; - /***************************************************************************** * IHTMLTable interface */ @@ -27871,6 +28025,160 @@ interface IDOMMessageEvent : IDispatch [in] IHTMLWindow2 *source); } +/***************************************************************************** + * ILineInfo interface + */ +[ + object, + pointer_default(unique), + uuid(3050f7e2-98b5-11cf-bb82-00aa00bdce0b) +] +interface ILineInfo : IUnknown +{ + [propget, id(DISPID_ILINEINFO_X)] HRESULT x([retval, out] long *p); + [propget, id(DISPID_ILINEINFO_BASELINE)] HRESULT baseLine([retval, out] long *p); + [propget, id(DISPID_ILINEINFO_TEXTDESCENT)] HRESULT textDescent([retval, out] long *p); + [propget, id(DISPID_ILINEINFO_TEXTHEIGHT)] HRESULT textHeight([retval, out] long *p); + [propget, id(DISPID_ILINEINFO_LINEDIRECTION)] HRESULT lineDirection([retval, out] long *p); +}; + +/***************************************************************************** + * IHTMLComputedStyle interface + */ +[ + object, + pointer_default(unique), + uuid(3050f6c3-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLComputedStyle : IUnknown +{ + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_BOLD)] HRESULT bold([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_ITALIC)] HRESULT italic([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_UNDERLINE)] HRESULT underline([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_OVERLINE)] HRESULT overline([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_STRIKEOUT)] HRESULT strikeOut([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_SUBSCRIPT)] HRESULT subScript([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_SUPERSCRIPT)] HRESULT superScript([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_EXPLICITFACE)] HRESULT explicitFace([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_FONTWEIGHT)] HRESULT fontWeight([retval, out] long **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_FONTSIZE)] HRESULT fontSize([retval, out] long **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_FONTNAME)] HRESULT fontName([retval, out] WCHAR **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_HASBGCOLOR)] HRESULT hasBgColor([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_TEXTCOLOR)] HRESULT textColor([retval, out] DWORD **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_BACKGROUNDCOLOR)] HRESULT backgroundColor([retval, out] DWORD **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_PREFORMATTED)] HRESULT *preFormatted([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_DIRECTION)] HRESULT direction([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_BLOCKDIRECTION)] HRESULT blockDirection([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_OL)] HRESULT OL([retval, out] VARIANT_BOOL *p); + HRESULT IsEqual([in] IHTMLComputedStyle *pComputedStyle,[out] VARIANT_BOOL *pfEqual); +}; + +/***************************************************************************** + * IDisplayPointer interface + */ +[ + object, + pointer_default(unique), + uuid(3050f69e-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDisplayPointer : IUnknown +{ + HRESULT MoveToPoint([in] POINT ptPoint,[in] COORD_SYSTEM eCoordSystem,[in] IHTMLElement *pElementContext,[in] DWORD dwHitTestOptions,[out] DWORD *pdwHitTestResults); + HRESULT MoveUnit([in] DISPLAY_MOVEUNIT eMoveUnit,[in] LONG lXPos); + HRESULT PositionMarkupPointer([in] IMarkupPointer *pMarkupPointer); + HRESULT MoveToPointer([in] IDisplayPointer *pDispPointer); + HRESULT SetPointerGravity([in] POINTER_GRAVITY eGravity); + HRESULT GetPointerGravity([out] POINTER_GRAVITY *peGravity); + HRESULT SetDisplayGravity([in] DISPLAY_GRAVITY eGravity); + HRESULT GetDisplayGravity([out] DISPLAY_GRAVITY *peGravity); + HRESULT IsPositioned([out] BOOL *pfPositioned); + HRESULT Unposition(); + HRESULT IsEqualTo([in] IDisplayPointer *pDispPointer,[out] BOOL *pfIsEqual); + HRESULT IsLeftOf([in] IDisplayPointer *pDispPointer,[out] BOOL *pfIsLeftOf); + HRESULT IsRightOf([in] IDisplayPointer *pDispPointer,[out] BOOL *pfIsRightOf); + HRESULT IsAtBOL([out] BOOL *pfBOL); + HRESULT MoveToMarkupPointer([in] IMarkupPointer *pPointer,[in] IDisplayPointer *pDispLineContext); + HRESULT ScrollIntoView(); + HRESULT GetLineInfo([out] ILineInfo **ppLineInfo); + HRESULT GetFlowElement([out] IHTMLElement **ppLayoutElement); + HRESULT QueryBreaks([out] DWORD *pdwBreaks); +}; + +/***************************************************************************** + * IHTMLCaret interface + */ +[ + object, + pointer_default(unique), + uuid(3050f604-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLCaret : IUnknown +{ + HRESULT MoveCaretToPointer([in] IDisplayPointer *pDispPointer,[in] BOOL fScrollIntoView,[in] CARET_DIRECTION eDir); + HRESULT MoveCaretToPointerEx([in] IDisplayPointer *pDispPointer,[in] BOOL fVisible,[in] BOOL fScrollIntoView,[in] CARET_DIRECTION eDir); + HRESULT MoveMarkupPointerToCaret([in] IMarkupPointer *pIMarkupPointer); + HRESULT MoveDisplayPointerToCaret([in] IDisplayPointer *pDispPointer); + HRESULT IsVisible([out] BOOL *pIsVisible); + HRESULT Show([in] BOOL fScrollIntoView); + HRESULT Hide(); + HRESULT InsertText([in] OLECHAR *pText,[in] LONG lLen); + HRESULT ScrollIntoView(); + HRESULT GetLocation([out] POINT *pPoint,[in] BOOL fTranslate); + HRESULT GetCaretDirection([out] CARET_DIRECTION *peDir); + HRESULT SetCaretDirection([in] CARET_DIRECTION eDir); +}; + +/***************************************************************************** + * IDisplayServices interface + */ +[ + object, + pointer_default(unique), + uuid(3050f69d-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDisplayServices : IUnknown +{ + HRESULT CreateDisplayPointer([out] IDisplayPointer **ppDispPointer); + HRESULT TransformRect([in, out] RECT *pRect,[in] COORD_SYSTEM eSource,[in] COORD_SYSTEM eDestination,[in] IHTMLElement *pIElement); + HRESULT TransformPoint([in, out] POINT *pPoint,[in] COORD_SYSTEM eSource,[in] COORD_SYSTEM eDestination,[in] IHTMLElement *pIElement); + HRESULT GetCaret([out] IHTMLCaret **ppCaret); + HRESULT GetComputedStyle([in] IMarkupPointer *pPointer,[out] IHTMLComputedStyle **ppComputedStyle); + HRESULT ScrollRectIntoView([in] IHTMLElement *pIElement,[in] RECT rect); + HRESULT HasFlowLayout([in] IHTMLElement *pIElement,[out] BOOL *pfHasFlowLayout); +}; + +/***************************************************************************** + * IMarkupServices interface + */ +[ + object, + pointer_default(unique), + uuid(3050f4a0-98b5-11cf-bb82-00aa00bdce0b) +] +interface IMarkupServices : IUnknown +{ + HRESULT CreateMarkupPointer([out] IMarkupPointer **ppPointer); + HRESULT CreateMarkupContainer([out] IMarkupContainer **ppMarkupContainer); + HRESULT CreateElement([in] ELEMENT_TAG_ID tagID,[in] OLECHAR *pchAttributes,[out] IHTMLElement **ppElement); + HRESULT CloneElement([in] IHTMLElement *pElemCloneThis,[out] IHTMLElement **ppElementTheClone); + HRESULT InsertElement([in] IHTMLElement *pElementInsert,[in] IMarkupPointer *pPointerStart,[in] IMarkupPointer *pPointerFinish); + HRESULT RemoveElement([in] IHTMLElement *pElementRemove); + HRESULT Remove([in] IMarkupPointer *pPointerStart,[in] IMarkupPointer *pPointerFinish); + HRESULT Copy([in] IMarkupPointer *pPointerSourceStart,[in] IMarkupPointer *pPointerSourceFinish,[in] IMarkupPointer *pPointerTarget); + HRESULT Move([in] IMarkupPointer *pPointerSourceStart,[in] IMarkupPointer *pPointerSourceFinish,[in] IMarkupPointer *pPointerTarget); + HRESULT InsertText([in] OLECHAR *pchText,[in] long cch,[in] IMarkupPointer *pPointerTarget); + HRESULT ParseString([in] OLECHAR *pchHTML,[in] DWORD dwFlags,[out] IMarkupContainer **ppContainerResult,[in] IMarkupPointer *ppPointerStart,[in] IMarkupPointer *ppPointerFinish); + HRESULT ParseGlobal([in] HGLOBAL hglobalHTML,[in] DWORD dwFlags,[out] IMarkupContainer **ppContainerResult,[in] IMarkupPointer *pPointerStart,[in] IMarkupPointer *pPointerFinish); + HRESULT IsScopedElement([in] IHTMLElement *pElement,[out] BOOL *pfScoped); + HRESULT GetElementTagId([in] IHTMLElement *pElement,[out] ELEMENT_TAG_ID *ptagId); + HRESULT GetTagIDForName([in] BSTR bstrName,[out] ELEMENT_TAG_ID *ptagId); + HRESULT GetNameForTagID([in] ELEMENT_TAG_ID tagId,[out] BSTR *pbstrName); + HRESULT MovePointersToRange([in] IHTMLTxtRange *pIRange,[in] IMarkupPointer *pPointerStart,[in] IMarkupPointer *pPointerFinish); + HRESULT MoveRangeToPointers([in] IMarkupPointer *pPointerStart,[in] IMarkupPointer *pPointerFinish,[in] IHTMLTxtRange *pIRange); + HRESULT BeginUndoUnit([in] OLECHAR *pchTitle); + HRESULT EndUndoUnit(); +}; + /***************************************************************************** * IMarkupContainer interface */ -- 2.20.1

3 5

[PATCH 1/2] wined3d: Zero-initialize the swapchain context array.
by Matteo Bruni June 3, 2019

June 3, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47255 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Fixes a regression from commit db201072655946662c041a66ee434c30c245e5b0. dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index fbedd7470df..48d0920554d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -892,7 +892,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 if (!(device->wined3d->flags & WINED3D_NO3D)) { - if (!(swapchain->context = heap_alloc(sizeof(*swapchain->context)))) + if (!(swapchain->context = heap_alloc_zero(sizeof(*swapchain->context)))) { ERR("Failed to create the context array.\n"); hr = E_OUTOFMEMORY; -- 2.21.0

2 2

[PATCH] mmdevapi/tests: Use PropVariantClear after calling IPropertyStore_GetValue (Valgrind).
by Sven Baars June 3, 2019

June 3, 2019

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/mmdevapi/tests/propstore.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index 02340ba1f6..bbd4ffe10f 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -58,23 +58,26 @@ static void test_propertystore(IPropertyStore *store) { WideCharToMultiByte(CP_ACP, 0, pv.u.pwszVal, -1, temp, sizeof(temp)-1, NULL, NULL); trace("guid: %s\n", temp); - CoTaskMemFree(pv.u.pwszVal); + PropVariantClear(&pv); } pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_FriendlyName, &pv); ok(hr == S_OK, "Failed with %08x\n", hr); ok(pv.vt == VT_LPWSTR && pv.u.pwszVal, "FriendlyName value had wrong type: 0x%x or was NULL\n", pv.vt); + PropVariantClear(&pv); pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_Enabled, &pv); ok(hr == S_OK, "Failed with %08x\n", hr); ok(pv.vt == VT_EMPTY, "Key should not be found\n"); + PropVariantClear(&pv); pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_ClassGuid, &pv); ok(hr == S_OK, "Failed with %08x\n", hr); ok(pv.vt == VT_EMPTY, "Key should not be found\n"); + PropVariantClear(&pv); } static void test_deviceinterface(IPropertyStore *store) @@ -91,7 +94,7 @@ static void test_deviceinterface(IPropertyStore *store) ok(hr == S_OK, "GetValue failed: %08x\n", hr); ok(pv.vt == VT_LPWSTR, "Got wrong variant type: 0x%x\n", pv.vt); trace("device interface: %s\n", wine_dbgstr_w(pv.u.pwszVal)); - CoTaskMemFree(pv.u.pwszVal); + PropVariantClear(&pv); } static void test_getat(IPropertyStore *store) -- 2.17.1

2 1

[PATCH 1/2] ddraw: Remove const from ddraw1_vtbl and ddraw_surface1_vtbl.
by Alistair Leslie-Hughes June 3, 2019

June 3, 2019

From: Michael Müller <michael(a)fds-team.de> Bad Mojo Redux tries to hook ddraw1 and expects both interfaces to be writable. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=39534 Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/surface.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 04a94b6978..a26c380839 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4655,7 +4655,7 @@ static const struct IDirectDraw2Vtbl ddraw2_vtbl = ddraw2_GetAvailableVidMem, }; -static const struct IDirectDrawVtbl ddraw1_vtbl = +static struct IDirectDrawVtbl ddraw1_vtbl = { /* IUnknown */ ddraw1_QueryInterface, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4e2faef867..63f276a2a9 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5597,7 +5597,7 @@ static const struct IDirectDrawSurface2Vtbl ddraw_surface2_vtbl = ddraw_surface2_PageUnlock, }; -static const struct IDirectDrawSurfaceVtbl ddraw_surface1_vtbl = +static struct IDirectDrawSurfaceVtbl ddraw_surface1_vtbl = { /* IUnknown */ ddraw_surface1_QueryInterface, -- 2.17.1

2 1

[PATCH 5/5] wined3d: Properly check whether a context was created in swapchain_init().
by Henri Verbeet June 3, 2019

June 3, 2019

This fixes commit db201072655946662c041a66ee434c30c245e5b0, but the underlying issue was of course present before that commit. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 4cefd80f802..481b3b718ed 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -904,7 +904,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 wined3d_cs_init_object(device->cs, wined3d_swapchain_cs_init, swapchain); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); - if (!swapchain->context[0]) + if (!swapchain->num_contexts) { hr = WINED3DERR_NOTAVAILABLE; goto err; -- 2.11.0

1 0

[PATCH 4/5] wined3d: Move the WGL fields from struct wined3d_context to struct wined3d_context_gl.
by Henri Verbeet June 3, 2019

June 3, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 240 +++++++++++++++++--------------------- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/surface.c | 10 +- dlls/wined3d/swapchain.c | 6 +- dlls/wined3d/wined3d_private.h | 31 ++--- 6 files changed, 135 insertions(+), 156 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index dadeafd8e98..e4a0b42de68 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7879,7 +7879,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl if (dst_location == WINED3D_LOCATION_DRAWABLE) { d = *dst_rect; - wined3d_texture_translate_drawable_coords(dst_texture, context->win_handle, &d); + wined3d_texture_translate_drawable_coords(dst_texture, context_gl->window, &d); dst_rect = &d; } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2f3ed39a750..9dbdd945f09 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1125,45 +1125,45 @@ static BOOL wined3d_context_gl_restore_pixel_format(struct wined3d_context_gl *c const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; BOOL ret = FALSE; - if (context_gl->c.restore_pf && IsWindow(context_gl->c.restore_pf_win)) + if (context_gl->restore_pf && IsWindow(context_gl->restore_pf_win)) { if (context_gl->c.gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH]) { - HDC dc = GetDCEx(context_gl->c.restore_pf_win, 0, DCX_USESTYLE | DCX_CACHE); + HDC dc = GetDCEx(context_gl->restore_pf_win, 0, DCX_USESTYLE | DCX_CACHE); if (dc) { - if (!(ret = GL_EXTCALL(wglSetPixelFormatWINE(dc, context_gl->c.restore_pf)))) + if (!(ret = GL_EXTCALL(wglSetPixelFormatWINE(dc, context_gl->restore_pf)))) { ERR("Failed to restore pixel format %d on window %p.\n", - context_gl->c.restore_pf, context_gl->c.restore_pf_win); + context_gl->restore_pf, context_gl->restore_pf_win); } - ReleaseDC(context_gl->c.restore_pf_win, dc); + ReleaseDC(context_gl->restore_pf_win, dc); } } else { ERR("Unable to restore pixel format %d on window %p.\n", - context_gl->c.restore_pf, context_gl->c.restore_pf_win); + context_gl->restore_pf, context_gl->restore_pf_win); } } - context_gl->c.restore_pf = 0; - context_gl->c.restore_pf_win = NULL; + context_gl->restore_pf = 0; + context_gl->restore_pf_win = NULL; return ret; } static BOOL wined3d_context_gl_set_pixel_format(struct wined3d_context_gl *context_gl) { const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; - BOOL private = context_gl->c.hdc_is_private; - int format = context_gl->c.pixel_format; - HDC dc = context_gl->c.hdc; + BOOL private = context_gl->dc_is_private; + int format = context_gl->pixel_format; + HDC dc = context_gl->dc; int current; - if (private && context_gl->c.hdc_has_format) + if (private && context_gl->dc_has_format) return TRUE; - if (!private && WindowFromDC(dc) != context_gl->c.win_handle) + if (!private && WindowFromDC(dc) != context_gl->window) return FALSE; current = gl_info->gl_ops.wgl.p_wglGetPixelFormat(dc); @@ -1179,8 +1179,8 @@ static BOOL wined3d_context_gl_set_pixel_format(struct wined3d_context_gl *conte return FALSE; } - context_gl->c.restore_pf = 0; - context_gl->c.restore_pf_win = private ? NULL : WindowFromDC(dc); + context_gl->restore_pf = 0; + context_gl->restore_pf_win = private ? NULL : WindowFromDC(dc); goto success; } @@ -1200,12 +1200,12 @@ static BOOL wined3d_context_gl_set_pixel_format(struct wined3d_context_gl *conte } win = private ? NULL : WindowFromDC(dc); - if (win != context_gl->c.restore_pf_win) + if (win != context_gl->restore_pf_win) { wined3d_context_gl_restore_pixel_format(context_gl); - context_gl->c.restore_pf = private ? 0 : current; - context_gl->c.restore_pf_win = win; + context_gl->restore_pf = private ? 0 : current; + context_gl->restore_pf_win = win; } goto success; @@ -1221,7 +1221,7 @@ static BOOL wined3d_context_gl_set_pixel_format(struct wined3d_context_gl *conte success: if (private) - context_gl->c.hdc_has_format = TRUE; + context_gl->dc_has_format = TRUE; return TRUE; } @@ -1233,14 +1233,14 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context if (!wined3d_context_gl_set_pixel_format(context_gl)) { WARN("Failed to set pixel format %d on device context %p.\n", - context_gl->c.pixel_format, context_gl->c.hdc); + context_gl->pixel_format, context_gl->dc); backup = TRUE; } - if (backup || !wglMakeCurrent(context_gl->c.hdc, context_gl->c.glCtx)) + if (backup || !wglMakeCurrent(context_gl->dc, context_gl->gl_ctx)) { WARN("Failed to make GL context %p current on device context %p, last error %#x.\n", - context_gl->c.glCtx, context_gl->c.hdc, GetLastError()); + context_gl->gl_ctx, context_gl->dc, GetLastError()); context_gl->c.valid = 0; WARN("Trying fallback to the backup window.\n"); @@ -1255,27 +1255,27 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context return FALSE; } - if (!(context_gl->c.hdc = swapchain_get_backup_dc(swapchain))) + if (!(context_gl->dc = swapchain_get_backup_dc(swapchain))) { context_set_current(NULL); return FALSE; } - context_gl->c.hdc_is_private = TRUE; - context_gl->c.hdc_has_format = FALSE; + context_gl->dc_is_private = TRUE; + context_gl->dc_has_format = FALSE; if (!wined3d_context_gl_set_pixel_format(context_gl)) { ERR("Failed to set pixel format %d on device context %p.\n", - context_gl->c.pixel_format, context_gl->c.hdc); + context_gl->pixel_format, context_gl->dc); context_set_current(NULL); return FALSE; } - if (!wglMakeCurrent(context_gl->c.hdc, context_gl->c.glCtx)) + if (!wglMakeCurrent(context_gl->dc, context_gl->gl_ctx)) { ERR("Fallback to backup window (dc %p) failed too, last error %#x.\n", - context_gl->c.hdc, GetLastError()); + context_gl->dc, GetLastError()); context_set_current(NULL); return FALSE; } @@ -1302,60 +1302,30 @@ static void wined3d_context_gl_update_window(struct wined3d_context_gl *context_ if (!context_gl->c.swapchain) return; - if (context_gl->c.win_handle == context_gl->c.swapchain->win_handle) + if (context_gl->window == context_gl->c.swapchain->win_handle) return; TRACE("Updating context %p window from %p to %p.\n", - context_gl, context_gl->c.win_handle, context_gl->c.swapchain->win_handle); + context_gl, context_gl->window, context_gl->c.swapchain->win_handle); - if (context_gl->c.hdc) - wined3d_release_dc(context_gl->c.win_handle, context_gl->c.hdc); + if (context_gl->dc) + wined3d_release_dc(context_gl->window, context_gl->dc); - context_gl->c.win_handle = context_gl->c.swapchain->win_handle; - context_gl->c.hdc_is_private = FALSE; - context_gl->c.hdc_has_format = FALSE; + context_gl->window = context_gl->c.swapchain->win_handle; + context_gl->dc_is_private = FALSE; + context_gl->dc_has_format = FALSE; context_gl->c.needs_set = 1; context_gl->c.valid = 1; - if (!(context_gl->c.hdc = GetDCEx(context_gl->c.win_handle, 0, DCX_USESTYLE | DCX_CACHE))) + if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE))) { - ERR("Failed to get a device context for window %p.\n", context_gl->c.win_handle); + ERR("Failed to get a device context for window %p.\n", context_gl->window); context_gl->c.valid = 0; } } void wined3d_context_cleanup(struct wined3d_context *context) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; - HGLRC restore_ctx; - HDC restore_dc; - - restore_ctx = wglGetCurrentContext(); - restore_dc = wglGetCurrentDC(); - - if (restore_ctx == context->glCtx) - restore_ctx = NULL; - else if (context->valid) - wined3d_context_gl_set_gl_context(context_gl); - - wined3d_context_gl_restore_pixel_format(context_gl); - if (restore_ctx) - { - context_restore_gl_context(gl_info, restore_dc, restore_ctx); - } - else if (wglGetCurrentContext() && !wglMakeCurrent(NULL, NULL)) - { - ERR("Failed to disable GL context.\n"); - } - - wined3d_release_dc(context->win_handle, context->hdc); - - if (!wglDeleteContext(context->glCtx)) - { - DWORD err = GetLastError(); - ERR("wglDeleteContext(%p) failed, last error %#x.\n", context->glCtx, err); - } } void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) @@ -1374,7 +1344,7 @@ void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) restore_ctx = wglGetCurrentContext(); restore_dc = wglGetCurrentDC(); - if (restore_ctx == context_gl->c.glCtx) + if (restore_ctx == context_gl->gl_ctx) restore_ctx = NULL; else if (context_gl->c.valid) wined3d_context_gl_set_gl_context(context_gl); @@ -1505,6 +1475,16 @@ void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) wined3d_context_gl_restore_pixel_format(context_gl); if (restore_ctx) context_restore_gl_context(gl_info, restore_dc, restore_ctx); + else if (wglGetCurrentContext() && !wglMakeCurrent(NULL, NULL)) + ERR("Failed to disable GL context.\n"); + + wined3d_release_dc(context_gl->window, context_gl->dc); + + if (!wglDeleteContext(context_gl->gl_ctx)) + { + DWORD err = GetLastError(); + ERR("Failed to delete GL context %p, last error %#x.\n", context_gl->gl_ctx, err); + } wined3d_context_cleanup(&context_gl->c); } @@ -1565,7 +1545,8 @@ BOOL context_set_current(struct wined3d_context *ctx) return FALSE; } - TRACE("Switching to D3D context %p, GL context %p, device context %p.\n", ctx, ctx->glCtx, ctx->hdc); + TRACE("Switching to D3D context %p, GL context %p, device context %p.\n", + context_gl, context_gl->gl_ctx, context_gl->dc); if (!wined3d_context_gl_set_gl_context(context_gl)) return FALSE; ctx->current = 1; @@ -1589,7 +1570,7 @@ void context_release(struct wined3d_context *context) { struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - TRACE("Releasing context %p, level %u.\n", context, context->level); + TRACE("Releasing context %p, level %u.\n", context_gl, context->level); if (WARN_ON(d3d)) { @@ -1603,12 +1584,12 @@ void context_release(struct wined3d_context *context) { if (wined3d_context_gl_restore_pixel_format(context_gl)) context->needs_set = 1; - if (context->restore_ctx) + if (context_gl->restore_ctx) { - TRACE("Restoring GL context %p on device context %p.\n", context->restore_ctx, context->restore_dc); - context_restore_gl_context(context->gl_info, context->restore_dc, context->restore_ctx); - context->restore_ctx = NULL; - context->restore_dc = NULL; + TRACE("Restoring GL context %p on device context %p.\n", context_gl->restore_ctx, context_gl->restore_dc); + context_restore_gl_context(context_gl->c.gl_info, context_gl->restore_dc, context_gl->restore_ctx); + context_gl->restore_ctx = NULL; + context_gl->restore_dc = NULL; } if (context->destroy_delayed) @@ -1642,16 +1623,16 @@ static void wined3d_context_gl_enter(struct wined3d_context_gl *context_gl) const struct wined3d_context *current_context = context_get_current(); HGLRC current_gl = wglGetCurrentContext(); - if (current_gl && (!current_context || current_context->glCtx != current_gl)) + if (current_gl && (!current_context || wined3d_context_gl_const(current_context)->gl_ctx != current_gl)) { TRACE("Another GL context (%p on device context %p) is already current.\n", current_gl, wglGetCurrentDC()); - context_gl->c.restore_ctx = current_gl; - context_gl->c.restore_dc = wglGetCurrentDC(); + context_gl->restore_ctx = current_gl; + context_gl->restore_dc = wglGetCurrentDC(); context_gl->c.needs_set = 1; } - else if (!context_gl->c.needs_set && !(context_gl->c.hdc_is_private && context_gl->c.hdc_has_format) - && context_gl->c.pixel_format != context_gl->c.gl_info->gl_ops.wgl.p_wglGetPixelFormat(context_gl->c.hdc)) + else if (!context_gl->c.needs_set && !(context_gl->dc_is_private && context_gl->dc_has_format) + && context_gl->pixel_format != context_gl->c.gl_info->gl_ops.wgl.p_wglGetPixelFormat(context_gl->dc)) context_gl->c.needs_set = 1; } } @@ -1915,24 +1896,11 @@ HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, return ctx; } -static BOOL wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain) +static void wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain) { struct wined3d_device *device = swapchain->device; DWORD state; - if (!(context->hdc = GetDCEx(swapchain->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) - { - WARN("Failed to retrieve device context, trying swapchain backup.\n"); - - if (!(context->hdc = swapchain_get_backup_dc(swapchain))) - { - ERR("Failed to retrieve a device context.\n"); - return FALSE; - } - context->hdc_is_private = TRUE; - } - - context->win_handle = swapchain->win_handle; context->gl_info = &device->adapter->gl_info; context->d3d_info = &device->adapter->d3d_info; context->state_table = device->state_table; @@ -1957,16 +1925,13 @@ static BOOL wined3d_context_init(struct wined3d_context *context, struct wined3d | (1u << WINED3D_SHADER_TYPE_HULL) | (1u << WINED3D_SHADER_TYPE_DOMAIN) | (1u << WINED3D_SHADER_TYPE_COMPUTE); - - return TRUE; } HRESULT wined3d_context_no3d_init(struct wined3d_context *context_no3d, struct wined3d_swapchain *swapchain) { TRACE("context_no3d %p, swapchain %p.\n", context_no3d, swapchain); - if (!wined3d_context_init(context_no3d, swapchain)) - return E_FAIL; + wined3d_context_init(context_no3d, swapchain); return WINED3D_OK; } @@ -1985,13 +1950,25 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi TRACE("context_gl %p, swapchain %p.\n", context_gl, swapchain); - if (!wined3d_context_init(&context_gl->c, swapchain)) - return E_FAIL; + wined3d_context_init(&context_gl->c, swapchain); device = context->device; gl_info = context->gl_info; d3d_info = context->d3d_info; + context_gl->window = context->swapchain->win_handle; + if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE))) + { + WARN("Failed to retrieve device context, trying swapchain backup.\n"); + + if (!(context_gl->dc = swapchain_get_backup_dc(context->swapchain))) + { + ERR("Failed to retrieve a device context.\n"); + return E_FAIL; + } + context_gl->dc_is_private = TRUE; + } + list_init(&context_gl->fbo_list); list_init(&context_gl->fbo_destroy_list); @@ -2014,7 +1991,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi if (base + WINED3D_MAX_FRAGMENT_SAMPLERS > ARRAY_SIZE(context_gl->rev_tex_unit_map)) { ERR("Unexpected texture unit base index %u.\n", base); - return E_FAIL; + goto fail; } for (i = 0; i < min(count, WINED3D_MAX_FRAGMENT_SAMPLERS); ++i) { @@ -2026,7 +2003,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi if (base + WINED3D_MAX_VERTEX_SAMPLERS > ARRAY_SIZE(context_gl->rev_tex_unit_map)) { ERR("Unexpected texture unit base index %u.\n", base); - return E_FAIL; + goto fail; } for (i = 0; i < min(count, WINED3D_MAX_VERTEX_SAMPLERS); ++i) { @@ -2037,7 +2014,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi if (!(context_gl->texture_type = heap_calloc(gl_info->limits.combined_samplers, sizeof(*context_gl->texture_type)))) - return E_FAIL; + goto fail; target = &context->current_rt.texture->resource; target_bind_flags = target->bind_flags; @@ -2077,8 +2054,8 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi for (i = 0; i < ARRAY_SIZE(ds_formats); ++i) { ds_format = wined3d_get_format(device->adapter, ds_formats[i], WINED3D_BIND_DEPTH_STENCIL); - if ((context->pixel_format = context_choose_pixel_format(device, - context->hdc, color_format, ds_format, TRUE))) + if ((context_gl->pixel_format = context_choose_pixel_format(device, + context_gl->dc, color_format, ds_format, TRUE))) { swapchain->ds_format = ds_format; break; @@ -2090,8 +2067,8 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi } else { - context->pixel_format = context_choose_pixel_format(device, - context->hdc, color_format, swapchain->ds_format, TRUE); + context_gl->pixel_format = context_choose_pixel_format(device, + context_gl->dc, color_format, swapchain->ds_format, TRUE); } } else @@ -2106,41 +2083,38 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi * conflicting pixel formats. */ color_format = wined3d_get_format(device->adapter, WINED3DFMT_B8G8R8A8_UNORM, target_bind_flags); ds_format = wined3d_get_format(device->adapter, WINED3DFMT_UNKNOWN, WINED3D_BIND_DEPTH_STENCIL); - context->pixel_format = context_choose_pixel_format(device, - context->hdc, color_format, ds_format, FALSE); + context_gl->pixel_format = context_choose_pixel_format(device, + context_gl->dc, color_format, ds_format, FALSE); } - if (!context->pixel_format) - return E_FAIL; + if (!context_gl->pixel_format) + goto fail; wined3d_context_gl_enter(context_gl); if (!wined3d_context_gl_set_pixel_format(context_gl)) { - ERR("Failed to set pixel format %d on device context %p.\n", context->pixel_format, context->hdc); + ERR("Failed to set pixel format %d on device context %p.\n", context_gl->pixel_format, context_gl->dc); context_release(context); - heap_free(context_gl->texture_type); - return E_FAIL; + goto fail; } - share_ctx = device->context_count ? device->contexts[0]->glCtx : NULL; + share_ctx = device->context_count ? wined3d_context_gl(device->contexts[0])->gl_ctx : NULL; if (gl_info->p_wglCreateContextAttribsARB) { - if (!(ctx = context_create_wgl_attribs(gl_info, context->hdc, share_ctx))) + if (!(ctx = context_create_wgl_attribs(gl_info, context_gl->dc, share_ctx))) { context_release(context); - heap_free(context_gl->texture_type); - return E_FAIL; + goto fail; } } else { - if (!(ctx = wglCreateContext(context->hdc))) + if (!(ctx = wglCreateContext(context_gl->dc))) { ERR("Failed to create a WGL context.\n"); context_release(context); - heap_free(context_gl->texture_type); - return E_FAIL; + goto fail; } if (share_ctx && !wglShareLists(share_ctx, ctx)) @@ -2149,8 +2123,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi context_release(context); if (!wglDeleteContext(ctx)) ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError()); - heap_free(context_gl->texture_type); - return E_FAIL; + goto fail; } } @@ -2158,8 +2131,8 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi context_gl->draw_buffers_mask = context_generate_rt_mask(GL_BACK); context->valid = 1; - context->glCtx = ctx; - context->hdc_has_format = TRUE; + context_gl->gl_ctx = ctx; + context_gl->dc_has_format = TRUE; context->needs_set = 1; /* Set up the context defaults */ @@ -2169,8 +2142,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi context_release(context); if (!wglDeleteContext(ctx)) ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError()); - heap_free(context_gl->texture_type); - return E_FAIL; + goto fail; } if (context_debug_output_enabled(gl_info)) @@ -2201,7 +2173,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi } if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) - gl_info->gl_ops.gl.p_glGetIntegerv(GL_AUX_BUFFERS, &context->aux_buffers); + gl_info->gl_ops.gl.p_glGetIntegerv(GL_AUX_BUFFERS, &context_gl->aux_buffers); TRACE("Setting up the screen\n"); @@ -2314,14 +2286,18 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi checkGLcall("glScissor"); return WINED3D_OK; + +fail: + heap_free(context_gl->texture_type); + wined3d_release_dc(context_gl->window, context_gl->dc); + return E_FAIL; } HRESULT wined3d_context_vk_init(struct wined3d_context *context_vk, struct wined3d_swapchain *swapchain) { TRACE("context_vk %p, swapchain %p.\n", context_vk, swapchain); - if (!wined3d_context_init(context_vk, swapchain)) - return E_FAIL; + wined3d_context_init(context_vk, swapchain); return WINED3D_OK; } @@ -2422,7 +2398,7 @@ static void wined3d_context_gl_get_rt_size(const struct wined3d_context_gl *cont { RECT window_size; - GetClientRect(context_gl->c.win_handle, &window_size); + GetClientRect(context_gl->window, &window_size); size->cx = window_size.right - window_size.left; size->cy = window_size.bottom - window_size.top; @@ -2739,7 +2715,7 @@ GLenum wined3d_context_gl_get_offscreen_gl_buffer(const struct wined3d_context_g return GL_COLOR_ATTACHMENT0; case ORM_BACKBUFFER: - return context_gl->c.aux_buffers > 0 ? GL_AUX0 : GL_BACK; + return context_gl->aux_buffers > 0 ? GL_AUX0 : GL_BACK; default: FIXME("Unhandled offscreen rendering mode %#x.\n", wined3d_settings.offscreen_rendering_mode); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index baafaf8e3c3..54dfd964cd9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13015,7 +13015,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli if (dst_location == WINED3D_LOCATION_DRAWABLE) { d = *dst_rect; - wined3d_texture_translate_drawable_coords(dst_texture, context->win_handle, &d); + wined3d_texture_translate_drawable_coords(dst_texture, context_gl->window, &d); dst_rect = &d; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 40e8bc17f24..a30605b912a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -239,7 +239,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 TRACE("Source texture %p is onscreen.\n", src_texture); buffer = wined3d_texture_get_gl_buffer(src_texture); s = *src_rect; - wined3d_texture_translate_drawable_coords(src_texture, context->win_handle, &s); + wined3d_texture_translate_drawable_coords(src_texture, context_gl->window, &s); src_rect = &s; } else @@ -259,7 +259,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 TRACE("Destination texture %p is onscreen.\n", dst_texture); buffer = wined3d_texture_get_gl_buffer(dst_texture); d = *dst_rect; - wined3d_texture_translate_drawable_coords(dst_texture, context->win_handle, &d); + wined3d_texture_translate_drawable_coords(dst_texture, context_gl->window, &d); dst_rect = &d; } else @@ -1056,12 +1056,12 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_texture_gl *dst_texture, /* Try to use an aux buffer for drawing the rectangle. This way it doesn't need restoring. * This way we don't have to wait for the 2nd readback to finish to leave this function. */ - if (context->aux_buffers >= 2) + if (context_gl->aux_buffers >= 2) { /* Got more than one aux buffer? Use the 2nd aux buffer */ drawBuffer = GL_AUX1; } - else if ((!src_offscreen || offscreen_buffer == GL_BACK) && context->aux_buffers >= 1) + else if ((!src_offscreen || offscreen_buffer == GL_BACK) && context_gl->aux_buffers >= 1) { /* Only one aux buffer, but it isn't used (Onscreen rendering, or non-aux orm)? Use it! */ drawBuffer = GL_AUX0; @@ -2241,7 +2241,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (dst_location == WINED3D_LOCATION_DRAWABLE) { r = *dst_rect; - wined3d_texture_translate_drawable_coords(dst_texture, context->win_handle, &r); + wined3d_texture_translate_drawable_coords(dst_texture, context_gl->window, &r); dst_rect = &r; } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index fbedd7470df..4cefd80f802 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -428,6 +428,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const struct wined3d_fb_state *fb = &swapchain->device->cs->fb; struct wined3d_rendertarget_view *dsv = fb->depth_stencil; const struct wined3d_gl_info *gl_info; + struct wined3d_context_gl *context_gl; struct wined3d_texture *logo_texture; struct wined3d_context *context; BOOL render_to_fbo; @@ -439,6 +440,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, WARN("Invalid context, skipping present.\n"); return; } + context_gl = wined3d_context_gl(context); gl_info = context->gl_info; @@ -481,7 +483,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, WINED3D_BLT_ALPHA_TEST, NULL, WINED3D_TEXF_POINT); } - TRACE("Presenting HDC %p.\n", context->hdc); + TRACE("Presenting DC %p.\n", context_gl->dc); if (!(render_to_fbo = swapchain->render_to_fbo) && (src_rect->left || src_rect->top @@ -518,7 +520,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, gl_info->gl_ops.gl.p_glFinish(); /* call wglSwapBuffers through the gl table to avoid confusing the Steam overlay */ - gl_info->gl_ops.wgl.p_wglSwapBuffers(context->hdc); + gl_info->gl_ops.wgl.p_wglSwapBuffers(context_gl->dc); wined3d_swapchain_gl_rotate(swapchain, context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c945d9b4daf..a373cc97b9b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1927,8 +1927,7 @@ struct wined3d_context DWORD lowest_disabled_stage : 4; /* Max WINED3D_MAX_TEXTURES, 8 */ DWORD use_immediate_mode_draw : 1; DWORD needs_set : 1; - DWORD hdc_is_private : 1; - DWORD hdc_has_format : 1; /* only meaningful if hdc_is_private */ + DWORD num_untracked_materials : 2; /* Max value 2 */ DWORD update_shader_resource_bindings : 1; DWORD update_compute_shader_resource_bindings : 1; @@ -1939,8 +1938,7 @@ struct wined3d_context DWORD transform_feedback_paused : 1; DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */ DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ - DWORD num_untracked_materials : 2; /* Max value 2 */ - DWORD padding : 9; + DWORD padding : 11; DWORD constant_update_mask; DWORD numbered_array_mask; @@ -1952,17 +1950,7 @@ struct wined3d_context UINT instance_count; - /* The actual opengl context */ UINT level; - HGLRC restore_ctx; - HDC restore_dc; - int restore_pf; - HWND restore_pf_win; - HGLRC glCtx; - HWND win_handle; - HDC hdc; - int pixel_format; - GLint aux_buffers; void *shader_backend_data; void *fragment_pipe_data; @@ -1986,15 +1974,28 @@ struct wined3d_context_gl { struct wined3d_context c; + uint32_t dc_is_private : 1; + uint32_t dc_has_format : 1; /* Only meaningful for private DCs. */ uint32_t fog_enabled : 1; uint32_t diffuse_attrib_to_1 : 1; uint32_t rebind_fbo : 1; - uint32_t padding : 29; + uint32_t padding : 27; uint32_t default_attrib_value_set; GLenum *texture_type; + /* The WGL context. */ + HGLRC restore_ctx; + HDC restore_dc; + int restore_pf; + HWND restore_pf_win; + HGLRC gl_ctx; + HDC dc; + int pixel_format; + HWND window; + GLint aux_buffers; + /* FBOs. */ unsigned int fbo_entry_count; struct list fbo_list; -- 2.11.0

1 0