- wine-devel - winehq.org

[PATCH] dwrite: Support IDWriteTextFormat2 for layout.
by Nikolay Sivov 21 May '18

21 May '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Another thing that was fixed in Windows 10 1803. dlls/dwrite/layout.c | 248 +++++++++++++++++++++---------------- dlls/dwrite/tests/layout.c | 14 ++- 2 files changed, 149 insertions(+), 113 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 104b039231..65e0a57678 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -242,7 +242,7 @@ enum layout_recompute_mask { struct dwrite_textlayout { IDWriteTextLayout3 IDWriteTextLayout3_iface; - IDWriteTextFormat1 IDWriteTextFormat1_iface; + IDWriteTextFormat2 IDWriteTextFormat2_iface; IDWriteTextAnalysisSink1 IDWriteTextAnalysisSink1_iface; IDWriteTextAnalysisSource1 IDWriteTextAnalysisSource1_iface; LONG ref; @@ -326,9 +326,9 @@ static inline struct dwrite_textlayout *impl_from_IDWriteTextLayout3(IDWriteText return CONTAINING_RECORD(iface, struct dwrite_textlayout, IDWriteTextLayout3_iface); } -static inline struct dwrite_textlayout *impl_layout_from_IDWriteTextFormat1(IDWriteTextFormat1 *iface) +static inline struct dwrite_textlayout *impl_layout_from_IDWriteTextFormat2(IDWriteTextFormat2 *iface) { - return CONTAINING_RECORD(iface, struct dwrite_textlayout, IDWriteTextFormat1_iface); + return CONTAINING_RECORD(iface, struct dwrite_textlayout, IDWriteTextFormat2_iface); } static inline struct dwrite_textlayout *impl_from_IDWriteTextAnalysisSink1(IDWriteTextAnalysisSink1 *iface) @@ -2814,9 +2814,10 @@ static HRESULT WINAPI dwritetextlayout_QueryInterface(IDWriteTextLayout3 *iface, { *obj = iface; } - else if (IsEqualIID(riid, &IID_IDWriteTextFormat1) || + else if (IsEqualIID(riid, &IID_IDWriteTextFormat2) || + IsEqualIID(riid, &IID_IDWriteTextFormat1) || IsEqualIID(riid, &IID_IDWriteTextFormat)) - *obj = &This->IDWriteTextFormat1_iface; + *obj = &This->IDWriteTextFormat2_iface; if (*obj) { IDWriteTextLayout3_AddRef(iface); @@ -2865,39 +2866,39 @@ static ULONG WINAPI dwritetextlayout_Release(IDWriteTextLayout3 *iface) static HRESULT WINAPI dwritetextlayout_SetTextAlignment(IDWriteTextLayout3 *iface, DWRITE_TEXT_ALIGNMENT alignment) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - return IDWriteTextFormat1_SetTextAlignment(&This->IDWriteTextFormat1_iface, alignment); + return IDWriteTextFormat2_SetTextAlignment(&This->IDWriteTextFormat2_iface, alignment); } static HRESULT WINAPI dwritetextlayout_SetParagraphAlignment(IDWriteTextLayout3 *iface, DWRITE_PARAGRAPH_ALIGNMENT alignment) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - return IDWriteTextFormat1_SetParagraphAlignment(&This->IDWriteTextFormat1_iface, alignment); + return IDWriteTextFormat2_SetParagraphAlignment(&This->IDWriteTextFormat2_iface, alignment); } static HRESULT WINAPI dwritetextlayout_SetWordWrapping(IDWriteTextLayout3 *iface, DWRITE_WORD_WRAPPING wrapping) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - return IDWriteTextFormat1_SetWordWrapping(&This->IDWriteTextFormat1_iface, wrapping); + return IDWriteTextFormat2_SetWordWrapping(&This->IDWriteTextFormat2_iface, wrapping); } static HRESULT WINAPI dwritetextlayout_SetReadingDirection(IDWriteTextLayout3 *iface, DWRITE_READING_DIRECTION direction) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - return IDWriteTextFormat1_SetReadingDirection(&This->IDWriteTextFormat1_iface, direction); + return IDWriteTextFormat2_SetReadingDirection(&This->IDWriteTextFormat2_iface, direction); } static HRESULT WINAPI dwritetextlayout_SetFlowDirection(IDWriteTextLayout3 *iface, DWRITE_FLOW_DIRECTION direction) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); TRACE("(%p)->(%d)\n", This, direction); - return IDWriteTextFormat1_SetFlowDirection(&This->IDWriteTextFormat1_iface, direction); + return IDWriteTextFormat2_SetFlowDirection(&This->IDWriteTextFormat2_iface, direction); } static HRESULT WINAPI dwritetextlayout_SetIncrementalTabStop(IDWriteTextLayout3 *iface, FLOAT tabstop) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); TRACE("(%p)->(%.2f)\n", This, tabstop); - return IDWriteTextFormat1_SetIncrementalTabStop(&This->IDWriteTextFormat1_iface, tabstop); + return IDWriteTextFormat2_SetIncrementalTabStop(&This->IDWriteTextFormat2_iface, tabstop); } static HRESULT WINAPI dwritetextlayout_SetTrimming(IDWriteTextLayout3 *iface, DWRITE_TRIMMING const *trimming, @@ -2905,7 +2906,7 @@ static HRESULT WINAPI dwritetextlayout_SetTrimming(IDWriteTextLayout3 *iface, DW { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); TRACE("(%p)->(%p %p)\n", This, trimming, trimming_sign); - return IDWriteTextFormat1_SetTrimming(&This->IDWriteTextFormat1_iface, trimming, trimming_sign); + return IDWriteTextFormat2_SetTrimming(&This->IDWriteTextFormat2_iface, trimming, trimming_sign); } static HRESULT WINAPI dwritetextlayout_SetLineSpacing(IDWriteTextLayout3 *iface, DWRITE_LINE_SPACING_METHOD spacing, @@ -2913,111 +2914,113 @@ static HRESULT WINAPI dwritetextlayout_SetLineSpacing(IDWriteTextLayout3 *iface, { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); TRACE("(%p)->(%d %.2f %.2f)\n", This, spacing, line_spacing, baseline); - return IDWriteTextFormat1_SetLineSpacing(&This->IDWriteTextFormat1_iface, spacing, line_spacing, baseline); + return IDWriteTextFormat1_SetLineSpacing((IDWriteTextFormat1 *)&This->IDWriteTextFormat2_iface, spacing, + line_spacing, baseline); } static DWRITE_TEXT_ALIGNMENT WINAPI dwritetextlayout_GetTextAlignment(IDWriteTextLayout3 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - return IDWriteTextFormat1_GetTextAlignment(&This->IDWriteTextFormat1_iface); + return IDWriteTextFormat2_GetTextAlignment(&This->IDWriteTextFormat2_iface); } static DWRITE_PARAGRAPH_ALIGNMENT WINAPI dwritetextlayout_GetParagraphAlignment(IDWriteTextLayout3 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - return IDWriteTextFormat1_GetParagraphAlignment(&This->IDWriteTextFormat1_iface); + return IDWriteTextFormat2_GetParagraphAlignment(&This->IDWriteTextFormat2_iface); } static DWRITE_WORD_WRAPPING WINAPI dwritetextlayout_GetWordWrapping(IDWriteTextLayout3 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - return IDWriteTextFormat1_GetWordWrapping(&This->IDWriteTextFormat1_iface); + return IDWriteTextFormat2_GetWordWrapping(&This->IDWriteTextFormat2_iface); } static DWRITE_READING_DIRECTION WINAPI dwritetextlayout_GetReadingDirection(IDWriteTextLayout3 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - return IDWriteTextFormat1_GetReadingDirection(&This->IDWriteTextFormat1_iface); + return IDWriteTextFormat2_GetReadingDirection(&This->IDWriteTextFormat2_iface); } static DWRITE_FLOW_DIRECTION WINAPI dwritetextlayout_GetFlowDirection(IDWriteTextLayout3 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - return IDWriteTextFormat1_GetFlowDirection(&This->IDWriteTextFormat1_iface); + return IDWriteTextFormat2_GetFlowDirection(&This->IDWriteTextFormat2_iface); } static FLOAT WINAPI dwritetextlayout_GetIncrementalTabStop(IDWriteTextLayout3 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - return IDWriteTextFormat1_GetIncrementalTabStop(&This->IDWriteTextFormat1_iface); + return IDWriteTextFormat2_GetIncrementalTabStop(&This->IDWriteTextFormat2_iface); } static HRESULT WINAPI dwritetextlayout_GetTrimming(IDWriteTextLayout3 *iface, DWRITE_TRIMMING *options, IDWriteInlineObject **trimming_sign) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - return IDWriteTextFormat1_GetTrimming(&This->IDWriteTextFormat1_iface, options, trimming_sign); + return IDWriteTextFormat2_GetTrimming(&This->IDWriteTextFormat2_iface, options, trimming_sign); } static HRESULT WINAPI dwritetextlayout_GetLineSpacing(IDWriteTextLayout3 *iface, DWRITE_LINE_SPACING_METHOD *method, FLOAT *spacing, FLOAT *baseline) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - return IDWriteTextFormat_GetLineSpacing((IDWriteTextFormat*)&This->IDWriteTextFormat1_iface, method, spacing, baseline); + return IDWriteTextFormat_GetLineSpacing((IDWriteTextFormat *)&This->IDWriteTextFormat2_iface, method, + spacing, baseline); } static HRESULT WINAPI dwritetextlayout_GetFontCollection(IDWriteTextLayout3 *iface, IDWriteFontCollection **collection) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - return IDWriteTextFormat1_GetFontCollection(&This->IDWriteTextFormat1_iface, collection); + return IDWriteTextFormat2_GetFontCollection(&This->IDWriteTextFormat2_iface, collection); } static UINT32 WINAPI dwritetextlayout_GetFontFamilyNameLength(IDWriteTextLayout3 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - return IDWriteTextFormat1_GetFontFamilyNameLength(&This->IDWriteTextFormat1_iface); + return IDWriteTextFormat2_GetFontFamilyNameLength(&This->IDWriteTextFormat2_iface); } static HRESULT WINAPI dwritetextlayout_GetFontFamilyName(IDWriteTextLayout3 *iface, WCHAR *name, UINT32 size) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - return IDWriteTextFormat1_GetFontFamilyName(&This->IDWriteTextFormat1_iface, name, size); + return IDWriteTextFormat2_GetFontFamilyName(&This->IDWriteTextFormat2_iface, name, size); } static DWRITE_FONT_WEIGHT WINAPI dwritetextlayout_GetFontWeight(IDWriteTextLayout3 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - return IDWriteTextFormat1_GetFontWeight(&This->IDWriteTextFormat1_iface); + return IDWriteTextFormat2_GetFontWeight(&This->IDWriteTextFormat2_iface); } static DWRITE_FONT_STYLE WINAPI dwritetextlayout_GetFontStyle(IDWriteTextLayout3 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - return IDWriteTextFormat1_GetFontStyle(&This->IDWriteTextFormat1_iface); + return IDWriteTextFormat2_GetFontStyle(&This->IDWriteTextFormat2_iface); } static DWRITE_FONT_STRETCH WINAPI dwritetextlayout_GetFontStretch(IDWriteTextLayout3 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - return IDWriteTextFormat1_GetFontStretch(&This->IDWriteTextFormat1_iface); + return IDWriteTextFormat2_GetFontStretch(&This->IDWriteTextFormat2_iface); } static FLOAT WINAPI dwritetextlayout_GetFontSize(IDWriteTextLayout3 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - return IDWriteTextFormat1_GetFontSize(&This->IDWriteTextFormat1_iface); + return IDWriteTextFormat2_GetFontSize(&This->IDWriteTextFormat2_iface); } static UINT32 WINAPI dwritetextlayout_GetLocaleNameLength(IDWriteTextLayout3 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - return IDWriteTextFormat1_GetLocaleNameLength(&This->IDWriteTextFormat1_iface); + return IDWriteTextFormat2_GetLocaleNameLength(&This->IDWriteTextFormat2_iface); } static HRESULT WINAPI dwritetextlayout_GetLocaleName(IDWriteTextLayout3 *iface, WCHAR *name, UINT32 size) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - return IDWriteTextFormat1_GetLocaleName(&This->IDWriteTextFormat1_iface, name, size); + return IDWriteTextFormat2_GetLocaleName(&This->IDWriteTextFormat2_iface, name, size); } static HRESULT WINAPI dwritetextlayout_SetMaxWidth(IDWriteTextLayout3 *iface, FLOAT maxWidth) @@ -3950,28 +3953,28 @@ static HRESULT WINAPI dwritetextlayout2_SetLastLineWrapping(IDWriteTextLayout3 * { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); TRACE("(%p)->(%d)\n", This, lastline_wrapping_enabled); - return IDWriteTextFormat1_SetLastLineWrapping(&This->IDWriteTextFormat1_iface, lastline_wrapping_enabled); + return IDWriteTextFormat2_SetLastLineWrapping(&This->IDWriteTextFormat2_iface, lastline_wrapping_enabled); } static BOOL WINAPI dwritetextlayout2_GetLastLineWrapping(IDWriteTextLayout3 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); TRACE("(%p)\n", This); - return IDWriteTextFormat1_GetLastLineWrapping(&This->IDWriteTextFormat1_iface); + return IDWriteTextFormat2_GetLastLineWrapping(&This->IDWriteTextFormat2_iface); } static HRESULT WINAPI dwritetextlayout2_SetOpticalAlignment(IDWriteTextLayout3 *iface, DWRITE_OPTICAL_ALIGNMENT alignment) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); TRACE("(%p)->(%d)\n", This, alignment); - return IDWriteTextFormat1_SetOpticalAlignment(&This->IDWriteTextFormat1_iface, alignment); + return IDWriteTextFormat2_SetOpticalAlignment(&This->IDWriteTextFormat2_iface, alignment); } static DWRITE_OPTICAL_ALIGNMENT WINAPI dwritetextlayout2_GetOpticalAlignment(IDWriteTextLayout3 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); TRACE("(%p)\n", This); - return IDWriteTextFormat1_GetOpticalAlignment(&This->IDWriteTextFormat1_iface); + return IDWriteTextFormat2_GetOpticalAlignment(&This->IDWriteTextFormat2_iface); } static HRESULT WINAPI dwritetextlayout2_SetFontFallback(IDWriteTextLayout3 *iface, IDWriteFontFallback *fallback) @@ -4142,28 +4145,29 @@ static const IDWriteTextLayout3Vtbl dwritetextlayoutvtbl = { dwritetextlayout3_GetLineMetrics }; -static HRESULT WINAPI dwritetextformat_layout_QueryInterface(IDWriteTextFormat1 *iface, REFIID riid, void **obj) +static HRESULT WINAPI dwritetextformat_layout_QueryInterface(IDWriteTextFormat2 *iface, REFIID riid, void **obj) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); return IDWriteTextLayout3_QueryInterface(&This->IDWriteTextLayout3_iface, riid, obj); } -static ULONG WINAPI dwritetextformat_layout_AddRef(IDWriteTextFormat1 *iface) +static ULONG WINAPI dwritetextformat_layout_AddRef(IDWriteTextFormat2 *iface) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); return IDWriteTextLayout3_AddRef(&This->IDWriteTextLayout3_iface); } -static ULONG WINAPI dwritetextformat_layout_Release(IDWriteTextFormat1 *iface) +static ULONG WINAPI dwritetextformat_layout_Release(IDWriteTextFormat2 *iface) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); return IDWriteTextLayout3_Release(&This->IDWriteTextLayout3_iface); } -static HRESULT WINAPI dwritetextformat_layout_SetTextAlignment(IDWriteTextFormat1 *iface, DWRITE_TEXT_ALIGNMENT alignment) +static HRESULT WINAPI dwritetextformat_layout_SetTextAlignment(IDWriteTextFormat2 *iface, + DWRITE_TEXT_ALIGNMENT alignment) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); BOOL changed; HRESULT hr; @@ -4183,9 +4187,10 @@ static HRESULT WINAPI dwritetextformat_layout_SetTextAlignment(IDWriteTextFormat return S_OK; } -static HRESULT WINAPI dwritetextformat_layout_SetParagraphAlignment(IDWriteTextFormat1 *iface, DWRITE_PARAGRAPH_ALIGNMENT alignment) +static HRESULT WINAPI dwritetextformat_layout_SetParagraphAlignment(IDWriteTextFormat2 *iface, + DWRITE_PARAGRAPH_ALIGNMENT alignment) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); BOOL changed; HRESULT hr; @@ -4205,9 +4210,9 @@ static HRESULT WINAPI dwritetextformat_layout_SetParagraphAlignment(IDWriteTextF return S_OK; } -static HRESULT WINAPI dwritetextformat_layout_SetWordWrapping(IDWriteTextFormat1 *iface, DWRITE_WORD_WRAPPING wrapping) +static HRESULT WINAPI dwritetextformat_layout_SetWordWrapping(IDWriteTextFormat2 *iface, DWRITE_WORD_WRAPPING wrapping) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); BOOL changed; HRESULT hr; @@ -4223,9 +4228,10 @@ static HRESULT WINAPI dwritetextformat_layout_SetWordWrapping(IDWriteTextFormat1 return S_OK; } -static HRESULT WINAPI dwritetextformat_layout_SetReadingDirection(IDWriteTextFormat1 *iface, DWRITE_READING_DIRECTION direction) +static HRESULT WINAPI dwritetextformat_layout_SetReadingDirection(IDWriteTextFormat2 *iface, + DWRITE_READING_DIRECTION direction) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); BOOL changed; HRESULT hr; @@ -4241,9 +4247,10 @@ static HRESULT WINAPI dwritetextformat_layout_SetReadingDirection(IDWriteTextFor return S_OK; } -static HRESULT WINAPI dwritetextformat_layout_SetFlowDirection(IDWriteTextFormat1 *iface, DWRITE_FLOW_DIRECTION direction) +static HRESULT WINAPI dwritetextformat_layout_SetFlowDirection(IDWriteTextFormat2 *iface, + DWRITE_FLOW_DIRECTION direction) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); BOOL changed; HRESULT hr; @@ -4259,17 +4266,17 @@ static HRESULT WINAPI dwritetextformat_layout_SetFlowDirection(IDWriteTextFormat return S_OK; } -static HRESULT WINAPI dwritetextformat_layout_SetIncrementalTabStop(IDWriteTextFormat1 *iface, FLOAT tabstop) +static HRESULT WINAPI dwritetextformat_layout_SetIncrementalTabStop(IDWriteTextFormat2 *iface, FLOAT tabstop) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); FIXME("(%p)->(%f): stub\n", This, tabstop); return S_OK; } -static HRESULT WINAPI dwritetextformat_layout_SetTrimming(IDWriteTextFormat1 *iface, DWRITE_TRIMMING const *trimming, +static HRESULT WINAPI dwritetextformat_layout_SetTrimming(IDWriteTextFormat2 *iface, DWRITE_TRIMMING const *trimming, IDWriteInlineObject *trimming_sign) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); BOOL changed; HRESULT hr; @@ -4283,10 +4290,10 @@ static HRESULT WINAPI dwritetextformat_layout_SetTrimming(IDWriteTextFormat1 *if return hr; } -static HRESULT WINAPI dwritetextformat_layout_SetLineSpacing(IDWriteTextFormat1 *iface, DWRITE_LINE_SPACING_METHOD method, - FLOAT height, FLOAT baseline) +static HRESULT WINAPI dwritetextformat_layout_SetLineSpacing(IDWriteTextFormat2 *iface, + DWRITE_LINE_SPACING_METHOD method, FLOAT height, FLOAT baseline) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); DWRITE_LINE_SPACING spacing; TRACE("(%p)->(%d %f %f)\n", This, method, height, baseline); @@ -4298,52 +4305,52 @@ static HRESULT WINAPI dwritetextformat_layout_SetLineSpacing(IDWriteTextFormat1 return IDWriteTextLayout3_SetLineSpacing(&This->IDWriteTextLayout3_iface, &spacing); } -static DWRITE_TEXT_ALIGNMENT WINAPI dwritetextformat_layout_GetTextAlignment(IDWriteTextFormat1 *iface) +static DWRITE_TEXT_ALIGNMENT WINAPI dwritetextformat_layout_GetTextAlignment(IDWriteTextFormat2 *iface) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); TRACE("(%p)\n", This); return This->format.textalignment; } -static DWRITE_PARAGRAPH_ALIGNMENT WINAPI dwritetextformat_layout_GetParagraphAlignment(IDWriteTextFormat1 *iface) +static DWRITE_PARAGRAPH_ALIGNMENT WINAPI dwritetextformat_layout_GetParagraphAlignment(IDWriteTextFormat2 *iface) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); TRACE("(%p)\n", This); return This->format.paralign; } -static DWRITE_WORD_WRAPPING WINAPI dwritetextformat_layout_GetWordWrapping(IDWriteTextFormat1 *iface) +static DWRITE_WORD_WRAPPING WINAPI dwritetextformat_layout_GetWordWrapping(IDWriteTextFormat2 *iface) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); TRACE("(%p)\n", This); return This->format.wrapping; } -static DWRITE_READING_DIRECTION WINAPI dwritetextformat_layout_GetReadingDirection(IDWriteTextFormat1 *iface) +static DWRITE_READING_DIRECTION WINAPI dwritetextformat_layout_GetReadingDirection(IDWriteTextFormat2 *iface) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); TRACE("(%p)\n", This); return This->format.readingdir; } -static DWRITE_FLOW_DIRECTION WINAPI dwritetextformat_layout_GetFlowDirection(IDWriteTextFormat1 *iface) +static DWRITE_FLOW_DIRECTION WINAPI dwritetextformat_layout_GetFlowDirection(IDWriteTextFormat2 *iface) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); TRACE("(%p)\n", This); return This->format.flow; } -static FLOAT WINAPI dwritetextformat_layout_GetIncrementalTabStop(IDWriteTextFormat1 *iface) +static FLOAT WINAPI dwritetextformat_layout_GetIncrementalTabStop(IDWriteTextFormat2 *iface) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); FIXME("(%p): stub\n", This); return 0.0f; } -static HRESULT WINAPI dwritetextformat_layout_GetTrimming(IDWriteTextFormat1 *iface, DWRITE_TRIMMING *options, +static HRESULT WINAPI dwritetextformat_layout_GetTrimming(IDWriteTextFormat2 *iface, DWRITE_TRIMMING *options, IDWriteInlineObject **trimming_sign) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); TRACE("(%p)->(%p %p)\n", This, options, trimming_sign); @@ -4354,10 +4361,10 @@ static HRESULT WINAPI dwritetextformat_layout_GetTrimming(IDWriteTextFormat1 *if return S_OK; } -static HRESULT WINAPI dwritetextformat_layout_GetLineSpacing(IDWriteTextFormat1 *iface, DWRITE_LINE_SPACING_METHOD *method, - FLOAT *spacing, FLOAT *baseline) +static HRESULT WINAPI dwritetextformat_layout_GetLineSpacing(IDWriteTextFormat2 *iface, + DWRITE_LINE_SPACING_METHOD *method, FLOAT *spacing, FLOAT *baseline) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); TRACE("(%p)->(%p %p %p)\n", This, method, spacing, baseline); @@ -4367,9 +4374,10 @@ static HRESULT WINAPI dwritetextformat_layout_GetLineSpacing(IDWriteTextFormat1 return S_OK; } -static HRESULT WINAPI dwritetextformat_layout_GetFontCollection(IDWriteTextFormat1 *iface, IDWriteFontCollection **collection) +static HRESULT WINAPI dwritetextformat_layout_GetFontCollection(IDWriteTextFormat2 *iface, + IDWriteFontCollection **collection) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); TRACE("(%p)->(%p)\n", This, collection); @@ -4379,16 +4387,16 @@ static HRESULT WINAPI dwritetextformat_layout_GetFontCollection(IDWriteTextForma return S_OK; } -static UINT32 WINAPI dwritetextformat_layout_GetFontFamilyNameLength(IDWriteTextFormat1 *iface) +static UINT32 WINAPI dwritetextformat_layout_GetFontFamilyNameLength(IDWriteTextFormat2 *iface) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); TRACE("(%p)\n", This); return This->format.family_len; } -static HRESULT WINAPI dwritetextformat_layout_GetFontFamilyName(IDWriteTextFormat1 *iface, WCHAR *name, UINT32 size) +static HRESULT WINAPI dwritetextformat_layout_GetFontFamilyName(IDWriteTextFormat2 *iface, WCHAR *name, UINT32 size) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); TRACE("(%p)->(%p %u)\n", This, name, size); @@ -4397,44 +4405,44 @@ static HRESULT WINAPI dwritetextformat_layout_GetFontFamilyName(IDWriteTextForma return S_OK; } -static DWRITE_FONT_WEIGHT WINAPI dwritetextformat_layout_GetFontWeight(IDWriteTextFormat1 *iface) +static DWRITE_FONT_WEIGHT WINAPI dwritetextformat_layout_GetFontWeight(IDWriteTextFormat2 *iface) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); TRACE("(%p)\n", This); return This->format.weight; } -static DWRITE_FONT_STYLE WINAPI dwritetextformat_layout_GetFontStyle(IDWriteTextFormat1 *iface) +static DWRITE_FONT_STYLE WINAPI dwritetextformat_layout_GetFontStyle(IDWriteTextFormat2 *iface) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); TRACE("(%p)\n", This); return This->format.style; } -static DWRITE_FONT_STRETCH WINAPI dwritetextformat_layout_GetFontStretch(IDWriteTextFormat1 *iface) +static DWRITE_FONT_STRETCH WINAPI dwritetextformat_layout_GetFontStretch(IDWriteTextFormat2 *iface) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); TRACE("(%p)\n", This); return This->format.stretch; } -static FLOAT WINAPI dwritetextformat_layout_GetFontSize(IDWriteTextFormat1 *iface) +static FLOAT WINAPI dwritetextformat_layout_GetFontSize(IDWriteTextFormat2 *iface) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); TRACE("(%p)\n", This); return This->format.fontsize; } -static UINT32 WINAPI dwritetextformat_layout_GetLocaleNameLength(IDWriteTextFormat1 *iface) +static UINT32 WINAPI dwritetextformat_layout_GetLocaleNameLength(IDWriteTextFormat2 *iface) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); TRACE("(%p)\n", This); return This->format.locale_len; } -static HRESULT WINAPI dwritetextformat_layout_GetLocaleName(IDWriteTextFormat1 *iface, WCHAR *name, UINT32 size) +static HRESULT WINAPI dwritetextformat_layout_GetLocaleName(IDWriteTextFormat2 *iface, WCHAR *name, UINT32 size) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); TRACE("(%p)->(%p %u)\n", This, name, size); @@ -4443,23 +4451,25 @@ static HRESULT WINAPI dwritetextformat_layout_GetLocaleName(IDWriteTextFormat1 * return S_OK; } -static HRESULT WINAPI dwritetextformat1_layout_SetVerticalGlyphOrientation(IDWriteTextFormat1 *iface, DWRITE_VERTICAL_GLYPH_ORIENTATION orientation) +static HRESULT WINAPI dwritetextformat1_layout_SetVerticalGlyphOrientation(IDWriteTextFormat2 *iface, + DWRITE_VERTICAL_GLYPH_ORIENTATION orientation) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); FIXME("(%p)->(%d): stub\n", This, orientation); return E_NOTIMPL; } -static DWRITE_VERTICAL_GLYPH_ORIENTATION WINAPI dwritetextformat1_layout_GetVerticalGlyphOrientation(IDWriteTextFormat1 *iface) +static DWRITE_VERTICAL_GLYPH_ORIENTATION WINAPI dwritetextformat1_layout_GetVerticalGlyphOrientation(IDWriteTextFormat2 *iface) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); FIXME("(%p): stub\n", This); return DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT; } -static HRESULT WINAPI dwritetextformat1_layout_SetLastLineWrapping(IDWriteTextFormat1 *iface, BOOL lastline_wrapping_enabled) +static HRESULT WINAPI dwritetextformat1_layout_SetLastLineWrapping(IDWriteTextFormat2 *iface, + BOOL lastline_wrapping_enabled) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); TRACE("(%p)->(%d)\n", This, lastline_wrapping_enabled); @@ -4467,42 +4477,58 @@ static HRESULT WINAPI dwritetextformat1_layout_SetLastLineWrapping(IDWriteTextFo return S_OK; } -static BOOL WINAPI dwritetextformat1_layout_GetLastLineWrapping(IDWriteTextFormat1 *iface) +static BOOL WINAPI dwritetextformat1_layout_GetLastLineWrapping(IDWriteTextFormat2 *iface) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); TRACE("(%p)\n", This); return This->format.last_line_wrapping; } -static HRESULT WINAPI dwritetextformat1_layout_SetOpticalAlignment(IDWriteTextFormat1 *iface, DWRITE_OPTICAL_ALIGNMENT alignment) +static HRESULT WINAPI dwritetextformat1_layout_SetOpticalAlignment(IDWriteTextFormat2 *iface, + DWRITE_OPTICAL_ALIGNMENT alignment) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); TRACE("(%p)->(%d)\n", This, alignment); return format_set_optical_alignment(&This->format, alignment); } -static DWRITE_OPTICAL_ALIGNMENT WINAPI dwritetextformat1_layout_GetOpticalAlignment(IDWriteTextFormat1 *iface) +static DWRITE_OPTICAL_ALIGNMENT WINAPI dwritetextformat1_layout_GetOpticalAlignment(IDWriteTextFormat2 *iface) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); TRACE("(%p)\n", This); return This->format.optical_alignment; } -static HRESULT WINAPI dwritetextformat1_layout_SetFontFallback(IDWriteTextFormat1 *iface, IDWriteFontFallback *fallback) +static HRESULT WINAPI dwritetextformat1_layout_SetFontFallback(IDWriteTextFormat2 *iface, + IDWriteFontFallback *fallback) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); TRACE("(%p)->(%p)\n", This, fallback); return IDWriteTextLayout3_SetFontFallback(&This->IDWriteTextLayout3_iface, fallback); } -static HRESULT WINAPI dwritetextformat1_layout_GetFontFallback(IDWriteTextFormat1 *iface, IDWriteFontFallback **fallback) +static HRESULT WINAPI dwritetextformat1_layout_GetFontFallback(IDWriteTextFormat2 *iface, + IDWriteFontFallback **fallback) { - struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); TRACE("(%p)->(%p)\n", This, fallback); return IDWriteTextLayout3_GetFontFallback(&This->IDWriteTextLayout3_iface, fallback); } -static const IDWriteTextFormat1Vtbl dwritetextformat1_layout_vtbl = { +static HRESULT WINAPI dwritetextformat2_layout_SetLineSpacing(IDWriteTextFormat2 *iface, + DWRITE_LINE_SPACING const *spacing) +{ + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); + return IDWriteTextLayout3_SetLineSpacing(&This->IDWriteTextLayout3_iface, spacing); +} + +static HRESULT WINAPI dwritetextformat2_layout_GetLineSpacing(IDWriteTextFormat2 *iface, DWRITE_LINE_SPACING *spacing) +{ + struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); + return IDWriteTextLayout3_GetLineSpacing(&This->IDWriteTextLayout3_iface, spacing); +} + +static const IDWriteTextFormat2Vtbl dwritetextformat2_layout_vtbl = { dwritetextformat_layout_QueryInterface, dwritetextformat_layout_AddRef, dwritetextformat_layout_Release, @@ -4539,6 +4565,8 @@ static const IDWriteTextFormat1Vtbl dwritetextformat1_layout_vtbl = { dwritetextformat1_layout_GetOpticalAlignment, dwritetextformat1_layout_SetFontFallback, dwritetextformat1_layout_GetFontFallback, + dwritetextformat2_layout_SetLineSpacing, + dwritetextformat2_layout_GetLineSpacing, }; static HRESULT WINAPI dwritetextlayout_sink_QueryInterface(IDWriteTextAnalysisSink1 *iface, @@ -4913,7 +4941,7 @@ static HRESULT init_textlayout(const struct textlayout_desc *desc, struct dwrite HRESULT hr; layout->IDWriteTextLayout3_iface.lpVtbl = &dwritetextlayoutvtbl; - layout->IDWriteTextFormat1_iface.lpVtbl = &dwritetextformat1_layout_vtbl; + layout->IDWriteTextFormat2_iface.lpVtbl = &dwritetextformat2_layout_vtbl; layout->IDWriteTextAnalysisSink1_iface.lpVtbl = &dwritetextlayoutsinkvtbl; layout->IDWriteTextAnalysisSource1_iface.lpVtbl = &dwritetextlayoutsourcevtbl; layout->ref = 1; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index b54748a92f..71ff5fa712 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -5329,17 +5329,25 @@ static void test_InvalidateLayout(void) IDWriteTextFormat2_Release(format2); hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextFormat2, (void**)&format2); - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Unexpected hr %#x.\n", hr); + if (hr == S_OK) { + ok(format != (IDWriteTextFormat *)format2, "Unexpected interface pointer.\n"); + IDWriteTextFormat2_Release(format2); + } hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextFormat1, (void**)&format1); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteTextFormat1_QueryInterface(format1, &IID_IDWriteTextFormat2, (void**)&format2); - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Unexpected hr %#x.\n", hr); + if (hr == S_OK) + IDWriteTextFormat2_Release(format2); IDWriteTextFormat1_Release(format1); hr = IDWriteTextLayout3_QueryInterface(layout3, &IID_IDWriteTextFormat2, (void**)&format2); - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + ok(hr == S_OK || broken(hr == E_NOINTERFACE), "got 0x%08x\n", hr); + if (hr == S_OK) + IDWriteTextFormat2_Release(format2); hr = IDWriteTextLayout3_InvalidateLayout(layout3); ok(hr == S_OK, "got 0x%08x\n", hr); -- 2.17.0

1 0

[PATCH] dwrite: Support IDWriteFontList1 for font families.
by Nikolay Sivov 21 May '18

21 May '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- That's fixed now in Window 10 1803. dlls/dwrite/font.c | 84 +++++++++++++++++++++++++++++++++++++++- dlls/dwrite/tests/font.c | 14 ++++++- 2 files changed, 95 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c7824b6d07..9556fd3756 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -124,6 +124,7 @@ struct dwrite_fontcollection { struct dwrite_fontfamily { IDWriteFontFamily1 IDWriteFontFamily1_iface; + IDWriteFontList1 IDWriteFontList1_iface; LONG ref; struct dwrite_fontfamily_data *data; @@ -289,6 +290,11 @@ static inline struct dwrite_fontfamily *impl_from_IDWriteFontFamily1(IDWriteFont return CONTAINING_RECORD(iface, struct dwrite_fontfamily, IDWriteFontFamily1_iface); } +static inline struct dwrite_fontfamily *impl_family_from_IDWriteFontList1(IDWriteFontList1 *iface) +{ + return CONTAINING_RECORD(iface, struct dwrite_fontfamily, IDWriteFontList1_iface); +} + static inline struct dwrite_fontcollection *impl_from_IDWriteFontCollection1(IDWriteFontCollection1 *iface) { return CONTAINING_RECORD(iface, struct dwrite_fontcollection, IDWriteFontCollection1_iface); @@ -1963,7 +1969,6 @@ static HRESULT WINAPI dwritefontfamily_QueryInterface(IDWriteFontFamily1 *iface, if (IsEqualIID(riid, &IID_IDWriteFontFamily1) || IsEqualIID(riid, &IID_IDWriteFontFamily) || - IsEqualIID(riid, &IID_IDWriteFontList) || IsEqualIID(riid, &IID_IUnknown)) { *obj = iface; @@ -1971,6 +1976,14 @@ static HRESULT WINAPI dwritefontfamily_QueryInterface(IDWriteFontFamily1 *iface, return S_OK; } + if (IsEqualIID(riid, &IID_IDWriteFontList1) || + IsEqualIID(riid, &IID_IDWriteFontList)) + { + *obj = &This->IDWriteFontList1_iface; + IDWriteFontList1_AddRef(&This->IDWriteFontList1_iface); + return S_OK; + } + WARN("%s not implemented.\n", debugstr_guid(riid)); *obj = NULL; @@ -2261,6 +2274,74 @@ static const IDWriteFontFamily1Vtbl fontfamilyvtbl = { dwritefontfamily1_GetFontFaceReference }; +static HRESULT WINAPI dwritefontfamilylist_QueryInterface(IDWriteFontList1 *iface, REFIID riid, void **obj) +{ + struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); + return dwritefontfamily_QueryInterface(&This->IDWriteFontFamily1_iface, riid, obj); +} + +static ULONG WINAPI dwritefontfamilylist_AddRef(IDWriteFontList1 *iface) +{ + struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); + return dwritefontfamily_AddRef(&This->IDWriteFontFamily1_iface); +} + +static ULONG WINAPI dwritefontfamilylist_Release(IDWriteFontList1 *iface) +{ + struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); + return dwritefontfamily_Release(&This->IDWriteFontFamily1_iface); +} + +static HRESULT WINAPI dwritefontfamilylist_GetFontCollection(IDWriteFontList1 *iface, + IDWriteFontCollection **collection) +{ + struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); + return dwritefontfamily_GetFontCollection(&This->IDWriteFontFamily1_iface, collection); +} + +static UINT32 WINAPI dwritefontfamilylist_GetFontCount(IDWriteFontList1 *iface) +{ + struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); + return dwritefontfamily_GetFontCount(&This->IDWriteFontFamily1_iface); +} + +static HRESULT WINAPI dwritefontfamilylist_GetFont(IDWriteFontList1 *iface, UINT32 index, IDWriteFont **font) +{ + struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); + return dwritefontfamily_GetFont(&This->IDWriteFontFamily1_iface, index, font); +} + +static DWRITE_LOCALITY WINAPI dwritefontfamilylist1_GetFontLocality(IDWriteFontList1 *iface, UINT32 index) +{ + struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); + return dwritefontfamily1_GetFontLocality(&This->IDWriteFontFamily1_iface, index); +} + +static HRESULT WINAPI dwritefontfamilylist1_GetFont(IDWriteFontList1 *iface, UINT32 index, IDWriteFont3 **font) +{ + struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); + return dwritefontfamily1_GetFont(&This->IDWriteFontFamily1_iface, index, font); +} + +static HRESULT WINAPI dwritefontfamilylist1_GetFontFaceReference(IDWriteFontList1 *iface, UINT32 index, + IDWriteFontFaceReference **reference) +{ + struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); + return dwritefontfamily1_GetFontFaceReference(&This->IDWriteFontFamily1_iface, index, reference); +} + +static const IDWriteFontList1Vtbl fontfamilylistvtbl = { + dwritefontfamilylist_QueryInterface, + dwritefontfamilylist_AddRef, + dwritefontfamilylist_Release, + dwritefontfamilylist_GetFontCollection, + dwritefontfamilylist_GetFontCount, + dwritefontfamilylist_GetFont, + dwritefontfamilylist1_GetFontLocality, + dwritefontfamilylist1_GetFont, + dwritefontfamilylist1_GetFontFaceReference, +}; + static HRESULT create_fontfamily(struct dwrite_fontcollection *collection, UINT32 index, IDWriteFontFamily1 **family) { struct dwrite_fontfamily *This; @@ -2271,6 +2352,7 @@ static HRESULT create_fontfamily(struct dwrite_fontcollection *collection, UINT3 if (!This) return E_OUTOFMEMORY; This->IDWriteFontFamily1_iface.lpVtbl = &fontfamilyvtbl; + This->IDWriteFontList1_iface.lpVtbl = &fontfamilylistvtbl; This->ref = 1; This->collection = collection; IDWriteFontCollection1_AddRef(&collection->IDWriteFontCollection1_iface); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index c226dba19f..1180ad4270 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1517,6 +1517,7 @@ if (0) /* crashes on native */ hr = IDWriteFontFamily_QueryInterface(family, &IID_IDWriteFontFamily1, (void**)&family1); if (hr == S_OK) { IDWriteFontFaceReference *ref, *ref1; + IDWriteFontList1 *fontlist1; IDWriteFontList *fontlist; IDWriteFont3 *font3; IDWriteFont1 *font1; @@ -1537,8 +1538,17 @@ if (0) /* crashes on native */ ok(hr == S_OK, "got 0x%08x\n", hr); IDWriteFont1_Release(font1); - hr = IDWriteFontFamily1_QueryInterface(family1, &IID_IDWriteFontList1, (void**)&fontlist); - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + hr = IDWriteFontFamily1_QueryInterface(family1, &IID_IDWriteFontList1, (void **)&fontlist1); + ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Failed to get interface, hr %#x.\n", hr); + if (hr == S_OK) { + hr = IDWriteFontFamily1_QueryInterface(family1, &IID_IDWriteFontList, (void **)&fontlist); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(fontlist == (IDWriteFontList *)fontlist1, "Unexpected interface pointer.\n"); + ok(fontlist != (IDWriteFontList *)family1, "Unexpected interface pointer.\n"); + ok(fontlist != (IDWriteFontList *)family, "Unexpected interface pointer.\n"); + IDWriteFontList1_Release(fontlist1); + IDWriteFontList_Release(fontlist); + } hr = IDWriteFontFamily1_QueryInterface(family1, &IID_IDWriteFontList, (void**)&fontlist); ok(hr == S_OK, "got 0x%08x\n", hr); -- 2.17.0

1 0

[PATCH] winemac: Fix z-ordering between two child (owned) windows of the same parent (owner).
by Ken Thomases 21 May '18

21 May '18

The window being ordered was first put in the correct place and then was moved to the other end of the children list by the loop that was intended to adjust the windows strictly between the window and the ancestor. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/winemac.drv/cocoa_window.m | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index b94b774..e37e071 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1590,14 +1590,17 @@ - (void) orderBelow:(WineWindow*)prev orAbove:(WineWindow*)next activate:(BOOL)a [ancestor orderWindow:orderingMode relativeTo:[ancestorOfOther windowNumber]]; } - for (child = self; - (parent = (WineWindow*)child.parentWindow); - child = parent) + if (!ancestorOfOther || ancestor != self) { - if ([parent isKindOfClass:[WineWindow class]]) - [parent order:-orderingMode childWindow:child relativeTo:nil]; - if (parent == ancestor) - break; + for (child = self; + (parent = (WineWindow*)child.parentWindow); + child = parent) + { + if ([parent isKindOfClass:[WineWindow class]]) + [parent order:-orderingMode childWindow:child relativeTo:nil]; + if (parent == ancestor) + break; + } } [self checkWineDisplayLink]; -- 2.10.2

1 0

[PATCH 1/3] wined3d: Add unimplemented flags parameter to wined3d_device_copy_sub_resource_region.
by Pablo Martin 21 May '18

21 May '18

Signed-off-by: Pablo Martin <pmart-wine(a)riseup.net> --- Prepares wined3d_device_copy_sub_resource_region so the flags parameter can be sent from CopySubresourceRegion1 in the next patch. After this series is done and I'm sure about the way we want to do this, I will prepare a similar one for adding flags to wined3d_device_update_sub_resource for UpdateSubresource1. Some remarks: - touches on d3d11, d3d9, ddraw modules, but I set 'wined3d:' in the subject since the patch is about one modification in wined3d that needs small adaptations in other places. Please let me know if this is not the best way. - I named the parameter in wined3d_device_update_sub_resource 'flags', but it might be better to call it 'copy_flags'. Tested on Ubuntu 17.10. dlls/d3d11/device.c | 4 ++-- dlls/d3d9/device.c | 2 +- dlls/ddraw/executebuffer.c | 2 +- dlls/wined3d/device.c | 9 ++++++--- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c930248e54..495ddc139f 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1021,7 +1021,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion(ID3D wined3d_src_resource = wined3d_resource_from_d3d11_resource(src_resource); wined3d_mutex_lock(); wined3d_device_copy_sub_resource_region(device->wined3d_device, wined3d_dst_resource, dst_subresource_idx, - dst_x, dst_y, dst_z, wined3d_src_resource, src_subresource_idx, src_box ? &wined3d_src_box : NULL); + dst_x, dst_y, dst_z, wined3d_src_resource, src_subresource_idx, src_box ? &wined3d_src_box : NULL, 0); wined3d_mutex_unlock(); } @@ -4514,7 +4514,7 @@ static void STDMETHODCALLTYPE d3d10_device_CopySubresourceRegion(ID3D10Device1 * wined3d_src_resource = wined3d_resource_from_d3d10_resource(src_resource); wined3d_mutex_lock(); wined3d_device_copy_sub_resource_region(device->wined3d_device, wined3d_dst_resource, dst_subresource_idx, - dst_x, dst_y, dst_z, wined3d_src_resource, src_subresource_idx, src_box ? &wined3d_src_box : NULL); + dst_x, dst_y, dst_z, wined3d_src_resource, src_subresource_idx, src_box ? &wined3d_src_box : NULL, 0); wined3d_mutex_unlock(); } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e3562c7c57..2f3ad2880d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1536,7 +1536,7 @@ static HRESULT WINAPI d3d9_device_UpdateSurface(IDirect3DDevice9Ex *iface, hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, wined3d_texture_get_resource(dst->wined3d_texture), dst->sub_resource_idx, dst_point ? dst_point->x : 0, dst_point ? dst_point->y : 0, 0, wined3d_texture_get_resource(src->wined3d_texture), - src->sub_resource_idx, &src_box); + src->sub_resource_idx, &src_box, 0); if (SUCCEEDED(hr) && dst->texture) d3d9_texture_flag_auto_gen_mipmap(dst->texture); diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index b20b9eda71..2ba29a7ed7 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -345,7 +345,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, wined3d_device_copy_sub_resource_region(device->wined3d_device, wined3d_buffer_get_resource(buffer->dst_vertex_buffer), 0, ci->wDest * sizeof(D3DTLVERTEX), 0, 0, - wined3d_buffer_get_resource(buffer->src_vertex_buffer), 0, &box); + wined3d_buffer_get_resource(buffer->src_vertex_buffer), 0, &box, 0); break; default: diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c853b43440..97f9049379 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4154,14 +4154,17 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *device, struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, struct wined3d_resource *src_resource, - unsigned int src_sub_resource_idx, const struct wined3d_box *src_box) + unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, unsigned int flags) { struct wined3d_box dst_box, b; TRACE("device %p, dst_resource %p, dst_sub_resource_idx %u, dst_x %u, dst_y %u, dst_z %u, " - "src_resource %p, src_sub_resource_idx %u, src_box %s.\n", + "src_resource %p, src_sub_resource_idx %u, src_box %s, flags %#x.\n", device, dst_resource, dst_sub_resource_idx, dst_x, dst_y, dst_z, - src_resource, src_sub_resource_idx, debug_box(src_box)); + src_resource, src_sub_resource_idx, debug_box(src_box), flags); + + if (flags) + FIXME("Ignoring flags %#x.\n", flags); if (src_resource == dst_resource && src_sub_resource_idx == dst_sub_resource_idx) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index bf29e206b5..7a8cf20381 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -40,7 +40,7 @@ @ cdecl wined3d_device_clear_rendertarget_view(ptr ptr ptr long ptr float long) @ cdecl wined3d_device_clear_unordered_access_view_uint(ptr ptr ptr) @ cdecl wined3d_device_copy_resource(ptr ptr ptr) -@ cdecl wined3d_device_copy_sub_resource_region(ptr ptr long long long long ptr long ptr) +@ cdecl wined3d_device_copy_sub_resource_region(ptr ptr long long long long ptr long ptr long) @ cdecl wined3d_device_copy_uav_counter(ptr ptr long ptr) @ cdecl wined3d_device_create(ptr long long ptr long long ptr ptr) @ cdecl wined3d_device_decref(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 15e14e5c5f..3393014baf 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2214,7 +2214,7 @@ void __cdecl wined3d_device_copy_resource(struct wined3d_device *device, HRESULT __cdecl wined3d_device_copy_sub_resource_region(struct wined3d_device *device, struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, struct wined3d_resource *src_resource, - unsigned int src_sub_resource_idx, const struct wined3d_box *src_box); + unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, unsigned int flags); void __cdecl wined3d_device_copy_uav_counter(struct wined3d_device *device, struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav); HRESULT __cdecl wined3d_device_create(struct wined3d *wined3d, UINT adapter_idx, -- 2.14.1

3 6

[PATCH] wined3d: Implement wined3d_pause for MSVC.
by Thomas Faber 21 May '18

21 May '18

Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> --- dlls/wined3d/wined3d_private.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3e344a5f0f3..976ab6ffd3f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -367,8 +367,12 @@ static inline unsigned int wined3d_popcount(unsigned int x) static inline void wined3d_pause(void) { -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#if defined(__i386__) || defined(__x86_64__) +#if defined(__GNUC__) __asm__ __volatile__( "rep;nop" : : : "memory" ); +#elif defined(_MSC_VER) + _mm_pause(); +#endif #endif } -- 2.16.1.windows.2

2 3

[PATCH 2/2] wined3d: Only create the ARBfp blitter if creating the GLSL blitter failed.
by Henri Verbeet 21 May '18

21 May '18

Since the GLSL blitter can do everything the ARBfp one can. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/glsl_shader.c | 11 +++++++---- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c853b43440b..8257efdf0ef 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1042,8 +1042,8 @@ static void wined3d_device_create_primary_opengl_context_cs(void *object) return; } wined3d_ffp_blitter_create(&device->blitter, &device->adapter->gl_info); - wined3d_arbfp_blitter_create(&device->blitter, device); - wined3d_glsl_blitter_create(&device->blitter, device); + if (!wined3d_glsl_blitter_create(&device->blitter, device)) + wined3d_arbfp_blitter_create(&device->blitter, device); wined3d_fbo_blitter_create(&device->blitter, &device->adapter->gl_info); wined3d_raw_blitter_create(&device->blitter, &device->adapter->gl_info); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e4339064e28..0d0e25a4775 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13157,21 +13157,22 @@ static const struct wined3d_blitter_ops glsl_blitter_ops = glsl_blitter_blit, }; -void wined3d_glsl_blitter_create(struct wined3d_blitter **next, const struct wined3d_device *device) +struct wined3d_blitter *wined3d_glsl_blitter_create(struct wined3d_blitter **next, + const struct wined3d_device *device) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_glsl_blitter *blitter; if (device->shader_backend != &glsl_shader_backend) - return; + return NULL; if (!gl_info->supported[ARB_VERTEX_SHADER] || !gl_info->supported[ARB_FRAGMENT_SHADER]) - return; + return NULL; if (!(blitter = heap_alloc(sizeof(*blitter)))) { ERR("Failed to allocate blitter.\n"); - return; + return NULL; } TRACE("Created blitter %p.\n", blitter); @@ -13182,4 +13183,6 @@ void wined3d_glsl_blitter_create(struct wined3d_blitter **next, const struct win wine_rb_init(&blitter->programs, glsl_blitter_args_compare); blitter->palette_texture = 0; *next = &blitter->blitter; + + return *next; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 26979b3226e..f2c4cd669cf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2143,7 +2143,7 @@ void wined3d_fbo_blitter_create(struct wined3d_blitter **next, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void wined3d_ffp_blitter_create(struct wined3d_blitter **next, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; -void wined3d_glsl_blitter_create(struct wined3d_blitter **next, +struct wined3d_blitter *wined3d_glsl_blitter_create(struct wined3d_blitter **next, const struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_raw_blitter_create(struct wined3d_blitter **next, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 1/2] wined3d: Implement YUV blits in the GLSL blitter.
by Henri Verbeet 21 May '18

21 May '18

From: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 353 +++++++++++++++++++++++++++++++++++++++++---- dlls/wined3d/utils.c | 9 +- 2 files changed, 333 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6f23cf8a403..e4339064e28 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12417,6 +12417,300 @@ static void glsl_blitter_generate_p8_shader(struct wined3d_string_buffer *buffer shader_addline(buffer, "}\n"); } +static void gen_packed_yuv_read(struct wined3d_string_buffer *buffer, + const struct wined3d_gl_info *gl_info, const struct glsl_blitter_args *args, + const char *tex_type) +{ + enum complex_fixup complex_fixup = get_complex_fixup(args->fixup); + char chroma, luminance; + const char *tex; + + /* The YUY2 and UYVY formats contain two pixels packed into a 32 bit + * macropixel, giving effectively 16 bits per pixel. The color consists of + * a luminance(Y) and two chroma(U and V) values. Each macropixel has two + * luminance values, one for each single pixel it contains, and one U and + * one V value shared between both pixels. + * + * The data is loaded into an A8L8 texture. With YUY2, the luminance + * component contains the luminance and alpha the chroma. With UYVY it is + * vice versa. Thus take the format into account when generating the read + * swizzles + * + * Reading the Y value is straightforward - just sample the texture. The + * hardware takes care of filtering in the horizontal and vertical + * direction. + * + * Reading the U and V values is harder. We have to avoid filtering + * horizontally, because that would mix the U and V values of one pixel or + * two adjacent pixels. Thus floor the texture coordinate and add 0.5 to + * get an unfiltered read, regardless of the filtering setting. Vertical + * filtering works automatically though - the U and V values of two rows + * are mixed nicely. + * + * Apart of avoiding filtering issues, the code has to know which value it + * just read, and where it can find the other one. To determine this, it + * checks if it sampled an even or odd pixel, and shifts the 2nd read + * accordingly. + * + * Handling horizontal filtering of U and V values requires reading a 2nd + * pair of pixels, extracting U and V and mixing them. This is not + * implemented yet. + * + * An alternative implementation idea is to load the texture as A8R8G8B8 + * texture, with width / 2. This way one read gives all 3 values, finding + * U and V is easy in an unfiltered situation. Finding the luminance on + * the other hand requires finding out if it is an odd or even pixel. The + * real drawback of this approach is filtering. This would have to be + * emulated completely in the shader, reading up two 2 packed pixels in up + * to 2 rows and interpolating both horizontally and vertically. Beyond + * that it would require adjustments to the texture handling code to deal + * with the width scaling. */ + + if (complex_fixup == COMPLEX_FIXUP_UYVY) + { + chroma = 'x'; + luminance = gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] ? 'w' : 'y'; + } + else + { + chroma = gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] ? 'w' : 'y'; + luminance = 'x'; + } + + tex = needs_legacy_glsl_syntax(gl_info) ? tex_type : ""; + + /* First we have to read the chroma values. This means we need at least + * two pixels (no filtering), or 4 pixels (with filtering). To get the + * unmodified chroma, we have to rid ourselves of the filtering when we + * sample the texture. */ + shader_addline(buffer, " texcoord.xy = out_texcoord.xy;\n"); + /* We must not allow filtering between pixel x and x+1, this would mix U + * and V. Vertical filtering is ok. However, bear in mind that the pixel + * center is at 0.5, so add 0.5. */ + shader_addline(buffer, " texcoord.x = (floor(texcoord.x * size.x) + 0.5) / size.x;\n"); + shader_addline(buffer, " luminance = texture%s(sampler, texcoord.xy).%c;\n", tex, chroma); + + /* Multiply the x coordinate by 0.5 and get the fraction. This gives 0.25 + * and 0.75 for the even and odd pixels respectively. */ + /* Put the value into either of the chroma values. */ + shader_addline(buffer, " bool even = fract(texcoord.x * size.x * 0.5) < 0.5;\n"); + shader_addline(buffer, " if (even)\n"); + shader_addline(buffer, " chroma.y = luminance;\n"); + shader_addline(buffer, " else\n"); + shader_addline(buffer, " chroma.x = luminance;\n"); + + /* Sample pixel 2. If we read an even pixel, sample the pixel right to the + * current one. Otherwise, sample the left pixel. */ + shader_addline(buffer, " texcoord.x += even ? 1.0 / size.x : -1.0 / size.x;\n"); + shader_addline(buffer, " luminance = texture%s(sampler, texcoord.xy).%c;\n", tex, chroma); + + /* Put the value into the other chroma. */ + shader_addline(buffer, " if (even)\n"); + shader_addline(buffer, " chroma.x = luminance;\n"); + shader_addline(buffer, " else\n"); + shader_addline(buffer, " chroma.y = luminance;\n"); + + /* TODO: If filtering is enabled, sample a 2nd pair of pixels left or right of + * the current one and lerp the two U and V values. */ + + /* This gives the correctly filtered luminance value. */ + shader_addline(buffer, " luminance = texture%s(sampler, out_texcoord.xy).%c;\n", tex, luminance); +} + +static void gen_yv12_read(struct wined3d_string_buffer *buffer, + const struct wined3d_gl_info *gl_info, const char *tex_type) +{ + char component = gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] ? 'w' : 'x'; + const char *tex = needs_legacy_glsl_syntax(gl_info) ? tex_type : ""; + + /* YV12 surfaces contain a WxH sized luminance plane, followed by a + * (W/2)x(H/2) V and a (W/2)x(H/2) U plane, each with 8 bit per pixel. So + * the effective bitdepth is 12 bits per pixel. Since the U and V planes + * have only half the pitch of the luminance plane, the packing into the + * gl texture is a bit unfortunate. If the whole texture is interpreted as + * luminance data it looks approximately like this: + * + * +----------------------------------+---- + * | | + * | | + * | | + * | | + * | | 2 + * | LUMINANCE | - + * | | 3 + * | | + * | | + * | | + * | | + * +----------------+-----------------+---- + * | | | + * | V even rows | V odd rows | + * | | | 1 + * +----------------+------------------ - + * | | | 3 + * | U even rows | U odd rows | + * | | | + * +----------------+-----------------+---- + * | | | + * | 0.5 | 0.5 | + * + * So it appears as if there are 4 chroma images, but in fact the odd rows + * in the chroma images are in the same row as the even ones. So it is + * kinda tricky to read. */ + + /* First sample the chroma values. */ + shader_addline(buffer, " texcoord.xy = out_texcoord.xy;\n"); + /* The chroma planes have only half the width. */ + shader_addline(buffer, " texcoord.x *= 0.5;\n"); + + /* The first value is between 2/3 and 5/6 of the texture's height, so + * scale+bias the coordinate. Also read the right side of the image when + * reading odd lines. + * + * Don't forget to clamp the y values in into the range, otherwise we'll + * get filtering bleeding. */ + + /* Read odd lines from the right side (add 0.5 to the x coordinate). */ + shader_addline(buffer, " if (fract(floor(texcoord.y * size.y) * 0.5 + 1.0 / 6.0) >= 0.5)\n"); + shader_addline(buffer, " texcoord.x += 0.5;\n"); + + /* Clamp, keep the half pixel origin in mind. */ + shader_addline(buffer, " texcoord.y = clamp(2.0 / 3.0 + texcoord.y / 6.0, " + "2.0 / 3.0 + 0.5 / size.y, 5.0 / 6.0 - 0.5 / size.y);\n"); + + shader_addline(buffer, " chroma.x = texture%s(sampler, texcoord.xy).%c;\n", tex, component); + + /* The other chroma value is 1/6th of the texture lower, from 5/6th to + * 6/6th No need to clamp because we're just reusing the already clamped + * value from above. */ + shader_addline(buffer, " texcoord.y += 1.0 / 6.0;\n"); + shader_addline(buffer, " chroma.y = texture%s(sampler, texcoord.xy).%c;\n", tex, component); + + /* Sample the luminance value. It is in the top 2/3rd of the texture, so + * scale the y coordinate. Clamp the y coordinate to prevent the chroma + * values from bleeding into the sampled luminance values due to + * filtering. */ + shader_addline(buffer, " texcoord.xy = out_texcoord.xy;\n"); + /* Multiply the y coordinate by 2/3 and clamp it. */ + shader_addline(buffer, " texcoord.y = min(texcoord.y * 2.0 / 3.0, 2.0 / 3.0 - 0.5 / size.y);\n"); + shader_addline(buffer, " luminance = texture%s(sampler, texcoord.xy).%c;\n", tex, component); +} + +static void gen_nv12_read(struct wined3d_string_buffer *buffer, + const struct wined3d_gl_info *gl_info, const char *tex_type) +{ + char component = gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] ? 'w' : 'x'; + const char *tex = needs_legacy_glsl_syntax(gl_info) ? tex_type : ""; + + /* NV12 surfaces contain a WxH sized luminance plane, followed by a + * (W/2)x(H/2) sized plane where each component is an UV pair. So the + * effective bitdepth is 12 bits per pixel. If the whole texture is + * interpreted as luminance data it looks approximately like this: + * + * +----------------------------------+---- + * | | + * | | + * | | + * | | + * | | 2 + * | LUMINANCE | - + * | | 3 + * | | + * | | + * | | + * | | + * +----------------------------------+---- + * |UVUVUVUVUVUVUVUVUVUVUVUVUVUVUVUVUV| + * |UVUVUVUVUVUVUVUVUVUVUVUVUVUVUVUVUV| + * | | 1 + * | | - + * | | 3 + * | | + * | | + * +----------------------------------+---- */ + + /* First sample the chroma values. */ + shader_addline(buffer, " texcoord.xy = out_texcoord.xy;\n"); + /* We only have half the number of chroma pixels. */ + shader_addline(buffer, " texcoord.x *= 0.5;\n"); + shader_addline(buffer, " texcoord.y = (texcoord.y + 2.0) / 3.0;\n"); + + /* We must not allow filtering horizontally, this would mix U and V. + * Vertical filtering is ok. However, bear in mind that the pixel center + * is at 0.5, so add 0.5. */ + + /* Convert to non-normalised coordinates so we can find the individual + * pixel. */ + shader_addline(buffer, " texcoord.x = floor(texcoord.x * size.x);\n"); + /* Multiply by 2 since chroma components are stored in UV pixel pairs, add + * 0.5 to hit the center of the pixel. Then convert back to normalised + * coordinates. */ + shader_addline(buffer, " texcoord.x = (texcoord.x * 2.0 + 0.5) / size.x;\n"); + /* Clamp, keep the half pixel origin in mind. */ + shader_addline(buffer, " texcoord.y = max(texcoord.y, 2.0 / 3.0 + 0.5 / size.y);\n"); + + shader_addline(buffer, " chroma.y = texture%s(sampler, texcoord.xy).%c;\n", tex, component); + /* Add 1.0 / size.x to sample the adjacent texel. */ + shader_addline(buffer, " texcoord.x += 1.0 / size.x;\n"); + shader_addline(buffer, " chroma.x = texture%s(sampler, texcoord.xy).%c;\n", tex, component); + + /* Sample the luminance value. It is in the top 2/3rd of the texture, so + * scale the y coordinate. Clamp the y coordinate to prevent the chroma + * values from bleeding into the sampled luminance values due to + * filtering. */ + shader_addline(buffer, " texcoord.xy = out_texcoord.xy;\n"); + /* Multiply the y coordinate by 2/3 and clamp it. */ + shader_addline(buffer, " texcoord.y = min(texcoord.y * 2.0 / 3.0, 2.0 / 3.0 - 0.5 / size.y);\n"); + shader_addline(buffer, " luminance = texture%s(sampler, texcoord.xy).%c;\n", tex, component); +} + +static void glsl_blitter_generate_yuv_shader(struct wined3d_string_buffer *buffer, + const struct wined3d_gl_info *gl_info, const struct glsl_blitter_args *args, + const char *output, const char *tex_type, const char *swizzle) +{ + enum complex_fixup complex_fixup = get_complex_fixup(args->fixup); + + shader_addline(buffer, "const vec4 yuv_coef = vec4(1.403, -0.344, -0.714, 1.770);\n"); + shader_addline(buffer, "float luminance;\n"); + shader_addline(buffer, "vec2 texcoord;\n"); + shader_addline(buffer, "vec2 chroma;\n"); + shader_addline(buffer, "uniform vec2 size;\n"); + + shader_addline(buffer, "\nvoid main()\n{\n"); + + switch (complex_fixup) + { + case COMPLEX_FIXUP_UYVY: + case COMPLEX_FIXUP_YUY2: + gen_packed_yuv_read(buffer, gl_info, args, tex_type); + break; + + case COMPLEX_FIXUP_YV12: + gen_yv12_read(buffer, gl_info, tex_type); + break; + + case COMPLEX_FIXUP_NV12: + gen_nv12_read(buffer, gl_info, tex_type); + break; + + default: + FIXME("Unsupported fixup %#x.\n", complex_fixup); + string_buffer_free(buffer); + return; + } + + /* Calculate the final result. Formula is taken from + * http://www.fourcc.org/fccyvrgb.php. Note that the chroma + * ranges from -0.5 to 0.5. */ + shader_addline(buffer, "\n chroma.xy -= 0.5;\n"); + + shader_addline(buffer, " %s.x = luminance + chroma.x * yuv_coef.x;\n", output); + shader_addline(buffer, " %s.y = luminance + chroma.y * yuv_coef.y + chroma.x * yuv_coef.z;\n", output); + shader_addline(buffer, " %s.z = luminance + chroma.y * yuv_coef.w;\n", output); + + shader_addline(buffer, "}\n"); +} + static void glsl_blitter_generate_plain_shader(struct wined3d_string_buffer *buffer, const struct wined3d_gl_info *gl_info, const struct glsl_blitter_args *args, const char *output, const char *tex_type, const char *swizzle) @@ -12501,10 +12795,20 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter output = string_buffer_get(&blitter->string_buffers); string_buffer_sprintf(output, "%s[0]", get_fragment_output(gl_info)); - if (complex_fixup == COMPLEX_FIXUP_P8) - glsl_blitter_generate_p8_shader(buffer, gl_info, args, output->buffer, tex_type, swizzle); - else - glsl_blitter_generate_plain_shader(buffer, gl_info, args, output->buffer, tex_type, swizzle); + switch (complex_fixup) + { + case COMPLEX_FIXUP_P8: + glsl_blitter_generate_p8_shader(buffer, gl_info, args, output->buffer, tex_type, swizzle); + break; + case COMPLEX_FIXUP_YUY2: + case COMPLEX_FIXUP_UYVY: + case COMPLEX_FIXUP_YV12: + case COMPLEX_FIXUP_NV12: + glsl_blitter_generate_yuv_shader(buffer, gl_info, args, output->buffer, tex_type, swizzle); + break; + case COMPLEX_FIXUP_NONE: + glsl_blitter_generate_plain_shader(buffer, gl_info, args, output->buffer, tex_type, swizzle); + } string_buffer_release(&blitter->string_buffers, output); @@ -12580,7 +12884,6 @@ static struct glsl_blitter_program *glsl_blitter_get_program(struct wined3d_glsl { const struct wined3d_gl_info *gl_info = context->gl_info; struct glsl_blitter_program *program; - enum complex_fixup complex_fixup; struct glsl_blitter_args args; struct wine_rb_entry *entry; @@ -12588,13 +12891,6 @@ static struct glsl_blitter_program *glsl_blitter_get_program(struct wined3d_glsl args.texture_type = texture->target; args.fixup = texture->resource.format->color_fixup; - complex_fixup = get_complex_fixup(args.fixup); - if (complex_fixup && complex_fixup != COMPLEX_FIXUP_P8) - { - FIXME("Complex fixup %#x not supported.\n", complex_fixup); - return NULL; - } - if ((entry = wine_rb_get(&blitter->programs, &args))) return WINE_RB_ENTRY_VALUE(entry, struct glsl_blitter_program, entry); @@ -12631,7 +12927,6 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi const struct wined3d_resource *dst_resource = &dst_texture->resource; const struct wined3d_format *src_format = src_resource->format; const struct wined3d_format *dst_format = dst_resource->format; - enum complex_fixup complex_fixup = COMPLEX_FIXUP_NONE; BOOL decompress; if (blit_op == WINED3D_BLIT_OP_RAW_BLIT && dst_format->id == src_format->id) @@ -12671,16 +12966,6 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi return FALSE; } - if (is_complex_fixup(src_format->color_fixup)) - { - complex_fixup = get_complex_fixup(src_format->color_fixup); - if (complex_fixup != COMPLEX_FIXUP_P8) - { - TRACE("Complex source fixup %#x not supported.\n", complex_fixup); - return FALSE; - } - } - if (!is_identity_fixup(dst_format->color_fixup) && (dst_format->id != src_format->id || dst_location != WINED3D_LOCATION_DRAWABLE)) { @@ -12705,6 +12990,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli struct glsl_blitter_program *program; struct wined3d_blitter *next; unsigned int src_level; + GLint location; RECT s, d; TRACE("blitter %p, op %#x, context %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_rect %s, " @@ -12822,8 +13108,25 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli return dst_location; } GL_EXTCALL(glUseProgram(program->id)); - if (get_complex_fixup(program->args.fixup) == COMPLEX_FIXUP_P8) - glsl_blitter_upload_palette(glsl_blitter, context, src_texture); + switch (get_complex_fixup(program->args.fixup)) + { + case COMPLEX_FIXUP_P8: + glsl_blitter_upload_palette(glsl_blitter, context, src_texture); + break; + + case COMPLEX_FIXUP_YUY2: + case COMPLEX_FIXUP_UYVY: + case COMPLEX_FIXUP_YV12: + case COMPLEX_FIXUP_NV12: + src_level = src_sub_resource_idx % src_texture->level_count; + location = GL_EXTCALL(glGetUniformLocation(program->id, "size")); + GL_EXTCALL(glUniform2f(location, wined3d_texture_get_level_pow2_width(src_texture, src_level), + wined3d_texture_get_level_pow2_height(src_texture, src_level))); + break; + + default: + break; + } context_draw_shaded_quad(context, src_texture, src_sub_resource_idx, src_rect, dst_rect, filter); GL_EXTCALL(glUseProgram(0)); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index ade1227581c..7cecd8c8ede 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3219,8 +3219,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_W, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); } - if (!gl_info->supported[APPLE_YCBCR_422] && gl_info->supported[ARB_FRAGMENT_PROGRAM] - && gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + if (!gl_info->supported[APPLE_YCBCR_422] && (gl_info->supported[ARB_FRAGMENT_PROGRAM] + || (gl_info->supported[ARB_FRAGMENT_SHADER] && gl_info->supported[ARB_VERTEX_SHADER]))) { idx = get_format_idx(WINED3DFMT_YUY2); gl_info->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YUY2); @@ -3229,7 +3229,7 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_UYVY); } else if (!gl_info->supported[APPLE_YCBCR_422] && (!gl_info->supported[ARB_FRAGMENT_PROGRAM] - || !gl_info->supported[WINED3D_GL_LEGACY_CONTEXT])) + && (!gl_info->supported[ARB_FRAGMENT_SHADER] || !gl_info->supported[ARB_VERTEX_SHADER]))) { idx = get_format_idx(WINED3DFMT_YUY2); gl_info->formats[idx].glInternal = 0; @@ -3238,7 +3238,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].glInternal = 0; } - if (gl_info->supported[ARB_FRAGMENT_PROGRAM] && gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + if (gl_info->supported[ARB_FRAGMENT_PROGRAM] + || (gl_info->supported[ARB_FRAGMENT_SHADER] && gl_info->supported[ARB_VERTEX_SHADER])) { idx = get_format_idx(WINED3DFMT_YV12); format_set_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_HEIGHT_SCALE); -- 2.11.0

1 0

[PATCH 11/11] regedit: Sort function declarations alphabetically by source file
by Hugh McMaster 21 May '18

21 May '18

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/main.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/programs/regedit/main.h b/programs/regedit/main.h index 218e8ec766..6e901b3ac2 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -124,11 +124,24 @@ void ShowAboutBox(HWND hWnd); LPWSTR GetItemFullPath(HWND hwndTV, HTREEITEM hItem, BOOL bFull); LRESULT CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM); +/* edit.c */ +BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR newKeyName); +BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPWSTR valueName); +BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName); +BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath); +BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, BOOL showMessageBox); +BOOL RenameValue(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR oldName, LPCWSTR newName); +BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName); +int WINAPIV messagebox(HWND hwnd, int buttons, int titleId, int resId, ...); + /* framewnd.c */ LRESULT CALLBACK FrameWndProc(HWND, UINT, WPARAM, LPARAM); void SetupStatusBar(HWND hWnd, BOOL bResize); void UpdateStatusBar(void); +/* hexedit.c */ +void HexEdit_Register(void); + /* listview.c */ BOOL update_listview_path(const WCHAR *path); void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD size); @@ -166,17 +179,4 @@ HWND StartKeyRename(HWND hwndTV); HTREEITEM FindPathInTree(HWND hwndTV, LPCWSTR lpKeyName); HTREEITEM FindNext(HWND hwndTV, HTREEITEM hItem, LPCWSTR sstring, int mode, int *row); -/* edit.c */ -BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR newKeyName); -BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPWSTR valueName); -BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName); -BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath); -BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, BOOL showMessageBox); -BOOL RenameValue(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR oldName, LPCWSTR newName); -BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName); -int WINAPIV messagebox(HWND hwnd, int buttons, int titleId, int resId, ...); - -/* hexedit.c */ -void HexEdit_Register(void); - #endif /* __MAIN_H__ */ -- 2.17.0

1 0

[PATCH 10/11] regedit: Remove implicit extern keywords from function declarations
by Hugh McMaster 21 May '18

21 May '18

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/main.h | 74 ++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 38 deletions(-) diff --git a/programs/regedit/main.h b/programs/regedit/main.h index af61252565..218e8ec766 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -117,33 +117,31 @@ extern const WCHAR* reg_class_namesW[]; #define INDEX_HKEY_CURRENT_USER 4 #define INDEX_HKEY_DYN_DATA 5 - - /* about.c */ -extern void ShowAboutBox(HWND hWnd); +void ShowAboutBox(HWND hWnd); /* childwnd.c */ -extern LPWSTR GetItemFullPath(HWND hwndTV, HTREEITEM hItem, BOOL bFull); -extern LRESULT CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM); +LPWSTR GetItemFullPath(HWND hwndTV, HTREEITEM hItem, BOOL bFull); +LRESULT CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM); /* framewnd.c */ -extern LRESULT CALLBACK FrameWndProc(HWND, UINT, WPARAM, LPARAM); -extern void SetupStatusBar(HWND hWnd, BOOL bResize); -extern void UpdateStatusBar(void); +LRESULT CALLBACK FrameWndProc(HWND, UINT, WPARAM, LPARAM); +void SetupStatusBar(HWND hWnd, BOOL bResize); +void UpdateStatusBar(void); /* listview.c */ -extern BOOL update_listview_path(const WCHAR *path); -extern void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD size); -extern int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount, int pos); -extern void OnGetDispInfo(NMLVDISPINFOW *plvdi); -extern HWND CreateListView(HWND hwndParent, UINT id); -extern int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort); -extern BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highlightValue); -extern HWND StartValueRename(HWND hwndLV); -extern LPWSTR GetItemText(HWND hwndLV, UINT item); -extern LPCWSTR GetValueName(HWND hwndLV); -extern BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result); -extern BOOL IsDefaultValue(HWND hwndLV, int i); +BOOL update_listview_path(const WCHAR *path); +void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD size); +int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount, int pos); +void OnGetDispInfo(NMLVDISPINFOW *plvdi); +HWND CreateListView(HWND hwndParent, UINT id); +int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort); +BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highlightValue); +HWND StartValueRename(HWND hwndLV); +LPWSTR GetItemText(HWND hwndLV, UINT item); +LPCWSTR GetValueName(HWND hwndLV); +BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result); +BOOL IsDefaultValue(HWND hwndLV, int i); /* regedit.c */ void WINAPIV output_message(unsigned int id, ...); @@ -158,27 +156,27 @@ void delete_registry_key(WCHAR *reg_key_name); BOOL export_registry_key(WCHAR *file_name, WCHAR *path, DWORD format); /* treeview.c */ -extern HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, UINT id); -extern BOOL RefreshTreeView(HWND hWndTV); -extern BOOL OnTreeExpanding(HWND hWnd, NMTREEVIEWW* pnmtv); -extern LPWSTR GetItemPath(HWND hwndTV, HTREEITEM hItem, HKEY* phRootKey); -extern BOOL DeleteNode(HWND hwndTV, HTREEITEM hItem); -extern HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPWSTR name); -extern HWND StartKeyRename(HWND hwndTV); -extern HTREEITEM FindPathInTree(HWND hwndTV, LPCWSTR lpKeyName); -extern HTREEITEM FindNext(HWND hwndTV, HTREEITEM hItem, LPCWSTR sstring, int mode, int *row); +HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, UINT id); +BOOL RefreshTreeView(HWND hWndTV); +BOOL OnTreeExpanding(HWND hWnd, NMTREEVIEWW* pnmtv); +LPWSTR GetItemPath(HWND hwndTV, HTREEITEM hItem, HKEY* phRootKey); +BOOL DeleteNode(HWND hwndTV, HTREEITEM hItem); +HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPWSTR name); +HWND StartKeyRename(HWND hwndTV); +HTREEITEM FindPathInTree(HWND hwndTV, LPCWSTR lpKeyName); +HTREEITEM FindNext(HWND hwndTV, HTREEITEM hItem, LPCWSTR sstring, int mode, int *row); /* edit.c */ -extern BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR newKeyName); -extern BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPWSTR valueName); -extern BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName); -extern BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath); -extern BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, BOOL showMessageBox); -extern BOOL RenameValue(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR oldName, LPCWSTR newName); -extern BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName); -extern int WINAPIV messagebox(HWND hwnd, int buttons, int titleId, int resId, ...); +BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR newKeyName); +BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPWSTR valueName); +BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName); +BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath); +BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, BOOL showMessageBox); +BOOL RenameValue(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR oldName, LPCWSTR newName); +BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName); +int WINAPIV messagebox(HWND hwnd, int buttons, int titleId, int resId, ...); /* hexedit.c */ -extern void HexEdit_Register(void); +void HexEdit_Register(void); #endif /* __MAIN_H__ */ -- 2.17.0

1 0

[PATCH 09/11] regedit: Do not directly include stdio.h any longer
by Hugh McMaster 21 May '18

21 May '18

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/childwnd.c | 1 - programs/regedit/edit.c | 1 - programs/regedit/framewnd.c | 1 - programs/regedit/hexedit.c | 1 - programs/regedit/listview.c | 1 - programs/regedit/main.c | 1 - programs/regedit/regedit.c | 1 - programs/regedit/regproc.c | 1 - programs/regedit/treeview.c | 1 - 9 files changed, 9 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 56ef59d3ff..d8431f10ec 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -21,7 +21,6 @@ #define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include <windows.h> #include <commctrl.h> -#include <stdio.h> #include "main.h" diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 9baf881621..6ee9869a2a 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -25,7 +25,6 @@ #include <commdlg.h> #include <cderr.h> #include <stdlib.h> -#include <stdio.h> #include <shellapi.h> #include <shlwapi.h> diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 99f7686879..a6777fade4 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -25,7 +25,6 @@ #include <commdlg.h> #include <cderr.h> #include <stdlib.h> -#include <stdio.h> #include <shellapi.h> #include "main.h" diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index 0d28388e21..e082e93585 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -24,7 +24,6 @@ */ #include <stdarg.h> -#include <stdio.h> #include <string.h> #include <assert.h> diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index e8bfb527b5..f42f9c2e2f 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -23,7 +23,6 @@ #include <winternl.h> #include <commctrl.h> #include <stdlib.h> -#include <stdio.h> #include "main.h" #include "wine/heap.h" diff --git a/programs/regedit/main.c b/programs/regedit/main.c index 62fd616b51..80f935027e 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -22,7 +22,6 @@ #include <windows.h> #include <commctrl.h> #include <stdlib.h> -#include <stdio.h> #include <fcntl.h> #include "wine/debug.h" diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 7469a90ac2..68001be892 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> #include <stdlib.h> #include <windows.h> #include <commctrl.h> diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index c4900e6c6d..2dbbd102c6 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -22,7 +22,6 @@ */ #include <errno.h> -#include <stdio.h> #include <stdlib.h> #include <fcntl.h> #include <io.h> diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 9d75a31dd6..d5a6767754 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -26,7 +26,6 @@ #include <windows.h> #include <commctrl.h> #include <stdlib.h> -#include <stdio.h> #include <wine/debug.h> #include <shlwapi.h> -- 2.17.0

1 0

[PATCH 08/11] regedit: Simplify boolean comparisons in edit.c
by Hugh McMaster 21 May '18

21 May '18

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/edit.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 980d1c22d8..9baf881621 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -196,7 +196,7 @@ static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, WCHAR empty = 0; lRet = RegQueryValueExW(hKey, valueName ? valueName : &empty, 0, lpType, 0, &valueDataLen); - if (lRet != ERROR_SUCCESS) { + if (lRet) { if (lRet == ERROR_FILE_NOT_FOUND && !valueName) { /* no default value here, make it up */ if (len) *len = 1; if (lpType) *lpType = REG_SZ; @@ -210,7 +210,7 @@ static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, if ( *lpType == REG_DWORD ) valueDataLen = sizeof(DWORD); buffer = heap_xalloc(valueDataLen + sizeof(WCHAR)); lRet = RegQueryValueExW(hKey, valueName, 0, 0, (LPBYTE)buffer, &valueDataLen); - if (lRet != ERROR_SUCCESS) { + if (lRet) { error_code_messagebox(hwnd, IDS_BAD_VALUE, valueName); goto done; } @@ -234,7 +234,7 @@ BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR keyName) HKEY hKey; lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_CREATE_SUB_KEY, &hKey); - if (lRet != ERROR_SUCCESS) { + if (lRet) { error_code_messagebox(hwnd, IDS_CREATE_KEY_FAILED); goto done; } @@ -245,13 +245,13 @@ BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR keyName) for (keyNum = 1; keyNum < 100; keyNum++) { wsprintfW(keyName, newKey, keyNum); lRet = RegOpenKeyW(hKey, keyName, &retKey); - if (lRet != ERROR_SUCCESS) break; + if (lRet) break; RegCloseKey(retKey); } if (lRet == ERROR_SUCCESS) goto done; lRet = RegCreateKeyW(hKey, keyName, &retKey); - if (lRet != ERROR_SUCCESS) { + if (lRet) { error_code_messagebox(hwnd, IDS_CREATE_KEY_FAILED); goto done; } @@ -272,7 +272,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) LONG len; lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); - if (lRet != ERROR_SUCCESS) { + if (lRet) { error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED); return FALSE; } @@ -388,7 +388,7 @@ BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath) HKEY hKey; lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ|KEY_SET_VALUE, &hKey); - if (lRet != ERROR_SUCCESS) { + if (lRet) { error_code_messagebox(hwnd, IDS_DELETE_KEY_FAILED); return FALSE; } @@ -398,7 +398,7 @@ BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath) goto done; lRet = SHDeleteKeyW(hKeyRoot, keyPath); - if (lRet != ERROR_SUCCESS) { + if (lRet) { error_code_messagebox(hwnd, IDS_BAD_KEY, keyPath); goto done; } @@ -418,7 +418,7 @@ BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, B WCHAR empty = 0; lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); - if (lRet != ERROR_SUCCESS) return FALSE; + if (lRet) return FALSE; if (showMessageBox) { @@ -428,10 +428,10 @@ BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, B } lRet = RegDeleteValueW(hKey, valueName ? valueName : &empty); - if (lRet != ERROR_SUCCESS && valueName) { + if (lRet && valueName) { error_code_messagebox(hwnd, IDS_BAD_VALUE, valueName); } - if (lRet != ERROR_SUCCESS) goto done; + if (lRet) goto done; result = TRUE; done: @@ -450,7 +450,7 @@ BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPW LVITEMW item; lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); - if (lRet != ERROR_SUCCESS) { + if (lRet) { error_code_messagebox(hwnd, IDS_CREATE_VALUE_FAILED); return FALSE; } @@ -469,7 +469,7 @@ BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPW } lRet = RegSetValueExW(hKey, valueName, 0, valueType, (BYTE*)&valueDword, sizeof(DWORD)); - if (lRet != ERROR_SUCCESS) { + if (lRet) { error_code_messagebox(hwnd, IDS_CREATE_VALUE_FAILED); goto done; } @@ -500,7 +500,7 @@ BOOL RenameValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR oldName, LPC if (!newName) return FALSE; lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); - if (lRet != ERROR_SUCCESS) { + if (lRet) { error_code_messagebox(hwnd, IDS_RENAME_VALUE_FAILED); return FALSE; } @@ -512,12 +512,12 @@ BOOL RenameValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR oldName, LPC value = read_value(hwnd, hKey, oldName, &type, &len); if(!value) goto done; lRet = RegSetValueExW(hKey, newName, 0, type, (BYTE*)value, len); - if (lRet != ERROR_SUCCESS) { + if (lRet) { error_code_messagebox(hwnd, IDS_RENAME_VALUE_FAILED); goto done; } lRet = RegDeleteValueW(hKey, oldName); - if (lRet != ERROR_SUCCESS) { + if (lRet) { RegDeleteValueW(hKey, newName); error_code_messagebox(hwnd, IDS_RENAME_VALUE_FAILED); goto done; @@ -555,7 +555,7 @@ BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName) *srcSubKey_copy = 0; srcSubKey = srcSubKey_copy + 1; lRet = RegOpenKeyExW(hRootKey, parentPath, 0, KEY_READ | KEY_CREATE_SUB_KEY, &parentKey); - if (lRet != ERROR_SUCCESS) { + if (lRet) { error_code_messagebox(hwnd, IDS_RENAME_KEY_FAILED); goto done; } @@ -568,14 +568,14 @@ BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName) KEY_WRITE, NULL /* FIXME */, &destKey, &disposition); if (disposition == REG_OPENED_EXISTING_KEY) lRet = ERROR_FILE_EXISTS; - if (lRet != ERROR_SUCCESS) { + if (lRet) { error_code_messagebox(hwnd, IDS_KEY_EXISTS, srcSubKey); goto done; } /* FIXME: SHCopyKey does not copy the security attributes */ lRet = SHCopyKeyW(parentKey, srcSubKey, destKey, 0); - if (lRet != ERROR_SUCCESS) { + if (lRet) { RegCloseKey(destKey); RegDeleteKeyW(parentKey, newName); error_code_messagebox(hwnd, IDS_RENAME_KEY_FAILED); @@ -583,7 +583,7 @@ BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName) } lRet = SHDeleteKeyW(hRootKey, keyPath); - if (lRet != ERROR_SUCCESS) { + if (lRet) { error_code_messagebox(hwnd, IDS_RENAME_KEY_FAILED); goto done; } -- 2.17.0

1 0

[PATCH 07/11] regedit: Simplify the detection of existing registry values
by Hugh McMaster 21 May '18

21 May '18

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/edit.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index bd6d720f2a..980d1c22d8 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -183,12 +183,9 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara return FALSE; } -static BOOL check_value(HWND hwnd, HKEY hKey, LPCWSTR valueName) +static BOOL value_exists(HWND hwnd, HKEY hKey, const WCHAR *value_name) { - WCHAR empty = 0; - LONG lRet = RegQueryValueExW(hKey, valueName ? valueName : &empty, 0, NULL, 0, NULL); - if(lRet != ERROR_SUCCESS) return FALSE; - return TRUE; + return !RegQueryValueExW(hKey, value_name ? value_name : NULL, NULL, NULL, NULL, NULL); } static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, LONG *len) @@ -507,8 +504,8 @@ BOOL RenameValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR oldName, LPC error_code_messagebox(hwnd, IDS_RENAME_VALUE_FAILED); return FALSE; } - /* check if the value already exists */ - if (check_value(hwnd, hKey, newName)) { + + if (value_exists(hwnd, hKey, newName)) { error_code_messagebox(hwnd, IDS_VALUE_EXISTS, oldName); goto done; } -- 2.17.0

1 0

[PATCH 06/11] regedit: Use the ARRAY_SIZE macro
by Hugh McMaster 21 May '18

21 May '18

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/childwnd.c | 2 +- programs/regedit/listview.c | 2 +- programs/regedit/regedit.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index ceeeb1d75a..56ef59d3ff 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -138,7 +138,7 @@ static LPWSTR GetPathRoot(HWND hwndTV, HTREEITEM hItem, BOOL bFull) { if (hRootKey) parts[1] = GetRootKeyName(hRootKey); if (bFull) { - DWORD dwSize = sizeof(text)/sizeof(WCHAR); + DWORD dwSize = ARRAY_SIZE(text); GetComputerNameW(text, &dwSize); parts[0] = text; } diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 4f3593fe7c..e8bfb527b5 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -241,7 +241,7 @@ static BOOL CreateListColumns(HWND hWndListView) lvC.iSubItem = index; lvC.cx = default_column_widths[index]; lvC.fmt = column_alignment[index]; - LoadStringW(hInst, IDS_LIST_COLUMN_FIRST + index, szText, sizeof(szText)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_LIST_COLUMN_FIRST + index, szText, ARRAY_SIZE(szText)); if (ListView_InsertColumnW(hWndListView, index, &lvC) == -1) return FALSE; } return TRUE; diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 7e5887cd08..7469a90ac2 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -74,7 +74,7 @@ void WINAPIV output_message(unsigned int id, ...) WCHAR fmt[1536]; __ms_va_list va_args; - if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, sizeof(fmt)/sizeof(*fmt))) + if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); return; @@ -89,7 +89,7 @@ void WINAPIV error_exit(unsigned int id, ...) WCHAR fmt[1536]; __ms_va_list va_args; - if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, sizeof(fmt)/sizeof(*fmt))) + if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) { WINE_FIXME("LoadString failed with %u\n", GetLastError()); return; -- 2.17.0

1 0

[PATCH 05/11] regedit: Remove regproc.h
by Hugh McMaster 21 May '18

21 May '18

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/regproc.h | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 programs/regedit/regproc.h diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h deleted file mode 100644 index cec59e7153..0000000000 --- a/programs/regedit/regproc.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 1999 Sylvain St-Germain - * Copyright 2002 Andriy Palamarchuk - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "resource.h" - - - -- 2.17.0

1 0

[PATCH 04/11] regedit: Move remaining definitions from regproc.h to main.h
by Hugh McMaster 21 May '18

21 May '18

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/childwnd.c | 1 - programs/regedit/edit.c | 1 - programs/regedit/framewnd.c | 1 - programs/regedit/hexedit.c | 1 - programs/regedit/listview.c | 1 - programs/regedit/main.h | 6 +++++- programs/regedit/regedit.c | 1 - programs/regedit/regproc.c | 1 - programs/regedit/regproc.h | 3 --- programs/regedit/treeview.c | 1 - 10 files changed, 5 insertions(+), 12 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 0c6d895193..ceeeb1d75a 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -24,7 +24,6 @@ #include <stdio.h> #include "main.h" -#include "regproc.h" #include "wine/debug.h" #include "wine/heap.h" diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 63cc7a564c..bd6d720f2a 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -32,7 +32,6 @@ #include "wine/heap.h" #include "wine/unicode.h" #include "main.h" -#include "regproc.h" static const WCHAR* editValueName; static WCHAR* stringValueData; diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 804573e0c0..99f7686879 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -29,7 +29,6 @@ #include <shellapi.h> #include "main.h" -#include "regproc.h" #include "wine/debug.h" #include "wine/heap.h" #include "wine/unicode.h" diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index c7bdd0ae52..0d28388e21 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -37,7 +37,6 @@ #include "wine/heap.h" #include "main.h" -#include "regproc.h" /* spaces dividing hex and ASCII */ #define DIV_SPACES 4 diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 404699fab8..4f3593fe7c 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -26,7 +26,6 @@ #include <stdio.h> #include "main.h" -#include "regproc.h" #include "wine/heap.h" #include "wine/unicode.h" diff --git a/programs/regedit/main.h b/programs/regedit/main.h index c9143c1767..af61252565 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -32,7 +32,11 @@ #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) -#define MAX_NEW_KEY_LEN 128 +#define MAX_NEW_KEY_LEN 128 +#define KEY_MAX_LEN 1024 + +#define REG_FORMAT_5 1 +#define REG_FORMAT_4 2 /* Pop-Up Menus */ #define PM_COMPUTER 0 diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 1d732a850e..7e5887cd08 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -27,7 +27,6 @@ #include "wine/debug.h" #include "wine/heap.h" #include "main.h" -#include "regproc.h" WINE_DEFAULT_DEBUG_CHANNEL(regedit); diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 0a34cfb049..c4900e6c6d 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -32,7 +32,6 @@ #include <wine/debug.h> #include <wine/heap.h> #include "main.h" -#include "regproc.h" WINE_DEFAULT_DEBUG_CHANNEL(regedit); diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index 58f707b854..cec59e7153 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -19,8 +19,5 @@ #include "resource.h" -#define KEY_MAX_LEN 1024 -#define REG_FORMAT_5 1 -#define REG_FORMAT_4 2 diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 86224e231b..9d75a31dd6 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -32,7 +32,6 @@ #include "wine/heap.h" #include "main.h" -#include "regproc.h" WINE_DEFAULT_DEBUG_CHANNEL(regedit); -- 2.17.0

1 0

[PATCH 03/11] regedit: Move regedit.c functions from regproc.h to main.h
by Hugh McMaster 21 May '18

21 May '18

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/main.h | 4 ++++ programs/regedit/regproc.h | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/regedit/main.h b/programs/regedit/main.h index a0c93534df..c9143c1767 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -141,6 +141,10 @@ extern LPCWSTR GetValueName(HWND hwndLV); extern BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result); extern BOOL IsDefaultValue(HWND hwndLV, int i); +/* regedit.c */ +void WINAPIV output_message(unsigned int id, ...); +void WINAPIV error_exit(unsigned int id, ...); + /* regproc.c */ void *heap_xalloc(size_t size); void *heap_xrealloc(void *buf, size_t size); diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index bf963a7425..58f707b854 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -24,6 +24,3 @@ #define REG_FORMAT_5 1 #define REG_FORMAT_4 2 -void WINAPIV output_message(unsigned int id, ...); -void WINAPIV error_exit(unsigned int id, ...); - -- 2.17.0

1 0

[PATCH 02/11] regedit: Move regproc.c functions from regproc.h to main.h
by Hugh McMaster 21 May '18

21 May '18

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/main.h | 10 +++++++++- programs/regedit/regedit.c | 2 ++ programs/regedit/regproc.c | 2 ++ programs/regedit/regproc.h | 6 ------ 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/programs/regedit/main.h b/programs/regedit/main.h index 1d0109f9e5..a0c93534df 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -21,9 +21,9 @@ #ifndef __MAIN_H__ #define __MAIN_H__ +#include <stdio.h> #include "resource.h" - #define STATUS_WINDOW 2001 #define TREE_WINDOW 2002 #define LIST_WINDOW 2003 @@ -141,6 +141,14 @@ extern LPCWSTR GetValueName(HWND hwndLV); extern BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result); extern BOOL IsDefaultValue(HWND hwndLV, int i); +/* regproc.c */ +void *heap_xalloc(size_t size); +void *heap_xrealloc(void *buf, size_t size); +char *GetMultiByteString(const WCHAR *strW); +BOOL import_registry_file(FILE *reg_file); +void delete_registry_key(WCHAR *reg_key_name); +BOOL export_registry_key(WCHAR *file_name, WCHAR *path, DWORD format); + /* treeview.c */ extern HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, UINT id); extern BOOL RefreshTreeView(HWND hWndTV); diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index a69e929e48..1d732a850e 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -21,10 +21,12 @@ #include <stdio.h> #include <stdlib.h> #include <windows.h> +#include <commctrl.h> #include <shellapi.h> #include "wine/unicode.h" #include "wine/debug.h" #include "wine/heap.h" +#include "main.h" #include "regproc.h" WINE_DEFAULT_DEBUG_CHANNEL(regedit); diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 65087c97ee..0a34cfb049 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -27,9 +27,11 @@ #include <fcntl.h> #include <io.h> #include <windows.h> +#include <commctrl.h> #include <wine/unicode.h> #include <wine/debug.h> #include <wine/heap.h> +#include "main.h" #include "regproc.h" WINE_DEFAULT_DEBUG_CHANNEL(regedit); diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index bfb0cba04b..bf963a7425 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -27,9 +27,3 @@ void WINAPIV output_message(unsigned int id, ...); void WINAPIV error_exit(unsigned int id, ...); -char *GetMultiByteString(const WCHAR *strW); -void *heap_xalloc(size_t size); -void *heap_xrealloc(void *buf, size_t size); -BOOL import_registry_file(FILE *reg_file); -void delete_registry_key(WCHAR *reg_key_name); -BOOL export_registry_key(WCHAR *file_name, WCHAR *path, DWORD format); -- 2.17.0

1 0

[PATCH 01/11] regedit: Replace the COUNT_OF macro with ARRAY_SIZE
by Hugh McMaster 21 May '18

21 May '18

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/about.c | 2 +- programs/regedit/edit.c | 10 +++++----- programs/regedit/framewnd.c | 16 ++++++++-------- programs/regedit/listview.c | 2 +- programs/regedit/main.c | 4 ++-- programs/regedit/main.h | 2 +- programs/regedit/treeview.c | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/programs/regedit/about.c b/programs/regedit/about.c index e0e469efe1..6684dbe634 100644 --- a/programs/regedit/about.c +++ b/programs/regedit/about.c @@ -29,6 +29,6 @@ void ShowAboutBox(HWND hWnd) { WCHAR title[64]; HICON icon = LoadImageW( hInst, MAKEINTRESOURCEW(IDI_REGEDIT), IMAGE_ICON, 48, 48, LR_SHARED ); - LoadStringW(hInst, IDS_APP_TITLE, title, COUNT_OF(title)); + LoadStringW(hInst, IDS_APP_TITLE, title, ARRAY_SIZE(title)); ShellAboutW(hWnd, title, NULL, icon); } diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 0c5fdec168..63cc7a564c 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -53,8 +53,8 @@ static int vmessagebox(HWND hwnd, int buttons, int titleId, int resId, __ms_va_l WCHAR *str; int ret; - LoadStringW(hInst, titleId, title, COUNT_OF(title)); - LoadStringW(hInst, resId, fmt, COUNT_OF(fmt)); + LoadStringW(hInst, titleId, title, ARRAY_SIZE(title)); + LoadStringW(hInst, resId, fmt, ARRAY_SIZE(fmt)); FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, fmt, 0, 0, (WCHAR *)&str, 0, &va_args); @@ -93,7 +93,7 @@ static BOOL change_dword_base(HWND hwndDlg, BOOL toHex) WCHAR buf[128]; DWORD val; - if (!GetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, buf, COUNT_OF(buf))) return FALSE; + if (!GetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, buf, ARRAY_SIZE(buf))) return FALSE; if (!swscanf(buf, toHex ? percent_u : percent_x, &val)) return FALSE; wsprintfW(buf, toHex ? percent_x : percent_u, val); return SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, buf); @@ -243,7 +243,7 @@ BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR keyName) goto done; } - if (!LoadStringW(GetModuleHandleW(0), IDS_NEWKEY, newKey, COUNT_OF(newKey))) goto done; + if (!LoadStringW(GetModuleHandleW(0), IDS_NEWKEY, newKey, ARRAY_SIZE(newKey))) goto done; /* try to find a name for the key being created (maximum = 100 attempts) */ for (keyNum = 1; keyNum < 100; keyNum++) { @@ -459,7 +459,7 @@ BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPW return FALSE; } - if (!LoadStringW(GetModuleHandleW(0), IDS_NEWVALUE, newValue, COUNT_OF(newValue))) goto done; + if (!LoadStringW(GetModuleHandleW(0), IDS_NEWVALUE, newValue, ARRAY_SIZE(newValue))) goto done; /* try to find a name for the value being created (maximum = 100 attempts) */ for (valueNum = 1; valueNum < 100; valueNum++) { diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 94da217045..804573e0c0 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -167,7 +167,7 @@ static void update_new_items_and_copy_keyname(HMENU hMenu, WCHAR *keyName) if (!keyName) state = MF_GRAYED; - for (i = 0; i < COUNT_OF(items); i++) + for (i = 0; i < ARRAY_SIZE(items); i++) EnableMenuItem(hMenu, items[i], state | MF_BYCOMMAND); } @@ -469,7 +469,7 @@ static BOOL ImportRegistryFile(HWND hWnd) InitOpenFileName(hWnd, &ofn); ofn.Flags |= OFN_ENABLESIZING; - LoadStringW(hInst, IDS_FILEDIALOG_IMPORT_TITLE, title, COUNT_OF(title)); + LoadStringW(hInst, IDS_FILEDIALOG_IMPORT_TITLE, title, ARRAY_SIZE(title)); ofn.lpstrTitle = title; if (GetOpenFileNameW(&ofn)) { if (!import_registry_filename(ofn.lpstrFile)) { @@ -498,7 +498,7 @@ static BOOL ExportRegistryFile(HWND hWnd) WCHAR title[128]; InitOpenFileName(hWnd, &ofn); - LoadStringW(hInst, IDS_FILEDIALOG_EXPORT_TITLE, title, COUNT_OF(title)); + LoadStringW(hInst, IDS_FILEDIALOG_EXPORT_TITLE, title, ARRAY_SIZE(title)); ofn.lpstrTitle = title; ofn.Flags = OFN_ENABLETEMPLATE | OFN_ENABLEHOOK | OFN_EXPLORER | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT; ofn.lpfnHook = ExportRegistryFile_OFNHookProc; @@ -676,7 +676,7 @@ static INT_PTR CALLBACK addtofavorites_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w item.mask = TVIF_HANDLE | TVIF_TEXT; item.hItem = selected; item.pszText = buf; - item.cchTextMax = COUNT_OF(buf); + item.cchTextMax = ARRAY_SIZE(buf); SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETITEMW, 0, (LPARAM)&item); EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE); @@ -1065,10 +1065,10 @@ LRESULT CALLBACK FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa CreateWindowExW(0, szChildClass, captionW, WS_CHILD | WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, hWnd, NULL, hInst, 0); - LoadStringW(hInst, IDS_EXPAND, expandW, COUNT_OF(expandW)); - LoadStringW(hInst, IDS_COLLAPSE, collapseW, COUNT_OF(collapseW)); - LoadStringW(hInst, IDS_EDIT_MODIFY, modifyW, COUNT_OF(modifyW)); - LoadStringW(hInst, IDS_EDIT_MODIFY_BIN, modify_binaryW, COUNT_OF(modify_binaryW)); + LoadStringW(hInst, IDS_EXPAND, expandW, ARRAY_SIZE(expandW)); + LoadStringW(hInst, IDS_COLLAPSE, collapseW, ARRAY_SIZE(collapseW)); + LoadStringW(hInst, IDS_EDIT_MODIFY, modifyW, ARRAY_SIZE(modifyW)); + LoadStringW(hInst, IDS_EDIT_MODIFY_BIN, modify_binaryW, ARRAY_SIZE(modify_binaryW)); break; case WM_COMMAND: if (!_CmdWndProc(hWnd, message, wParam, lParam)) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 0934e03a39..404699fab8 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -361,7 +361,7 @@ HWND CreateListView(HWND hwndParent, UINT id) WCHAR ListView[] = {'L','i','s','t',' ','V','i','e','w',0}; /* prepare strings */ - LoadStringW(hInst, IDS_REGISTRY_VALUE_NOT_SET, g_szValueNotSet, COUNT_OF(g_szValueNotSet)); + LoadStringW(hInst, IDS_REGISTRY_VALUE_NOT_SET, g_szValueNotSet, ARRAY_SIZE(g_szValueNotSet)); /* Get the dimensions of the parent window's client area, and create the list view control. */ GetClientRect(hwndParent, &rcClient); diff --git a/programs/regedit/main.c b/programs/regedit/main.c index 19d720d4d2..62fd616b51 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -172,8 +172,8 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi } /* Initialize global strings */ - LoadStringW(hInstance, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); - LoadStringW(hInstance, IDS_REGISTRY_DEFAULT_VALUE, g_pszDefaultValueName, COUNT_OF(g_pszDefaultValueName)); + LoadStringW(hInstance, IDS_APP_TITLE, szTitle, ARRAY_SIZE(szTitle)); + LoadStringW(hInstance, IDS_REGISTRY_DEFAULT_VALUE, g_pszDefaultValueName, ARRAY_SIZE(g_pszDefaultValueName)); /* Store instance handle in our global variable */ hInst = hInstance; diff --git a/programs/regedit/main.h b/programs/regedit/main.h index 788de1a509..1d0109f9e5 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -30,7 +30,7 @@ #define SPLIT_WIDTH 5 -#define COUNT_OF(a) (sizeof(a)/sizeof(a[0])) +#define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) #define MAX_NEW_KEY_LEN 128 diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 4bbec40df8..86224e231b 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -521,7 +521,7 @@ HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPWSTR name) item.mask = TVIF_HANDLE | TVIF_TEXT; item.hItem = hNewItem; item.pszText = buf; - item.cchTextMax = COUNT_OF(buf); + item.cchTextMax = ARRAY_SIZE(buf); if (!TreeView_GetItemW(hwndTV, &item)) continue; if (lstrcmpW(name, item.pszText) == 0) break; } -- 2.17.0

1 0

[PATCH 6/6] winmm: Reset the tick counter after handling messages.
by Akihiro Sagawa 21 May '18

21 May '18

Otherwise, events might be triggered immediately after a resuming. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 4 ++-- dlls/winmm/winmm.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)

2 1

[PATCH 5/6] winmm: Return a continuous stream position in MIDI stream.
by Akihiro Sagawa 21 May '18

21 May '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 8 ++++---- dlls/winmm/winmm.c | 37 +++++++++++++++++++++++++++++++++---- 2 files changed, 37 insertions(+), 8 deletions(-)

2 1

[PATCH 3/3] mshtml/tests: Added more ref counting and aggregation tests.
by Jacek Caban 21 May '18

21 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/tests/protocol.c | 131 ++++++++++++++++++++++++++++++++----------- 1 file changed, 97 insertions(+), 34 deletions(-)

2 1

[PATCH 1/3] urlmon/tests: Use the same thread for both connections in redirect tests.
by Jacek Caban 21 May '18

21 May '18

Fixes a race spotted by Zebediah Figura. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/tests/protocol.c | 58 +++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 27 deletions(-)

2 1

[PATCH 2/3] urlmon: Ensure that inner protocol handler reference is released after other references.
by Jacek Caban 21 May '18

21 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/bindprot.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)

1 0

[PATCH 1/7] comctl32/taskdialog: Add standard resources.
by Zhiyi Zhang 21 May '18

21 May '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/comctl32.h | 18 + dlls/comctl32/comctl32.rc | 36 ++ dlls/comctl32/idb_td_downarrow_hovered.bmp | Bin 0 -> 322 bytes dlls/comctl32/idb_td_downarrow_normal.bmp | Bin 0 -> 322 bytes dlls/comctl32/idb_td_downarrow_pressed.bmp | Bin 0 -> 322 bytes dlls/comctl32/idb_td_uparrow_hovered.bmp | Bin 0 -> 322 bytes dlls/comctl32/idb_td_uparrow_normal.bmp | Bin 0 -> 322 bytes dlls/comctl32/idb_td_uparrow_pressed.bmp | Bin 0 -> 322 bytes dlls/comctl32/idi_td_error.ico | Bin 0 -> 5430 bytes dlls/comctl32/idi_td_error.svg | 489 +++++++++++++++++++++ dlls/comctl32/idi_td_info.ico | Bin 0 -> 5430 bytes dlls/comctl32/idi_td_info.svg | 385 ++++++++++++++++ dlls/comctl32/idi_td_shield.ico | Bin 0 -> 5430 bytes dlls/comctl32/idi_td_shield.svg | 373 ++++++++++++++++ dlls/comctl32/idi_td_warning.ico | Bin 0 -> 5430 bytes dlls/comctl32/idi_td_warning.svg | 415 +++++++++++++++++ 16 files changed, 1716 insertions(+) create mode 100644 dlls/comctl32/idb_td_downarrow_hovered.bmp create mode 100644 dlls/comctl32/idb_td_downarrow_normal.bmp create mode 100644 dlls/comctl32/idb_td_downarrow_pressed.bmp create mode 100644 dlls/comctl32/idb_td_uparrow_hovered.bmp create mode 100644 dlls/comctl32/idb_td_uparrow_normal.bmp create mode 100644 dlls/comctl32/idb_td_uparrow_pressed.bmp create mode 100644 dlls/comctl32/idi_td_error.ico create mode 100644 dlls/comctl32/idi_td_error.svg create mode 100644 dlls/comctl32/idi_td_info.ico create mode 100644 dlls/comctl32/idi_td_info.svg create mode 100644 dlls/comctl32/idi_td_shield.ico create mode 100644 dlls/comctl32/idi_td_shield.svg create mode 100644 dlls/comctl32/idi_td_warning.ico create mode 100644 dlls/comctl32/idi_td_warning.svg diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index e2367aa60b..7a1119bbc3 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -109,6 +109,24 @@ extern HBRUSH COMCTL32_hPattern55AABrush DECLSPEC_HIDDEN; #define IDS_BUTTON_CANCEL 3004 #define IDS_BUTTON_CLOSE 3005 +/* Task dialog icons */ +#define IDI_TD_WARNING -1 +#define IDI_TD_ERROR -2 +#define IDI_TD_INFO -3 +#define IDI_TD_SHIELD -4 + +/* Task dialog expanded/collaged control imagelist bitmap */ +#define IDB_TD_UPARROW_NORMAL 3010 +#define IDB_TD_UPARROW_HOVERED 3011 +#define IDB_TD_UPARROW_PRESSED 3012 +#define IDB_TD_DOWNARROW_NORMAL 3013 +#define IDB_TD_DOWNARROW_HOVERED 3014 +#define IDB_TD_DOWNARROW_PRESSED 3015 + +/* Task dialog expando control default text */ +#define IDS_TD_EXPANDED 3020 +#define IDS_TD_COLLAPSED 3021 + #define WM_SYSTIMER 0x0118 enum combobox_state_flags diff --git a/dlls/comctl32/comctl32.rc b/dlls/comctl32/comctl32.rc index cea815a347..99c40270da 100644 --- a/dlls/comctl32/comctl32.rc +++ b/dlls/comctl32/comctl32.rc @@ -56,6 +56,12 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } +STRINGTABLE +{ + IDS_TD_EXPANDED "Hide details" + IDS_TD_COLLAPSED "See details" +} + IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Properties for %s" @@ -161,3 +167,33 @@ IDI_TT_WARN_SM ICON idi_tt_warn_sm.ico /* @makedep: idi_tt_error_sm.ico */ IDI_TT_ERROR_SM ICON idi_tt_error_sm.ico + +/* @makedep: idi_td_warning.ico */ +IDI_TD_WARNING ICON idi_td_warning.ico + +/* @makedep: idi_td_error.ico */ +IDI_TD_ERROR ICON idi_td_error.ico + +/* @makedep: idi_td_info.ico */ +IDI_TD_INFO ICON idi_td_info.ico + +/* @makedep: idi_td_shield.ico */ +IDI_TD_SHIELD ICON idi_td_shield.ico + +/* @makedep: idb_td_uparrow_normal.bmp */ +IDB_TD_UPARROW_NORMAL BITMAP idb_td_uparrow_normal.bmp + +/* @makedep: idb_td_uparrow_hovered.bmp */ +IDB_TD_UPARROW_HOVERED BITMAP idb_td_uparrow_hovered.bmp + +/* @makedep: idb_td_uparrow_pressed.bmp */ +IDB_TD_UPARROW_PRESSED BITMAP idb_td_uparrow_pressed.bmp + +/* @makedep: idb_td_downarrow_normal.bmp */ +IDB_TD_DOWNARROW_NORMAL BITMAP idb_td_downarrow_normal.bmp + +/* @makedep: idb_td_downarrow_hovered.bmp */ +IDB_TD_DOWNARROW_HOVERED BITMAP idb_td_downarrow_hovered.bmp + +/* @makedep: idb_td_downarrow_pressed.bmp */ +IDB_TD_DOWNARROW_PRESSED BITMAP idb_td_downarrow_pressed.bmp diff --git a/dlls/comctl32/idb_td_downarrow_hovered.bmp b/dlls/comctl32/idb_td_downarrow_hovered.bmp new file mode 100644 index 0000000000000000000000000000000000000000..0f3288f3245626b2e77aa6a98ee99ba4bcfbba49 GIT binary patch literal 322 zcmZ?rbz)=ygEAng0mOn(%*en37RN>G-@l)szP_H}|NsBEln^D(qyzyV#mvZTK`>AP si=(j_1qET^0t^T?0|O&WTmYyI#uh|YgNqHa0cIw4wlNqOf!u=(0AHICT>t<8 literal 0 HcmV?d00001 diff --git a/dlls/comctl32/idb_td_downarrow_normal.bmp b/dlls/comctl32/idb_td_downarrow_normal.bmp new file mode 100644 index 0000000000000000000000000000000000000000..3cbf4fbba4cf728c361ad1a2ac2f24576df47145 GIT binary patch literal 322 zcmZ?rbz)=ygEAng0mOn(%*en37RN>G-@l)szP_H}|NsBEln^D(qyzyV#mvZTK`>AP zivyX$f`V|ivLT!;q+|?dD=8@(Le&TXO@fOHDIu#zW+Ryiv;uBER<<!17@>O#07Y~Y AfdBvi literal 0 HcmV?d00001 diff --git a/dlls/comctl32/idb_td_downarrow_pressed.bmp b/dlls/comctl32/idb_td_downarrow_pressed.bmp new file mode 100644 index 0000000000000000000000000000000000000000..51b38e90f7576543ddcb28b729243df3ce2beaee GIT binary patch literal 322 zcmZ?rbz)=ygEAng0mOn(%*en37RN>G-@l)szP=upG|}Qrf)D`GfR8NzR0dPSzzAmx f09_0d2TC)-*n&uEaI!%*!^|YeR)PSKdSn0qN^lGH literal 0 HcmV?d00001 diff --git a/dlls/comctl32/idb_td_uparrow_hovered.bmp b/dlls/comctl32/idb_td_uparrow_hovered.bmp new file mode 100644 index 0000000000000000000000000000000000000000..ce3aa0e29ae0f609da861858e4d86e6506edab32 GIT binary patch literal 322 zcmZ?rbz)=ygEAng0mOn(%*en37RN>G-@l)szP_H}|NsBEln^D(qyzyV#mvZTK`>AP ti=(my7z71j;yBm>Ky7d}3=E8LHnMs_Mua&a8(?N)XB&fo5y(Br003eO5nTWP literal 0 HcmV?d00001 diff --git a/dlls/comctl32/idb_td_uparrow_normal.bmp b/dlls/comctl32/idb_td_uparrow_normal.bmp new file mode 100644 index 0000000000000000000000000000000000000000..6abb810636636c1570c395a20254108ac3237835 GIT binary patch literal 322 zcmZ?rbz)=ygEAng0mOn(%*en37RN>G-@l)szP_H}|NsBEln^D(qyzyV#mvZTK`>AP zivyX)hJrA*kP=q5u#u9mAykbJ&?LBeB_%~TTS!R|&K6WeVgs#!nGdoUlWhzJM(Cab E0AU&vp8x;= literal 0 HcmV?d00001 diff --git a/dlls/comctl32/idb_td_uparrow_pressed.bmp b/dlls/comctl32/idb_td_uparrow_pressed.bmp new file mode 100644 index 0000000000000000000000000000000000000000..872dc323044903f728efb046520a9cb15b9f304a GIT binary patch literal 322 zcmZ?rbz)=ygEAng0mOn(%*en37RN>G-@l)szP=upG|}Qrf)D`GfRD|<C<t;ISPc#~ hP?iy<MgZs&7+Vloy#UZUm^mPuiDoN707yMD002Rt3-tg1 literal 0 HcmV?d00001 diff --git a/dlls/comctl32/idi_td_error.ico b/dlls/comctl32/idi_td_error.ico new file mode 100644 index 0000000000000000000000000000000000000000..d75e2b0851156d2c6f7e10dacd5c66e071749331 GIT binary patch literal 5430 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 R_aDobvZ*tCf_fnY{s%|R@Mr)4 literal 0 HcmV?d00001 diff --git a/dlls/comctl32/idi_td_error.svg b/dlls/comctl32/idi_td_error.svg new file mode 100644 index 0000000000..596c1cde98 --- /dev/null +++ b/dlls/comctl32/idi_td_error.svg @@ -0,0 +1,489 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg2" + height="272" + width="632" + version="1.1" + sodipodi:docname="oic_hand.svg" + inkscape:version="0.92.3 (2405546, 2018-03-11)"> + <metadata + id="metadata920"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1287" + inkscape:window-height="969" + id="namedview918" + showgrid="false" + inkscape:zoom="1" + inkscape:cx="296" + inkscape:cy="27.500191" + inkscape:window-x="202" + inkscape:window-y="153" + inkscape:window-maximized="0" + inkscape:current-layer="svg2" /> + <defs + id="defs4"> + <radialGradient + id="radialGradient3402" + gradientUnits="userSpaceOnUse" + cy="40" + cx="23.857" + gradientTransform="matrix(1,0,0,0.5,0,20)" + r="17.143"> + <stop + id="stop4128-3" + stop-color="#000" + offset="0" /> + <stop + id="stop4130-9" + stop-color="#000" + stop-opacity="0" + offset="1" /> + </radialGradient> + <linearGradient + id="linearGradient3404" + y2="5.541" + gradientUnits="userSpaceOnUse" + x2="19.071" + y1="66.288" + x1="36.918"> + <stop + id="stop2538-9" + stop-color="#a40000" + offset="0" /> + <stop + id="stop2540-6" + stop-color="#ff1717" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient3406" + y2="-8.5627" + gradientUnits="userSpaceOnUse" + x2="20.065" + y1="53.836" + x1="43.936"> + <stop + id="stop2481-3" + stop-color="#ffe69b" + offset="0" /> + <stop + id="stop2483-3" + stop-color="#FFF" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient3408" + y2="15.815" + gradientUnits="userSpaceOnUse" + x2="20.917" + gradientTransform="matrix(1.002994,0,0,1.002994,-0.071859,0.01968356)" + y1="33.955" + x1="21.994"> + <stop + id="stop3959-0" + stop-color="#fffeff" + stop-opacity="0.33333334" + offset="0" /> + <stop + id="stop3961-5" + stop-color="#fffeff" + stop-opacity="0.21568628" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient3568" + y2="15.815" + gradientUnits="userSpaceOnUse" + x2="20.917" + gradientTransform="matrix(0.68106924,0,0,0.68120249,175.15491,24.088557)" + y1="33.955" + x1="21.994"> + <stop + id="stop3959-1" + stop-color="#fffeff" + stop-opacity="0.33333334" + offset="0" /> + <stop + id="stop3961-3" + stop-color="#fffeff" + stop-opacity="0.21568628" + offset="1" /> + </linearGradient> + <radialGradient + id="radialGradient3578" + gradientUnits="userSpaceOnUse" + cy="40" + cx="23.857" + gradientTransform="matrix(0.713704,0,0,0.175,174.40483,45.999578)" + r="17.143"> + <stop + id="stop4128-8" + stop-color="#000" + offset="0" /> + <stop + id="stop4130-7" + stop-color="#000" + stop-opacity="0" + offset="1" /> + </radialGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3404" + id="linearGradient922" + gradientUnits="userSpaceOnUse" + x1="36.918" + y1="66.288" + x2="19.071" + y2="5.541" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3406" + id="linearGradient924" + gradientUnits="userSpaceOnUse" + x1="43.936" + y1="53.836" + x2="20.065" + y2="-8.5627" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3404" + id="linearGradient926" + gradientUnits="userSpaceOnUse" + x1="36.918" + y1="66.288" + x2="19.071" + y2="5.541" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3406" + id="linearGradient928" + gradientUnits="userSpaceOnUse" + x1="43.936" + y1="53.836" + x2="20.065" + y2="-8.5627" /> + <radialGradient + inkscape:collect="always" + xlink:href="#radialGradient3402" + id="radialGradient954" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.5,0,20)" + cx="23.857" + cy="40" + r="17.143" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3404" + id="linearGradient956" + gradientUnits="userSpaceOnUse" + x1="36.918" + y1="66.288" + x2="19.071" + y2="5.541" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3406" + id="linearGradient958" + gradientUnits="userSpaceOnUse" + x1="43.936" + y1="53.836" + x2="20.065" + y2="-8.5627" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3408" + id="linearGradient960" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.002994,0,0,1.002994,-0.071859,0.01968356)" + x1="21.994" + y1="33.955" + x2="20.917" + y2="15.815" /> + </defs> + <image + id="icon:16-4" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAAXNSR0IArs4c6QAAADBQTFRFfwAA AAAAAH8Af38AAAB/fwB/AH9/wMDAf39//wAAAP8A//8AAAD//wD/AP//////LRS/BQAAAAF0Uk5T AEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2QsVCws5WVbP 2QAAAE9JREFUCNdVzj0OwCAIBWC8gW5clYmw2RPYd1LWPhtDUxe+8KuItDG68DWdM7b0Au5ggpHq xAKMULitRBAr3V7AE39U6TTXeC2sE9/R840H/g8x8bJY2NEAAAAASUVORK5CYII= " + height="16" + width="16" + y="252" + x="608" /> + <image + id="icon:16-8" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAAXNSR0IArs4c6QAAAaFQTFRFw6Cg pQYGsgcHswkJtAoKtQsLtQ0N0wgJ0wkI0wkJ1AkJ0goJ0woJ1AoK0wsL1QsK1QsL1gsL1gwM1wwM 1g0O1w0M1w0N1w0O1g4P2A4N2A4O2Q8P2RER2RISqiAg3BMS3RMU2xQT3RQT3RQU3hQU1BcW3BUU 1RcX3hUV3xUVzRoa3hYW3xYW3hcX3xcW4BcW4BcX4BcY3hgX4BgX4RgY4RkZ4hkZ4Roa2R0d4Rsb 1x4d2B4e4hwc2R8f0SIi2SAf2SAg2iAg2yAg1CIi0SMj2iEg0yMj2yEg0iQk0yYm3SUl3SUm1icn 3iYl3iYm3yYn1ikq4Cgp4Cko4Ckp1i0t2C4urzo61zAv2DAw5C8v2zIy2jMz2zQ02zY22Tc33TY2 2jc33Tc32zk63jk53jo62zs73D092z494z083D8/4T4+4UJC4EVFtFNT4UlJ5ElJ5ExM5E1O5lBP 5lFR5FJS6VJS6FdY6Fpb6Ftb6Vxc6l9f6mBg6LS06bW16ba267e467i3zMzM6sfH68jI68jJ7MnJ 6svK68vL7MzM7M3N7+/vl89hgwAAAAF0Uk5TAEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMAAAsT AAALEwEAmpwYAAAAB3RJTUUH2QsVCQogJ6KCNgAAAOlJREFUGNNjYACBXDlGRrlcBhjIZUsprqwo iGGFCoWFVEdamhgYBZZ4hoHlQ0ptzEz0NVUU1LJdQGrYqmwyGoK1VbzrEmXzWIAKkiNN67ta/Xxb uuqkbQNyGeSKzA2DWrvaO7ua3SUlkuQYGMuNdTT82ru6OpzEhQQyGRkYy/Q0lL06u7raHIQFedMZ GeTydZW8mrs62rqarHn5ouUYcqP85eu6ml3tm7pqONTdgPayFCrG1zqKClnVhHPHMYEc5pElIyUm KMjFzhOqBXZ8mF2OhQg/F6dqglYY1HPMPrFpqRHOTEj+RXgfAN5cO0i/HqtwAAAAAElFTkSuQmCC " + height="16" + width="16" + y="252" + x="584" /> + <image + id="icon:16-32" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A /wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9kLDgsLLLOT+6wAAAKdSURBVDjL nZPNS1RhFMZ/994ZP2eaO1NkGFQ6XxqOC6VUauGytpFgMIFEi7FaRMsK/BvcVKuSNGzlKqml0Co3 akrmpEmYYjjOF3PVyfu+p4WNhLXqwNkcnnMOzznPY3AkxqALGAB6gabf5VVgChhJwoc/8caR5qdB vz/VmkhQ09CAVV+PiOAWCuxubpJeXCTnOM+SMPjXgDF425FIXDnR2cnPmRlUJgNKISJoA0w7hOd8 K7mFBebS6XdJuApgVTZ3JBL9x6NRyu/fI6USaI2IRrSA1mhnB3ftG3XRKAHTjFzO5U5NwKQ5Bl1B vz91oqOD8vQ0RtM5al88R4JBtICIIMEQvtGXGM1h9mZnsWMx7Lq61Bh0mcBAa1sbP2dnEaWoefgY T1c3vpERsG0IBTk2OkpVTw++oSFQir1Pn2g+ew5gwAR6axpOora2EC04D+6j0mmsWAz/q1ccG3+N Jx7DXVqiePcOIhqVy+O1bYBeE2gy63yIVohodGab4s2buMvLeCIRrOZm1MoK+f5+3EwWrQVRLkaV F6DJAxxeu5KIYJjm4Xu1aDSAaDjEaQBMYNUtFhCMg2LwgHNl8/7yF7yRKMHxcYxQCC2CGAbi7ACs msDU7o8fGAEbEcE3PIwnHsddWiLbd51cXx/7nz/jbWnBfvIEEY3p81HO5wGmrGuQcQqF26cvXGT/ +xr7cx+xwmHyt26htjPonV12J9/gbW8n9/gRKpulKh5nOZ2mrNQ9oyKk9kgkFWhsZG9+HqncRB/w 1FojckDYG4niZDIsbmw8S8KgBTABk5ey2e6AZUXq29pQpRJ6r3yoRAGMgJ/qeAulzU0WNzbeJeHG P80UqK1Nhc+cwRsIYFRXI1qjHAe3WOTr+jrFcvnfZvpfO/8CD9NWPZoYa3oAAAAASUVORK5CYII= " + height="16" + width="16" + y="252" + x="560" /> + <image + id="icon:32-4" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAAXNSR0IArs4c6QAAADBQTFRFfwAA AAAAAH8Af38AAAB/fwB/AH9/wMDAf39//wAAAP8A//8AAAD//wD/AP//////LRS/BQAAAAF0Uk5T AEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH2QsVCwoDhkEn KgAAAJRJREFUKM99kU0OhTAIhPUGduU5u+LdQN4NZNVzukI6bbRmjCQsmH5Qfqbp3VJKyxDOSURy uuNVVHWTS1l/CpOeNUdsZrtq7oD+Dabb0oEWB5Ob0IFAcsswKwbfkVMFP+CXUNzhEFDC/fBK1SIQ 4jmAQQikAoNQAHwQVGP8hfp47fQ5C01L+6CN8U5p63wXuhzf9tNOGG+6NLjSj9MAAAAASUVORK5C YII= " + height="32" + width="32" + y="236" + x="520" /> + <image + id="icon:32-8" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAAAXNSR0IArs4c6QAAAvpQTFRFzwAE tQAAtwAHuQAJsQYAsQYEzgAEvAULsgkF0QAG0QIQswwG0gMH3AAOyAgK3QIPvgwNtRAH0wcI0wcR yQsLthEQ3gYQ1QoJtxMRyw4MwREPyg8UuBUSwhMQ1g4KzBEN1g4TuRca4Q0I4QwSzRMO1xELuRgg uhkazRQWxBcZxBgSzhYPuxsbzhYXxhkTuxsh2BQV4hEbxRoa0RoRxxwb4xQc0RoZyB0c2xgXyR8d yyAX0x4b5hkeuiYo5xseuygp1iIdvCkq4CAb2CUl2Scs0iop1S0l1C0rzzEp0DIj2DEn2DEt4TAx 2TM03TUqvj07vT1B3TYxvz5CwD89wD9DukFB5TY7u0JB2DxB1UAvvkVD3D4y3D8+6js+5D5C2UQ5 50A41Ucy1kky3Ec61kk46UNF8UFD3Ug72Us08kJE40dK30o92Uw730pD80RE7UZC20087EdI9EVF 5klL/ENI4kw/3E497khJ9kZGv1VW9UZM/URJ401A6EtH90dH6ExN/0ZF9khN8EpL/kZK/0dF6k1J 8UtM/0dLwlhZvVpX+UpJ8UxR4VNBv1tY6FFD801N+0tK7E9Q7lBL7VBR51JP9U9O41VI7lFS4VVT 2ldX6VRR4FZZ/09N/k9S+FFQ6VVW4lda5FdV3VlZ8VRU61ZS6lZX41hb/1FP/1FU5Vlc81ZW5lpX /FVT8FpV9lhY6VxZ/ldV5V9Z/1hW8Vxc6l5g8GJf7Wdf62tg9mhj/mdn8Wtp+Wpl7m5j8m1v9G1r 7m9p5nFz8XJs7HRq93Fu/m9w93F0+nNw+XN173dt/3Jy+3RxxYSC93dw+nlyw4iE/3h1/Ht0+3t6 931z93568IB+/n12/X58/39984OA8oOH9ISB9YWC74eH7IqI6oqO8YmJ5o2N7oyK56Oh6aWj7Kel yLKuyrOwybW38ayqyby8y76/zcDB8by7zMbF8r288769zsnH9b++yszJ8Ovp8ezq8+3s9O7t7vDt 9e/u7/Hu9vDv8PLv8fPw9PL2gqFicgAAAAF0Uk5TAEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMA AA3XAAAN1wFCKJt4AAAAB3RJTUUH2QsVCwkbvgDsvwAAAmRJREFUOMtjYCABnA7WF2QV1A84jV06 gMkybvPha4c3x5kwhWBKVzL7Xjy/c9PyOcs37Tx/1pupEk3e3uTUyRUNDe3tzQ0Nzc1zjx3WskeR l3C5vgko2wCSbS4BgjUXXCWQ9TtfXQ7WCpGtq6srmnrW1RFhv/S1OQ3NXcdhkkVHgbj/klEHTAHT 7g3NzV0ff9wGyxYV3frxDkiu2sUE85/zkZKSro9//vy4VQSR//PnTVFm5j7XKKgBZ+bV1R0Fiv75 cQMq/+fH3vy0SQchRpw2OlsHFv/79++Pm0U3wPSVQiA4YXQOpMA/cAfY5ttgmRdg/WD5wm3u4SAF OkvWNTY29vc33QTJ/YHKt9bW1q7PVQcpENy/qh8Empru/ALK/v39dYtNbD0IzN8IDizGy4vBCron T37x58/v79/vKSkrm4YBFUzZzgE24dBaoBwI3P/15+f379+/LBMTE+M18ClePQ1sgvrqrdOng+Qf /gJqB4HPy3iBQFXVz0sNHE6++4EKZs26+w2o/fODLyAVC1RVVYWE/KzAvjgtu2f+0qWpB8AyC3mX fQbRs4WAIFvgHCQk+2xMxbIgOoEGLwCriBESMiiDRkaAboIYL+8ToOgMkMFCi4AqHnEJsUVrRcFi s8YJ6KbHEHOBYObnR1xsbNbx3PD0INBnoCpkEAOVZ2OLAMprl7H3wlOMrVaNAVwWBEREtDNkbZHT pFaPA0ISCMxypCRQU7VAerQ2VJaPTzsykd0WLd33cmvlxLuZaYuI6Hompchyd2JmnSgmAROPyJxI Dy0ZjigceTNAkZuFWzH8NANVAQB8j0le2vhj+wAAAABJRU5ErkJggg== " + height="32" + width="32" + y="236" + x="480" /> + <rect + id="icon:32-32" + y="236" + width="32" + x="440" + height="32" + style="fill:none" /> + <image + id="icon:48-4" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAAXNSR0IArs4c6QAAAC1QTFRFAH8A AAAAf38AAAB/fwB/AH9/wMDAf39//wAAAP8A//8AAAD//wD/AP//////McQmvgAAAAF0Uk5TAEDm 2GYAAAABYktHRACIBR1IAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH2QsVCwQmU8be4wAA AN1JREFUOMulVEESgyAM1B/Ihf9xsT+o/UE58U5PeUMTElIUt+1M9+K4624EEqbpK+bAWEY+xJWR wsCvt41xX8OZ3wxHZXaelb5OFCYz5Jk6A+c/csWT6yy9wfiqpM7gvChuiZrf4JajobOwwK+7skUs JtSkQirQ/s6KkkRULYVIspKXYKJaSD6wIlqiMk3vBaVUNsFWIVwL1OpRVyGkGay6CVmFPArFDSch u+FXAUah4le/CxYIt+TTJl5vOzwofLSwGWD7wIbDLQqbGo8BHBw8anA48TjjCwBfGf/jBbhLkjjP AR/2AAAAAElFTkSuQmCC " + height="48" + width="48" + y="220" + x="384" /> + <image + id="icon:48-8" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAAXNSR0IArs4c6QAAAwBQTFRFzwAE twAHugIKzgAEsgkF0QAGxwQJ0QIQ0gMH3AAOvQkUyAgKtQ4H3QIPtA8P0wcIvgwV0wcRyQsLthEI thEQ3gYQ1QoJtxMRyw4M1AsSuBUS4AoR1g4K1g4TwhQXuhgUzBMW4g4I1xEL4Q4S1xEUwxYezhUP 2BMMxBgZvBsV2BQV4hEb4xITvR0WzxgY2RYW2hcOvh4d5RYV2xoYwiMg5hkeuiYo3R0gzSMYuygp vCkq1yMevior4CEiuC4pty4u0ioj2yggyi0m5Ccl3CooxjElzS8o1S0l5ikt1y8myDQmzzIpyTUn 0TMk4C4q2DEnujo50jUrvDs62TM04zEszjkqvT1B3TYr3DYw5TQu0Dssvz5C5jUvukFB2Dov5jY1 0j0t4To04Do56Dg82j032z4y4z086zs55T420kUv3kE63UFA1EYx30I750A4vkxM2kY650JE1kk5 4UVC40U96UNA8UFD3Ug760Q7wE9Ou1FN8kJE2Es65EdE+kFB30o92Uw7004560ZH80RE7UZC5EhL 50lA7EdI9EVF/ENI3E4950pH7khJ9kZG9UZM/URJ401A11E86UtI90dH3lA+60xD6ExN/0ZF9khN 8EpL/kZK2VM931FA/0dF6k1J+ElI8ktG8UtM/0dL6k1O+ElO/0hM5FBN8UxR5FBT4VNB801N+0tK 7E9Q7lBG7VBR6VNE2VZW71FM7lFS6lRL6VRR4lZU8FJT4VZZ21hY5VdK/09N+FFQ51hF8VRU/1BT 7VdN7FdTv2Ni61dY9VZR7lla8VpQ/ldV+FlT+VpU81xS/FxW9V5Z/1td9l9U/V9d92FbwnNx+2Re 9GZi/2Nh9Wdi/2Rn/WZg/2po+HBo+XJv/3Fx+3Nq/HVy/3h1/3p39H1+/Xx1/X5894CBxZmWx5uY xqKjyrOw56us6K2u66+w5rGw7LCy6LOy7rK06bSz7ri49b++8MG/yszJ98HA8sPA8cTH88TC8sXI 88bJ8Ovp7vDt9e/u7/Hu8PLv8fPw9PL2alCG1AAAAAF0Uk5TAEDm2GYAAAABYktHRACIBR1IAAAA CXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH2QsVCQUWb4ALYAAAA65JREFUSMfFlntIU1Ecx9UJ kYMpExnuDx9captiL8vSSC17kZmPaDkhLUvLXpqlZPawsLT2j8FcborG/ijbcOrVqKw0rUZa2SrK rKTHP7LoYbgoZ83OPY/d65zlH0EfGLuXfb6/+zvn7p5z3dz+AZ3ySLG7uzhS3jkVu8hj/v47T/rf ve1/cmuX1KPoL3pUgLJ/oO+BqU2nazM96Bt4cSQg6g96io9y4Gn7OYxOp9O2P3+t9EmZzPfNfvlM 57C1zJdWa3j8KtPXpW72utnXxrW1kNOnDc+bvcwuBit91Itlrg2oq+u9L50weLP0sYnTCJGBDSi/ /lDqfA2ve+3jGyF2OeT6XS+n8TabXJZ2cLtSMG4+t5hw6fdDBm7pqqE3JJHKnV2fHlz6/ah92MCW rhq2j6JEcXE3p6moAgNqBPh2+3AV6UNvBaejb4oh53ey9zyg5yhsG/psAvokUVjYEea4BZl1aIxD dsSwnuOPjQ0Bu7S04GBqLg6Ibh9FXYOWwe8Aq57xxxDWMsT2RhEOzLjHNk0kPXuoQf6JggbcU+d6 dhZZzYrbsxrxBcpO7E1GT5T8QHldFUSv1+i/2ceB/NpaJUCRJYeByEpQmaChrVz/q7oWoFYrlWq1 WnEsAgbEHeV6DjS5xk+bzUJRcVvVBEUFGrV7Nyeg0Rjp71i3faKCg4MpKgMHltxwxwEsXzRC6B/A tzF8pijKDxCarb4ACMcBUYuGpmkjoes7Ks9ggb7f9OkL99fXn5xTg1qKPFUKfBqHGN/mwAJkRPhy SXgeGrR8TymymU/XD/svm21CQgLwXpq+Cd245O1lNKS1tesb1j9+JIk5EmgDNq7ES+HchgXG1i6A cd8XR2E/Cz78EAJtQIWM/Pla5lFxGRmr40ItnEZmswnk+6vIU5qbrkDTN0j8cKbrkA/4dBAFEpPJ 39tN1ghnz+/yCKdtb2+cGLkK/WmqQMcTF71NgSbjCpOwhEhw1/5MYqQJHPF4vMS0GPahFl/D8w2u QVrGiZEmHmSmSsxZNZKSd+DJvjLI8UFiEPu89JVJ4xayvHUS0ggLjyAUxu52WsJFNQsnlQGzSpyX fHPYpcWT2cA/I5uw4BeFqRJdynw+P/aw7JCLDUWUl+XvwuYLN+f4ml1vWfE1idOcbFD+7BrfyTa5 JHGaatVMjswXxh7eIE76wz4aExhfUpKwKAgEhEGLEvKPrw2M/stOnSuQLUvLya+uzs/ZsEImyJ3a q0OEwNNTEDG1V4f/z2/vbgwlhHBkOwAAAABJRU5ErkJggg== " + height="48" + width="48" + y="220" + x="328" /> + <rect + id="icon:48-32" + width="48" + height="48" + x="272" + y="220" + style="fill:none" /> + <rect + id="icon:256-32" + width="256" + height="256" + x="8" + y="8" + style="fill:none" /> + <g + id="g3583" + transform="translate(264,212)"> + <g + id="layer2" + transform="translate(8,7.999512)"> + <path + id="path6548" + style="color:#000000;display:block;opacity:0.6;fill:url(#radialGradient3402);fill-rule:nonzero" + d="M 41,40 A 17.143,8.5714 0 1 1 6.714,40 17.143,8.5714 0 1 1 41,40 Z" + transform="matrix(1.070555,0,0,0.525,-0.892755,22.5)" + display="block" + inkscape:connector-curvature="0" /> + </g> + <g + id="layer1" + transform="translate(8,7.999512)"> + <g + id="g4006" + stroke-miterlimit="4" + style="stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4"> + <path + id="path1314" + style="fill:url(#linearGradient922);fill-rule:nonzero;stroke:#b20000;stroke-width:1.08638;stroke-dasharray:none" + d="m 46.857,23.929 a 23.357,23.357 0 1 1 -46.714,0 23.357,23.357 0 1 1 46.714,0 z" + transform="matrix(0.920488,0,0,0.920488,2.368532,0.97408)" + inkscape:connector-curvature="0" /> + <path + id="path3560" + style="opacity:0.34659089;fill-opacity:0;stroke:url(#linearGradient924);stroke-width:1.16809607;stroke-dasharray:none" + d="m 49.902,26.635 a 23.991,23.991 0 1 1 -47.982,0 23.991,23.991 0 1 1 47.982,0 z" + transform="matrix(0.856093,0,0,0.856093,1.818275,0.197769)" + inkscape:connector-curvature="0" /> + </g> + </g> + <g + id="layer3" + transform="translate(8,7.999512)" + style="fill:#efefef;fill-rule:nonzero"> + <rect + id="rect2070" + transform="rotate(-45)" + height="6.0001001" + width="28" + y="30.233999" + x="-13.293" /> + <rect + id="rect2353" + transform="rotate(45)" + height="6.0001001" + width="28" + y="-3.7070999" + x="19.233999" /> + </g> + <g + id="layer4" + transform="translate(8,7.999512)"> + <path + id="path3955" + d="m 43.429,21.8 c 0,10.863 -10.385,-6.2851 -18.731,0.38754 -8.1507,6.517 -20.659,12.227 -20.659,1.364 0,-11.117 8.7214,-21.431 19.584,-21.431 10.8626,0 19.805,8.8164 19.805,19.679 z" + style="fill:url(#linearGradient3408);fill-rule:nonzero" + inkscape:connector-curvature="0" /> + </g> + </g> + <g + id="g3596" + transform="translate(264,212)"> + <path + id="path6548-9" + style="color:#000000;display:block;opacity:0.6;fill:url(#radialGradient3578);fill-rule:nonzero" + d="m 203.67,53 a 12.235,3 0 1 1 -24.47,0 12.235,3 0 1 1 24.47,0 z" + display="block" + inkscape:connector-curvature="0" /> + <g + id="g4006-9" + transform="matrix(0.65084033,0,0,0.65096766,175.8729,24.523068)"> + <path + id="path1314-1" + d="m 46.857,23.929 a 23.357,23.357 0 1 1 -46.714,0 23.357,23.357 0 1 1 46.714,0 z" + transform="matrix(0.920488,0,0,0.920488,2.368532,0.97408)" + style="fill:url(#linearGradient926);fill-rule:nonzero" + inkscape:connector-curvature="0" /> + <path + id="path3560-4" + style="opacity:0.34659089;fill-opacity:0;stroke:url(#linearGradient928);stroke-width:1.85544586;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" + d="m 49.902,26.635 a 23.991,23.991 0 1 1 -47.982,0 23.991,23.991 0 1 1 47.982,0 z" + transform="matrix(0.828008,0,0,0.828008,2.545972,0.945819)" + stroke-miterlimit="4" + inkscape:connector-curvature="0" /> + </g> + <g + id="g2895" + transform="translate(175.49307,24.161989)"> + <g + id="layer3-0" + transform="scale(0.66666665)" + style="fill:#efefef;fill-rule:nonzero"> + <rect + id="rect2070-4" + transform="rotate(-45)" + height="6.0001001" + width="28" + y="30.233999" + x="-13.293" /> + <rect + id="rect2353-9" + transform="rotate(45)" + height="6.0001001" + width="28" + y="-3.7070999" + x="19.233999" /> + </g> + </g> + <path + id="path3955-1" + d="m 204.69,38.881 c 0,7.3778 -7.052,-4.2686 -12.719,0.26321 -5.5346,4.4261 -14.028,8.3042 -14.028,0.92639 0,-7.5505 5.9222,-14.555 13.299,-14.555 7.3764,0 13.448,5.9878 13.448,13.366 z" + style="fill:url(#linearGradient3568);fill-rule:nonzero" + inkscape:connector-curvature="0" /> + <path + id="path1949" + style="fill:none;stroke:#b20000;stroke-width:1.00000072;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" + d="m 205.49,39.495 a 13.993,13.996 0 0 1 -27.986,0 13.993,13.996 0 1 1 27.986,0 z" + stroke-miterlimit="4" + inkscape:connector-curvature="0" /> + </g> + <g + transform="matrix(5.33,0,0,5.33,-45.300863,-34.477319)" + id="g952"> + <g + transform="translate(8,7.999512)" + id="g932"> + <path + inkscape:connector-curvature="0" + display="block" + transform="matrix(1.070555,0,0,0.525,-0.892755,22.5)" + d="M 41,40 A 17.143,8.5714 0 1 1 6.714,40 17.143,8.5714 0 1 1 41,40 Z" + style="color:#000000;display:block;opacity:0.6;fill:url(#radialGradient954);fill-rule:nonzero" + id="path930" /> + </g> + <g + transform="translate(8,7.999512)" + id="g940"> + <g + style="stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4" + stroke-miterlimit="4" + id="g938"> + <path + inkscape:connector-curvature="0" + transform="matrix(0.920488,0,0,0.920488,2.368532,0.97408)" + d="m 46.857,23.929 a 23.357,23.357 0 1 1 -46.714,0 23.357,23.357 0 1 1 46.714,0 z" + style="fill:url(#linearGradient956);fill-rule:nonzero;stroke:#b20000;stroke-width:1.08638;stroke-dasharray:none" + id="path934" /> + <path + inkscape:connector-curvature="0" + transform="matrix(0.856093,0,0,0.856093,1.818275,0.197769)" + d="m 49.902,26.635 a 23.991,23.991 0 1 1 -47.982,0 23.991,23.991 0 1 1 47.982,0 z" + style="opacity:0.34659089;fill-opacity:0;stroke:url(#linearGradient958);stroke-width:1.16809607;stroke-dasharray:none" + id="path936" /> + </g> + </g> + <g + style="fill:#efefef;fill-rule:nonzero" + transform="translate(8,7.999512)" + id="g946"> + <rect + x="-13.293" + y="30.233999" + width="28" + height="6.0001001" + transform="rotate(-45)" + id="rect942" /> + <rect + x="19.233999" + y="-3.7070999" + width="28" + height="6.0001001" + transform="rotate(45)" + id="rect944" /> + </g> + <g + transform="translate(8,7.999512)" + id="g950"> + <path + inkscape:connector-curvature="0" + style="fill:url(#linearGradient960);fill-rule:nonzero" + d="m 43.429,21.8 c 0,10.863 -10.385,-6.2851 -18.731,0.38754 -8.1507,6.517 -20.659,12.227 -20.659,1.364 0,-11.117 8.7214,-21.431 19.584,-21.431 10.8626,0 19.805,8.8164 19.805,19.679 z" + id="path948" /> + </g> + </g> +</svg> diff --git a/dlls/comctl32/idi_td_info.ico b/dlls/comctl32/idi_td_info.ico new file mode 100644 index 0000000000000000000000000000000000000000..44f0190ae549de4e5a9083e99d2550d23ee7e360 GIT binary patch literal 5430 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 bCXE-$K6kM{fySe8<qVSq%me_L22lDR?v!mt literal 0 HcmV?d00001 diff --git a/dlls/comctl32/idi_td_info.svg b/dlls/comctl32/idi_td_info.svg new file mode 100644 index 0000000000..4138923c4c --- /dev/null +++ b/dlls/comctl32/idi_td_info.svg @@ -0,0 +1,385 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg2" + height="272" + width="632" + version="1.1" + sodipodi:docname="oic_note.svg" + inkscape:version="0.92.1 r15371"> + <metadata + id="metadata47"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#000000" + borderopacity="0" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1244" + inkscape:window-height="856" + id="namedview45" + showgrid="false" + inkscape:zoom="1" + inkscape:cx="184" + inkscape:cy="32" + inkscape:window-x="466" + inkscape:window-y="262" + inkscape:window-maximized="1" + inkscape:current-layer="g3436" + showborder="false" /> + <defs + id="defs4"> + <radialGradient + id="radialGradient3293" + cx="23.857" + gradientUnits="userSpaceOnUse" + cy="40" + r="17.143" + gradientTransform="matrix(1,0,0,0.5,0,20)"> + <stop + id="stop4128" + stop-color="#000" + offset="0" /> + <stop + id="stop4130" + stop-color="#000" + stop-opacity="0" + offset="1" /> + </radialGradient> + <linearGradient + id="linearGradient3297" + x1="15.027" + gradientUnits="userSpaceOnUse" + y1="14.936" + gradientTransform="matrix(1.002994,0,0,1.002994,-0.071859,0.01968356)" + x2="19.015" + y2="31.885"> + <stop + id="stop3692" + stop-color="#fffeff" + stop-opacity="0.1" + offset="0" /> + <stop + id="stop3694" + stop-color="#fffeff" + stop-opacity="0.1" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient3306" + x1="36.918" + gradientUnits="userSpaceOnUse" + y1="66.288" + gradientTransform="matrix(0.920488,0,0,0.920488,10.36853,8.9735945)" + x2="19.071" + y2="5.541"> + <stop + id="stop2893" + stop-color="#204a87" + offset="0" /> + <stop + id="stop2895" + stop-color="#3465a4" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient3421" + x1="21.994" + gradientUnits="userSpaceOnUse" + y1="33.955" + gradientTransform="matrix(0.68106924,0,0,0.68120249,-0.84509344,0.08898907)" + x2="20.917" + y2="15.815"> + <stop + id="stop2911" + stop-color="#fffeff" + stop-opacity="0.2" + offset="0" /> + <stop + id="stop2913" + stop-color="#fffeff" + stop-opacity="0.1" + offset="1" /> + </linearGradient> + <radialGradient + id="radialGradient3431" + cx="23.857" + gradientUnits="userSpaceOnUse" + cy="40" + r="17.143" + gradientTransform="matrix(0.713704,0,0,0.175,174.40483,45.999405)"> + <stop + id="stop4128-8" + stop-color="#000" + offset="0" /> + <stop + id="stop4130-7" + stop-color="#000" + stop-opacity="0" + offset="1" /> + </radialGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#radialGradient3293" + id="radialGradient872" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.5,0,20)" + cx="23.857" + cy="40" + r="17.143" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3306" + id="linearGradient874" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.920488,0,0,0.920488,10.36853,8.9735945)" + x1="36.918" + y1="66.288" + x2="19.071" + y2="5.541" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3297" + id="linearGradient876" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.002994,0,0,1.002994,-0.071859,0.01968356)" + x1="15.027" + y1="14.936" + x2="19.015" + y2="31.885" /> + </defs> + <image + id="icon:16-4" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAAXNSR0IArs4c6QAAAC1QTFRFAH8A AAAAf38AAAB/fwB/AH9/wMDAf39//wAAAP8A//8AAAD//wD/AP//////McQmvgAAAAF0Uk5TAEDm 2GYAAAABYktHRACIBR1IAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2QsXFCUQrZByXwAA AEtJREFUCNdjYGBgFBQUYAACRvHy8kIQS7zY2Ni8ECgApIEsATAjGcQQNwYxjAvBDGMowwwmYmaM zrADM4Da7ZJh5oANhFuBsBTqDAC5Vxf8tA357AAAAABJRU5ErkJggg== " + height="16" + width="16" + y="252" + x="608" /> + <image + id="icon:16-8" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAAXNSR0IArs4c6QAAAS9QTFRFmqi8 IUuII06KJ1CNJ1GNJlKPJlKQJlOPJ1OQKVSSK1WRLVeRLFeULleSLViSLFiVLViTLViULVmVLVqV L1uXNV2UNV2VNl6VNGWkNWakNmalQ2iaRGibRWibP2qjP2qkRWqbRmqcRWykQm2lRW2kQG6pQW6p SW2eSm2eRG6mQW+qQm+pQm+qQnCqQ3CqRXCnRXCoRHGrRXKqRXKrSHKqR3OqR3OsSnWsTHatT3es UHmvUnmuUXqvUnquVH2yV3+zWIC0WYG0W4O1XIO2XYS2XoW2XoW3X4a3YIa3YYe4Y4m5ZIm5Zom3 ZYq6Zou6Z4u6Z4y7ao68bZC9bpG+b5K+cJK/cZO/cpS/gp/Cmqm8nKq9nau9nrPNpbjPrL3StMPV vMnZzMzM1dvj5efo7u7smZSEXwAAAAF0Uk5TAEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMAAAsT AAALEwEAmpwYAAAAB3RJTUUH2QsVCgQgu2cR4QAAAMFJREFUGNNjYAABRRZGJmYNBhhQF7D2Dw3x thSUgfDFlcLNpCQkpIwD9cXB8iq+QC4ISLkayAIF+MJAfO0kkIifCAODgq0ZSFYtHkTqWUgzcPlB NYA1OXEzcASDWDYJMWARTw4GziAwKy4CTHmwMvB6gbUk+YC1OHAxyFgZAlm6KRYgAS0ToNuEA4BK jJJjQQpceIDukNV0gjnMTk4B5FRRZS8doJCkqrO8GMQzskLmju5u9qb8snD/ynCzsXND/AoAF9cd /1BwUZ0AAAAASUVORK5CYII= " + height="16" + width="16" + y="252" + x="584" /> + <image + id="icon:16-32" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEADQA ZQCkMkXLAwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9kLDxEDKjsklVIAAAJcSURBVDjL fVNLTxNhFD3fR+dRWqhFSgMzrRRTHgopLro2cWs0StggWxONq7JxiRBduFLCRllqojshJv4KNlKD xrRCKdCHjIVK6XRm2s511xSm8e7uzbnnnNwHw4WYnF+7YxnGcqNuXaNmU2KcE8AsQZKSgiQ93/7w 6Es7nrUnY7Orm6KLxaMRBYE+L9ySAAKhWqtDO65gN1uEaTW+pdYTMQdB9P7r3LASGJoaV/A9U8JJ xYRNBADgjMHnFRFV/Ujva9jLFvPpjQWlRTA2u7oZHuyLD4cGkPyltRovBmcM41f8KGinyO4Xk6n1 xDSfml+7LboQnxxVHM293QLePb3Zym0i/MyeIKL0we2WYtfn3sxw06i9iI6o+LFXcigTAZni6bma TYSdXBkhZQB101jidtOO9vu9OKmYDsuVWh1L778663odvh4ZRBThnHO3LLoc6qGABy8fxvHk7oSD wCaC6OoCY7ybM8aIOgztQKuifGbi8E+140CJCEQEbtu2rpsNcMYcoImwH4dH1Y7bMKwmiKjGGWOZ UllHr0c8B+r1iBi87Ea+pDsIPG4B5VMdnPMdLsrys51sHleVS+dcdHGgZjYwd2vEoa4GvDjMHUGU 5UUGAKMzK1thdSAWDPiQPij/95DCwR5opb8o/C5tpT4lbrSd8qt8SA0ORtR+ZPJ/cVart4gYAzyy ADXQg4PCMfIFrZDeWBhyPNPozMqWJAmxkBqEzytDFLpABJhWA+WzGnI5DZZVT6bWE9MdvxEAJh+8 vWcZxjKRPcIY9xLIBpHOGN8VZXlx++Pjz+34fwepDdkjUQmrAAAAAElFTkSuQmCC " + height="16" + width="16" + y="252" + x="560" /> + <image + id="icon:32-4" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAAXNSR0IArs4c6QAAAC1QTFRFAH8A AAAAf38AAAB/fwB/AH9/wMDAf39//wAAAP8A//8AAAD//wD/AP//////McQmvgAAAAF0Uk5TAEDm 2GYAAAABYktHRACIBR1IAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH2QsXFCUTNJkj5QAA AJZJREFUKM+VkUEKwzAMBJMfRBd/ZCG+5S+moN56CUQPDuToN7SW1ThESaF722El7FXXXYuIhoPt iZkTNR9YRBbeSXiKim2q/3gAUSRZQGaoZBksUByXTKpAA7lEUp2AJRB1xgBuga0YH7AlFUz5BPBy AH+DbQf2ju30sNGBtQFdUhPf75dIbn24xnynrnV/F3c5f9ufegP03F+97qymfQAAAABJRU5ErkJg gg== " + height="32" + width="32" + y="236" + x="520" /> + <image + id="icon:32-8" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAAAXNSR0IArs4c6QAAAq9QTFRFaYKl IkyJJU6JJk+JJ1CKKlGMKVKLKlKLKlKMK1OMK1ONLVOOLVSOL1aOMFeOMViPMliPM1mPMlqQOl6S Ol+TP2KWPWOaNGWkPWSaPmSbNWalNmelQmWWN2elQ2WWP2aaRGWXQGabQGacOGimRWeWOWmmOmmn PGunPGuoQ2qeRWqePWyoPmyoRmufPm2oPm2pRWyfP26pQG6pSG2hQW+qQXCqQ3CqQ3CrSW+kSnCl S3ClRXKsTHGlTnGjRnOsTHKlTHKnR3OsUHKkTHOnR3StSHStVXKdSXWtSXWuSnWsVnOdVnOeV3Od V3OfSnauV3SeS3auV3SfWXSfS3euTHeuTHevUXeoTXivU3eqTniwTnmwT3mvW3egT3mwVHmsUHqw UHqxXXifV3mrVHqsVXqsVnqrUXuxUnyxUnyyU3yxU3yyU32yU32zWXysVH2yVH2zVX6zV3+yV3+0 W3+tV4C0WIC0XYCwWoG0WoK1W4K1XoKxXIO1XYO2XYS2XoS0aoKlYoWzbISmYIa2YIa4Y4a2ZIe2 ZYe0Zoi1Yom5ZIm6ZYq6Zoq4Zou6Z4u4aIu4aYy4aIy8aY28bo67a4+9bY+8bZC+bZG+cJK9cJK+ cJK/cZK+cZPAc5O+c5TAdZS+c5XAdJW/dJXAdJXBdJbBdpfBeJfAeZjBeprDeprEe5rEepvEfZvD fZzEf5zCf5zEfp3Efp3Ff53Ff57GgJ7Gg57CgJ/GgZ/Ggp/FgaDGgqDGj560gqHHhaHDkqC1h6PF hqPIiKPFiaTFiaTGjKXGjqfHkarIm7HNoLXOobbPprnQtbvDtrvDt7zDub3Err/Tr7/Tr8DUvsHG tMPVv8LHwMPHw8XIusjYvMnZyMnKysrLzMzMxdDcztfg0tnh193j3OHl5ejp7Ozr7O3r7e3r7u7s spFDYwAAAAF0Uk5TAEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJ TUUH2QsVCTIAC1MeBQAAAfBJREFUOMtjYCABePuKCnALifp4Y5cO5HNqn7d65+p5bba8QVh08xdv WzGhPDsyu2LCyq253OimyBhvXJjhDgPZC9fpyqHIC6TuKHdHBuU7UgWR9UdsSHNHBembklQQ9itt g8sX3j4JYWTsNoC7g205wvy1Tx5lQljVa7hgBoQtRBgdfWIfjLkkJQaigHlzhjs2kLOZBWKA1gqo iAcU+EHBBk2wK9yqJkL4AQEBId0HjgcEhELB5DJ/kALhOTUQfnh40/0nT+6Ew0BU8yQRkAL29SUQ PggcenLBUFlVwzUWCOIrlvGAFDDuz48F80Hg2JMt4iCg5piQlla0ngmkgHN7ZRoMBF96UicOAcrW abULwCYIL+3IAIKsrKwMc/F7j9XFYUAqoQXsBq+G2XlAUJBlpypu9uSuOAKUxoF94a24qqCgINZE CijU9+QckoJp8pDYYJ5rqioNETry5CBC3mg+CzQu7DthYuef9CIUdNnEwGJzliNU7PqTo5792hC2 +3Q2eHqQWKQHEdzz8MG1wxB/6C8WQ6RLGcuZOlB7ZaFm6c+0UkFOk5bzHcWRgftiCwGUVKsgMaPL CC5t0jNLUgU9X3A4z59a4mKoZuRSMm2uAyuW3BXDopTcOmXhlNZkJeZEHHnTW5idkVPY35uBqgAA lFfQgymcmM8AAAAASUVORK5CYII= " + height="32" + width="32" + y="236" + x="480" /> + <rect + id="icon:32-32" + y="236" + x="440" + width="32" + height="32" + style="fill:none" /> + <image + id="icon:48-4" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAAXNSR0IArs4c6QAAAC1QTFRFAH8A AAAAf38AAAB/fwB/AH9/wMDAf39//wAAAP8A//8AAAD//wD/AP//////McQmvgAAAAF0Uk5TAEDm 2GYAAAABYktHRACIBR1IAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH2QsXFCUV3fqG0AAA AOJJREFUOMullEEOhCAMRfUGsuEiTZyddyEmzM6NiRx4EpecYYpIKWDHmPkbk770f8HWrrtVr1BD W1faooxq6vbtUJtVdd2dKklPdSQ8R4cKoMLTsAb0X+HQC3MG3nDWD2JYA9UDoRYd/QHGOeaYumHZ ixYEwAEkQE6nFXlpHh29TPtOLCRHkG5AzgabwBFC2db7Ip2B/RrA9Bgsn6fAi2CugKtBPCBdyeiF u7oAMWTy1Tik9Op8OZ1A+rQpJIM8JWvM8OX4JK/RlkPyY0TFoZbXQFwcedXE5ZTXWf4ByL+M//UF bizd0VWSQrQAAAAASUVORK5CYII= " + height="48" + width="48" + y="220" + x="384" /> + <image + id="icon:48-8" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAAXNSR0IArs4c6QAAAnlQTFRFMliO Jk2IJ06JIlSPJFSVI1WQLlKPJVWWL1OQLlWKJ1aXMFSRHFqaKFeYMVWSJ1iTHlubMlaTMVeNK1ia IFycKlqVLFmbM1mPIV2dK1uWLVqcLFuXNVqQI16eL1udLlyYJF+fL12ZMF6aMV+bM2CcOl+WNGGd O2CXNWKePGGYNmOfNWSaPGOTPmKZOGSgPWSUP2OaRmKUOWWhQGSbOmaiP2aXO2ejQGeYPGikQWiZ RGefPWmlPGqgRWigP2qnPmyiQGuoR2qiP22jSGujQW6kSmykQm+lS22lQ3CmTG6mRHGnUG+cRXKo RnOqTXKkR3SrSHWsVHOgT3SmSnatUHWnS3euVnWiUXaoTHivU3epWHekTnmxVHiqWnilVXmsW3mm VHunUHuzVnqtXHqnV3uuXXuoWHyvXnypWX2wXX6lZHylX32qWH+rWn6xYH6rW3+yYX+sWoGtXICz Z3+oYoCtW4KuXYG0Y4GuXoK1ZIKwXYSxY4SrZYOxXoWyZIWsX4azWoi5Z4WzYIe0ZoeuYYi1Z4iv aYe1Yom2b4ewaYqxZYu4aouyc4qna4y0Z426bI21aI67c4y1bY62aY+8bo+3b5C4dJCycJG5dZGz cZK6dpK0cpO7d5O1eJS2dJW9fJSxeZW4gZSsepa5dpe/e5e6d5jAfJi7fZm8fpq9f5u+gJy/gZ3A gp7Bg5/ChKDDhqHEh6LGi6LAiKPHjKPBiaXIkKfFkajGm6/HnrLKobTNorXOo7bPpbjRprnSq7rN scDUssHVtcXYvsrYwMzayszJws7cxNDextLgzNXdztff0tri09vk2+Dj4ufq4+jr5+nm6uzp6+7q 7e/r1KigVQAAAAF0Uk5TAEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAA B3RJTUUH2QsVCToTRzTV0wAAA2NJREFUSMfFlulPE1EQwKUUymELbhEaQJAi27RGK0pACJZ0A+kG GgMWiNUoKmC4FIhVjAareCCm9QBJuGo2QSuipFDjfWs8IAg6f5Gv+3q83Rbkg4m/T/3wm+nM7Nt5 u27dP8BRo6ckEkpf41iL3Rq3rXvQ7Xn+zDM52KGNa/2LXqzp9XjHL3YetViOdl4c93p6NcWr6FWZ /d6hFkuI6uND3quZVSv5cd3eobqQjLHcnu2Ki+ynjU4eFNlmH/vvjaZF0Nu2Tt+MYPPceKRvCwvY OnM2oszTOa0Pq2fqzEo2H/GQEvU73C+S6zzeOiKibzheMM+uIXHqtwAfAr8rEYMd5HQzpy3iQn4A LAZthHmKGFWx/VJY1bO/fj8LyJUsoudc6JlrHkXos+lESOZxa4LnzWYX22RqHyaTie0+GTiJMQ/3 r2abfDaikovxB2gfrJ7aR0VFBcP5a3I0XgmzzdeevmsJpEZyuY+eQ/iNqrncQtg+49W3ZYDf1QIb se9CDR+gv3tYVMj770sACyxjMBjKCdhb+ERR981hPdoBPuo2IdS63fgfGIbZw+EDJXnChvU4AzCH 9KwslUqlLmQw9JQEBzw2Ccbnq/oNgJ23Var09BQ+xGhU+wMoziy0yxndV4BSv82TW2I0ltIuXJJ+ sE44vkL15mVYRDK2U1OTETl0aokzH4/10jFyfEZapaoF+IRT83JysnI9gj2Px+poOG0IDrtMl4MK GQV4HkjttxHtB/yrUMNt8Y+ukMZVvwBwCm0lYjRwXGO4giy6YKeOzgn0+AWAJVIreWhXbOB4tzfx Awn2mLIEPzOUpKxUyuXW5uCi1bjV6WSPewE+i2y5PIPThF7RnqYUssc+gNdBW45JstqKiK10P5fs cQIdPVq5vTtkJyRkc+S+rGq2kz2yAPBrEeaxncBzrkGwxOPvWMke5xbmX94qwal9KBS1zmjh6qNc jLDHYOoEhUwmKx2jxMtVz5UJeiRs5Lu04eteO2EV2ViWJSbuG9O2Rbghkpy92cJCeFua0XOdinwF RR/hrBsJWZYolUo3WF2Hole8FNNsLqs2mBqRWzvRnla1yj1apGmcGGlmdmUrFNk7yhpHxhryiv52 scfm1dsGRtzukYFT9XmxrWv7dMinoqKo/LV9Ovx//gDtqJRBNXNLfgAAAABJRU5ErkJggg== " + height="48" + width="48" + y="220" + x="328" /> + <rect + id="icon:48-32" + y="220" + x="272" + width="48" + height="48" + style="fill:none" /> + <rect + id="icon:256-32" + y="8" + x="8" + width="256" + height="256" + style="fill:none" /> + <g + id="g3310" + transform="translate(264,212)"> + <g + id="layer2" + transform="translate(7.9999996,7.9995145)"> + <path + id="path6548" + style="color:#000000;display:block;opacity:0.6;fill:url(#radialGradient3293);fill-rule:nonzero" + d="M 41,40 A 17.143,8.5714 0 1 1 6.714,40 17.143,8.5714 0 1 1 41,40 Z" + transform="matrix(1.070555,0,0,0.525,-0.892755,22.5)" + display="block" + inkscape:connector-curvature="0" /> + </g> + <path + id="path1314" + style="fill:url(#linearGradient3306);fill-rule:nonzero;stroke:#204a87;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" + d="m 53.5,31 a 21.5,21.5 0 0 1 -43,0 21.5,21.5 0 1 1 43,0 z" + stroke-miterlimit="4" + inkscape:connector-curvature="0" /> + <path + id="path3560" + style="opacity:0.45;fill-opacity:0;stroke:#eeeeec;stroke-width:0.99999887;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" + d="m 52.539,31 a 20.539,20.539 0 0 1 -41.077,0 20.539,20.539 0 1 1 41.077,0 z" + stroke-miterlimit="4" + inkscape:connector-curvature="0" /> + <g + id="layer4" + transform="translate(7.9999996,7.9995145)"> + <path + id="path3955" + d="m 43.429,21.8 c 0,10.863 -10.385,-6.2851 -18.731,0.38754 -8.1507,6.517 -20.659,12.227 -20.659,1.364 0,-11.117 8.7214,-21.431 19.584,-21.431 10.8626,0 19.805,8.8164 19.805,19.679 z" + style="fill:url(#linearGradient3297);fill-rule:nonzero" + inkscape:connector-curvature="0" /> + </g> + <g + id="text3046" + font-size="40px" + transform="translate(7.9999996,7.9995145)" + font-style="normal" + font-weight="normal" + style="font-style:normal;font-weight:normal;font-size:40px;font-family:'Bitstream Vera Sans';fill:#eeeeec"> + <path + id="path28492" + style="text-align:center;fill:#eeeeec" + d="m 26.05,10.202 c -1.08,0 -1.944,0.864 -1.944,1.944 0,1.116 0.864,1.944 1.944,1.944 1.044,0 1.944,-0.864 1.944,-1.944 0,-1.044 -0.9,-1.944 -1.944,-1.944 m -0.72,7.992 -5.328,1.152 v 0.936 l 2.916,0.54 -2.124,10.728 c -0.144,0.792 -0.216,1.44 -0.216,1.872 0,1.584 0.756,2.376 2.304,2.376 1.368,0 3.096,-0.432 5.076,-1.26 v -1.116 c -1.116,0.36 -1.98,0.54 -2.664,0.54 -1.116,0 -1.728,-0.468 -1.728,-1.404 0,-0.216 0.036,-0.504 0.108,-0.9 L 26.266,18.194 H 25.33" + inkscape:connector-curvature="0" /> + </g> + </g> + <g + id="g3436" + transform="translate(264,212)"> + <path + id="path6548-4" + style="color:#000000;display:block;opacity:0.6;fill:url(#radialGradient3431);fill-rule:nonzero" + d="m 203.67,52.999 a 12.235,3 0 1 1 -24.47,0 12.235,3 0 1 1 24.47,0 z" + display="block" + inkscape:connector-curvature="0" /> + <g + id="g2915" + transform="translate(176,23.999395)"> + <path + id="path1949" + style="fill:#3465a4;stroke:#204a87;stroke-width:1.00000072;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" + d="m 29.486,15.496 a 13.993,13.996 0 0 1 -27.986,0 13.993,13.996 0 1 1 27.986,0 z" + stroke-miterlimit="4" + inkscape:connector-curvature="0" /> + <path + id="path3560-8" + style="opacity:0.34659089;fill-opacity:0;stroke:#ffffff;stroke-width:0.99999946;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" + d="m 28.422,15.496 a 12.929,12.931 0 0 1 -25.858,0 12.929,12.931 0 1 1 25.858,0 z" + stroke-miterlimit="4" + inkscape:connector-curvature="0" /> + <path + id="path3955-0" + d="m 28.693,14.882 c 0,7.3778 -7.052,-4.2686 -12.719,0.26321 -5.5346,4.4261 -14.028,8.3042 -14.028,0.92639 0,-7.5505 5.9222,-14.555 13.299,-14.555 7.3764,0 13.448,5.9878 13.448,13.366 z" + style="fill:url(#linearGradient3421);fill-rule:nonzero" + inkscape:connector-curvature="0" /> + </g> + <g + id="text3046-4" + font-size="40px" + transform="translate(176,23.999395)" + font-style="normal" + font-weight="normal" + style="font-style:normal;font-weight:normal;font-size:40px;font-family:'Bitstream Vera Sans';fill:#eeeeec"> + <path + id="path28468" + style="text-align:center;fill:#eeeeec" + d="m 16.861,6.9638 c -0.72,0 -1.296,0.576 -1.296,1.296 0,0.744 0.576,1.296 1.296,1.296 0.696,0 1.296,-0.576 1.296,-1.296 0,-0.696 -0.6,-1.296 -1.296,-1.296 m -0.48,5.328 -3.552,0.768 v 0.624 l 1.944,0.36 -1.416,7.152 c -0.096,0.528 -0.144,0.96 -0.144,1.248 0,1.056 0.504,1.584 1.536,1.584 0.912,0 2.064,-0.288 3.384,-0.84 v -0.744 c -0.744,0.24 -1.32,0.36 -1.776,0.36 -0.744,0 -1.152,-0.312 -1.152,-0.936 0,-0.144 0.024,-0.336 0.072,-0.6 l 1.728,-8.976 h -0.624" + inkscape:connector-curvature="0" /> + </g> + </g> + <g + transform="matrix(5.33,0,0,5.33,-34.300001,-34.477332)" + id="g870"> + <g + transform="translate(7.9999996,7.9995145)" + id="g856"> + <path + inkscape:connector-curvature="0" + display="block" + transform="matrix(1.070555,0,0,0.525,-0.892755,22.5)" + d="M 41,40 A 17.143,8.5714 0 1 1 6.714,40 17.143,8.5714 0 1 1 41,40 Z" + style="color:#000000;display:block;opacity:0.6;fill:url(#radialGradient872);fill-rule:nonzero" + id="path854" /> + </g> + <path + inkscape:connector-curvature="0" + stroke-miterlimit="4" + d="m 53.5,31 a 21.5,21.5 0 0 1 -43,0 21.5,21.5 0 1 1 43,0 z" + style="fill:url(#linearGradient874);fill-rule:nonzero;stroke:#204a87;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" + id="path858" /> + <path + inkscape:connector-curvature="0" + stroke-miterlimit="4" + d="m 52.539,31 a 20.539,20.539 0 0 1 -41.077,0 20.539,20.539 0 1 1 41.077,0 z" + style="opacity:0.45;fill-opacity:0;stroke:#eeeeec;stroke-width:0.99999887;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" + id="path860" /> + <g + transform="translate(7.9999996,7.9995145)" + id="g864"> + <path + inkscape:connector-curvature="0" + style="fill:url(#linearGradient876);fill-rule:nonzero" + d="m 43.429,21.8 c 0,10.863 -10.385,-6.2851 -18.731,0.38754 -8.1507,6.517 -20.659,12.227 -20.659,1.364 0,-11.117 8.7214,-21.431 19.584,-21.431 10.8626,0 19.805,8.8164 19.805,19.679 z" + id="path862" /> + </g> + <g + style="font-style:normal;font-weight:normal;font-size:40px;font-family:'Bitstream Vera Sans';fill:#eeeeec" + font-weight="normal" + font-style="normal" + transform="translate(7.9999996,7.9995145)" + font-size="40px" + id="g868"> + <path + inkscape:connector-curvature="0" + d="m 26.05,10.202 c -1.08,0 -1.944,0.864 -1.944,1.944 0,1.116 0.864,1.944 1.944,1.944 1.044,0 1.944,-0.864 1.944,-1.944 0,-1.044 -0.9,-1.944 -1.944,-1.944 m -0.72,7.992 -5.328,1.152 v 0.936 l 2.916,0.54 -2.124,10.728 c -0.144,0.792 -0.216,1.44 -0.216,1.872 0,1.584 0.756,2.376 2.304,2.376 1.368,0 3.096,-0.432 5.076,-1.26 v -1.116 c -1.116,0.36 -1.98,0.54 -2.664,0.54 -1.116,0 -1.728,-0.468 -1.728,-1.404 0,-0.216 0.036,-0.504 0.108,-0.9 L 26.266,18.194 H 25.33" + style="text-align:center;fill:#eeeeec" + id="path866" /> + </g> + </g> +</svg> diff --git a/dlls/comctl32/idi_td_shield.ico b/dlls/comctl32/idi_td_shield.ico new file mode 100644 index 0000000000000000000000000000000000000000..30b20dacfc5cceabaa4f8d59d143bedfe4ecd069 GIT binary patch literal 5430 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 literal 0 HcmV?d00001 diff --git a/dlls/comctl32/idi_td_shield.svg b/dlls/comctl32/idi_td_shield.svg new file mode 100644 index 0000000000..c1e6fdee3c --- /dev/null +++ b/dlls/comctl32/idi_td_shield.svg @@ -0,0 +1,373 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + id="svg11300" + height="272" + width="632" + sodipodi:docname="oic_shield.svg" + inkscape:version="0.92.3 (2405546, 2018-03-11)"> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1309" + inkscape:window-height="942" + id="namedview43" + showgrid="false" + inkscape:zoom="1" + inkscape:cx="107.73422" + inkscape:cy="32" + inkscape:window-x="274" + inkscape:window-y="193" + inkscape:window-maximized="0" + inkscape:current-layer="svg11300" /> + <defs + id="defs3"> + <linearGradient + id="linearGradient15679"> + <stop + id="stop15681" + offset="0" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + id="stop15683" + offset="1" + style="stop-color:#000000;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient14780"> + <stop + id="stop14782" + offset="0" + style="stop-color:#ebff39;stop-opacity:1;" /> + <stop + id="stop14784" + offset="1" + style="stop-color:#ebff39;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient11494"> + <stop + style="stop-color:#ef2929;stop-opacity:1;" + offset="0" + id="stop11496" /> + <stop + style="stop-color:#ef2929;stop-opacity:0;" + offset="1" + id="stop11498" /> + </linearGradient> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.316364,0,27.98636)" + r="17.1875" + fy="40.9375" + fx="23.3125" + cy="40.9375" + cx="23.3125" + id="radialGradient15685" + xlink:href="#linearGradient15679" /> + <radialGradient + r="7.9999995" + fy="21.610504" + fx="17.62042" + cy="21.610504" + cx="17.62042" + gradientTransform="matrix(4.072994,0,0,2.874492,-48.88488,-43.21542)" + gradientUnits="userSpaceOnUse" + id="radialGradient3209" + xlink:href="#linearGradient11494" /> + <linearGradient + xlink:href="#linearGradient14780" + id="linearGradient2502" + x1="4.7201233" + y1="23.500006" + x2="42.029881" + y2="23.500006" + gradientUnits="userSpaceOnUse" /> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.316364,0,27.98636)" + r="17.1875" + fy="40.9375" + fx="23.3125" + cy="40.9375" + cx="23.3125" + id="radialGradient15685-3" + xlink:href="#linearGradient15679" /> + <linearGradient + xlink:href="#linearGradient14780" + id="linearGradient2502-5" + x1="4.7201233" + y1="23.500006" + x2="42.029881" + y2="23.500006" + gradientUnits="userSpaceOnUse" /> + <radialGradient + r="7.9999995" + fy="21.610504" + fx="17.62042" + cy="21.610504" + cx="17.62042" + gradientTransform="matrix(4.072994,0,0,2.874492,-48.88488,-43.21542)" + gradientUnits="userSpaceOnUse" + id="radialGradient3209-6" + xlink:href="#linearGradient11494" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient15679" + id="radialGradient906" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.316364,0,27.98636)" + cx="23.3125" + cy="40.9375" + fx="23.3125" + fy="40.9375" + r="17.1875" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient14780" + id="linearGradient908" + gradientUnits="userSpaceOnUse" + x1="4.7201233" + y1="23.500006" + x2="42.029881" + y2="23.500006" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient11494" + id="radialGradient910" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(4.072994,0,0,2.874492,-48.88488,-43.21542)" + cx="17.62042" + cy="21.610504" + fx="17.62042" + fy="21.610504" + r="7.9999995" /> + </defs> + <metadata + id="metadata4"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:creator> + <cc:Agent> + <dc:title>Jakub Steiner</dc:title> + </cc:Agent> + </dc:creator> + <dc:source>http://jimmac.musichall.cz</dc:source> + <cc:license + rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /> + <dc:title /> + <dc:subject> + <rdf:Bag> + <rdf:li>apparmor</rdf:li> + <rdf:li>novell</rdf:li> + </rdf:Bag> + </dc:subject> + <dc:contributor> + <cc:Agent> + <dc:title>Garrett LeSage</dc:title> + </cc:Agent> + </dc:contributor> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/publicdomain/zero/1.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + </cc:License> + </rdf:RDF> + </metadata> + <g + transform="translate(272.00041,220)" + id="layer1"> + <path + transform="translate(-0.125,0.625)" + d="m 40.5,40.9375 a 17.1875,5.4375 0 1 1 -34.375,0 17.1875,5.4375 0 1 1 34.375,0 z" + id="path15677" + style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.36931817;fill:url(#radialGradient15685);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + inkscape:connector-curvature="0" /> + <g + id="g3215"> + <g + id="g3152" + transform="matrix(1.006289,0,0,1,0.477995,0.5)"> + <path + id="path15651" + d="M 23,3 C 15.599034,8.5765861 4,12 4,12 7,37.75 23.375,44 23.375,44 23.375,44 39.5,37.5 42.75,11.625 42.75,11.625 28.75,6.5 23,3 Z" + style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:0.99687034;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient2502);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99687046;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="M 23.023587,4.289309 C 16.08809,9.5151669 5.218554,12.723272 5.218554,12.723272 c 2.811321,24.130505 18.11714,29.987424 18.11714,29.987424 0,0 15.150159,-6.091195 18.195756,-30.338839 0,0 -13.119498,-4.8026735 -18.507863,-8.082548 z" + id="path15665" + inkscape:connector-curvature="0" /> + <path + id="path15667" + d="m 22.88299,7 v 33 c 0,0 -12.318457,-5.259424 -15.9999995,-26 C 12.13299,13.125 22.88299,7 22.88299,7 Z" + style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient3209);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + inkscape:connector-curvature="0" /> + </g> + </g> + </g> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAwFBMVEUAAACIiIiIiHe7u7t3 d4hmZoiImYiqqqoAAETMzMyZmZl3d3fu7u6Zqpnd3cxVVYiIiKr////M3cyqqpnu7t3//+7MzLuq qruZmaoAAFWqu7u7u6pmZpkzM3dVVVWqu6oAABFmZmbMzKrMzLvd3ZnuzFXu7mbd7pnM3aruqmbu ZjPu7jPu/0Tu/1Xu7ojd3aq7zKq7zLvuzIjumVXuVTPuMyLuIiLu/zPu/2buu3fd7ojdzJndzIju qlXuiEQAAACqde9xAAAAInRSTlMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPKwc EQAAAAFiS0dEAIgFHUgAAAAJcEhZcwAADukAAA7pAQ4zQhwAAAAHdElNRQfhChMDGhi4116DAAAA vElEQVQY0z3P20LCQAwE0MQUA1tBI0VAEXBZ7L0CbWkB4f8/y4VS523OSyYANvhATofwEZogcpe1 5k5PuQjw1B8888qsv31NL8ICr4oCE0ZRnKTZz2bogWx3eVHui7iqqiTbCozewr3NDaqaPCA6lP9w HBOoySlqITETBTjVeQu1FgSk99+igeTIH3YIzoJzc6XWn7aDIjaXK6SG+QowFzIXO8xfeO0vS7LT DYmLrQgHmgXv3YpLjkNft/4H4cUam9AtsSEAAAAUdEVYdEF1dGhvcgBKYWt1YiBTdGVpbmVy5vv3 LwAAAFh0RVh0Q29weXJpZ2h0AENDMCBQdWJsaWMgRG9tYWluIERlZGljYXRpb24gaHR0cDovL2Ny ZWF0aXZlY29tbW9ucy5vcmcvcHVibGljZG9tYWluL3plcm8vMS4wL8bjvfkAAAAldEVYdGRhdGU6 Y3JlYXRlADIwMTctMTAtMTlUMDk6MjY6MjQtMDY6MDC3pcOVAAAAJXRFWHRkYXRlOm1vZGlmeQAy MDE3LTEwLTE5VDA5OjI2OjI0LTA2OjAwxvh7KQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBl Lm9yZ5vuPBoAAAAhdEVYdFNvdXJjZQBodHRwOi8vamltbWFjLm11c2ljaGFsbC5jemlm414AAAAA SUVORK5CYII= " + id="icon:16-4" + x="608" + y="252" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQEAYAAABPYyMiAAAABGdBTUEAALGPC/xhBQAAACBjSFJN AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QAAAAAAAD5Q7t/AAAA CXBIWXMAAA7pAAAO6QEOM0IcAAAAB3RJTUUH4QoTAxoYuNdegwAABghJREFUSMeNlXlQFPYVxz+/ XZblEsMtRDBSkcNqagxeQA2TUEQ8iClBa7SWVFOiUSEa661IuBSPKBqdRjKSMSJKxBAIU1HsINLo KrJCrMilwDLIfe6y6/76jxOd6Tjp++v7x5v3fe/N972v4Fdi35UMm9QKGLo7eHr4XZj91WzVzANQ VFKUfH0x9Jh62voOwR89on8fngZVI1VT7p4EdZA6wKoE4m+tj0w4/vL64hekRIkSDk4/5LJ/Kugf GXINNuDv5pfv3wtRqkX7txZB7qa81clrYcI9n1GOaVKapWkly6BeWXe7I1aIYsviimubYE3wmqg/ 18L1ceWzyrNB19BW1RoK9jX2n9u/Cpv/trFoqzso2ie2X9M1wNeXTk/PsoW5LXNvhLaBNqXyvqEV DLOMy8Rh+Hf17V1HAqWcqXvjgCpPSp99DtYPt4DfiYD4vq8heMwcw9ifpPyke13p0gwpdWd1zW0f g75QH2e8B0khe4JSpsFrPV5nxmtBSimlBHEvu/qE1g5urrlZ8dM28DjvGeD6B3D1GeMogqV0esW2 tqcB7IO7UhpDQOlxt7A2FLiKTvUYlAeWaoIWglKrPuY2AHwnHVyzYUj059pthc41Hf6mHdA2s03d mQONxxtvNIUJMbdgbkj4YbCY9EHA6t/2Q+f+7mtNnlL6XvHKrP8PqGe06CvLQPFe+YV2D5B5D94a Ggvmd7pq5GMQ236jGFMM1JpzWQSyF8y+IJ6I7uESGLXPHitHsPexx7EU3FPcZ7tng5gkAhRFUjqZ HBe4BgphAdA/DMopllqLfwhhYffko/olUnL4cl+1HszHOrar/gTiaE8V50EmdIWbJgAx9hGDemC7 nCfzAQv68QYMIDaCnAa4gGgFsxmErwiTy8Dkayo2eQvRH9Yf2RcLFldWXQ25cQ6GZhitTQvBeNGz xM0PlKcs1it3ACbjcpkMNOudzHGAZvBLozVgHNxgXAFIcz+3nwm58H8lLtaBuAh6vb7UEAFdg90r uwOgLLz8UVk9KBqzGlY1HYW21haN/nMYek2V5r4bxE338lHdICaqRoQSMFv7KD2AKDtPVQwQbffA MhBQKF7nBCCB4RfITTylG+RJIBN6f+hNGUiAxvzGLY1F0Di5wa9uESjaaDPpImFVcuzTr2qh59Rw heMAyI2+n4y/Bdg6aJRWwNuOSepEEMfH5Np4gch2eWjzFuAgvhPtzxrofeG4w1DiBsYOk415MnS8 ++R3Xc6wIWpdd/xi6NB2/rVrHCisXKzGWTlA6cl/rUjoh1ZFS6nifSGGKtx/nBIPwjBxcNQdYJnb XnUNEO/xd7toIM41zDYesFScE63PiHufTy6ugeIM9H7Ro9eHwKPAR5YtKiEKvYucv88D9XX1BHUW KD4d/vS9zbtAY6kJrTwMxXU/OFXvhvbMgYdejmC+PW1oUjqI+Z4j1iuAta862JWCWOLyhs2HgK3i iNAAZmAAxF9QYgRjnLFM8TE8vvh4aYcnJDelNGSchTv1le2VGbD5w00/bykAC3rppResnlgfUcfA vKz52vH58KDr51UGgxCjv5g+I/AjKZ23T304ch+IbPqsvxs4M3q+7WTgW+En/AB3YBfInaxUbYNW q9Ybw7egWlv9Su0eIbZc3VqTsByadjZ90xD6bGPlLyrWFltsISZoad8S+fxTFe+8nF1oDy2z2w7k 7ZByYHHz6kQXKQd211/Y6yHlUOXTo6ejpNRrpfyng5TNsbpNmjlSXnpQ4J0fBD1T+9Z2OL3cCxS/ oEEGGYQ3R7+5cGo0JK1NSU9Jg/DEd5bP64MaWd1uNVaIzmpxOTAR+MB9wvjVIIdklcN60I00R9oe g6rRlZt1K4VY4BNZt7AM9jmnX884BampqalJSb9mfS+64IqDEelZkCzS/FPdn28k98cLMedfh8oC 7felwVLe+fJuZel9Kc9eyqnJmfU8L/H4Xs2eODjofNC8P/r/ccOXREb0IZf0TGjxbunUxcCC2Pma eXVQ0F3wdtkGkJ3m8KeZELExwj54AHI413XufQjw8u/ymwMJxfEln+W8vP5/AQqWslrkhG8dAAAA FHRFWHRBdXRob3IASmFrdWIgU3RlaW5lcub79y8AAABYdEVYdENvcHlyaWdodABDQzAgUHVibGlj IERvbWFpbiBEZWRpY2F0aW9uIGh0dHA6Ly9jcmVhdGl2ZWNvbW1vbnMub3JnL3B1YmxpY2RvbWFp bi96ZXJvLzEuMC/G4735AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTEwLTE5VDA5OjI2OjI0LTA2 OjAwt6XDlQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNy0xMC0xOVQwOToyNjoyNC0wNjowMMb4eykA AAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAIXRFWHRTb3VyY2UAaHR0cDov L2ppbW1hYy5tdXNpY2hhbGwuY3ppZuNeAAAAAElFTkSuQmCC " + id="icon:16-8" + x="584" + y="252" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQEAYAAABPYyMiAAAABGdBTUEAALGPC/xhBQAAACBjSFJN AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QAAAAAAAD5Q7t/AAAA CXBIWXMAAA7pAAAO6QEOM0IcAAAAB3RJTUUH4QoTAxoYuNdegwAABn1JREFUSMeFVWtQk2cWft7v S0ggIbOAgEHBLVUR3HppxwqIrWxlraiVUhGpXXWx2rrgBcRaFO+Wi4JoFRFWyq50WrkoRSMpq2jo ImVro0AAXbkFgUBDSAgJJJDLu3+sdabjeH6dM3PmPOecOed5CF5iJ29nOaXXw2GscfSS6X1MBBcE cwNPAdJqaerdSGH5sHV4YOS0tXeNV9RbyzLM25smmuY05gO8RbwAfjV4CT/vXJGYi/EX1SfPPBYs WCD7zdPumfPBNT8ZLx13gsXfc1aFvx6I4K7O3Cdl1KV7rm5NjQ8JnN48w9k1IzHKTq2bsH50pJPt uK+Jvdhc5VBVX7Onno0LiYvY2GaS3Z1WF1RXBPR3DTSpQgFRq+gL0RSQvZ8mSfeJQaGeqa7p7wLv nzcuBRWKgIc+j7rkU4EPL8X84+B03vniuLIH5bKgVf8V3j90c0ruxz1nlcbrUA8aBb0pF9dQOjp5 fOm1Vkr78wfz62OHYxr3Kvzr8iu+qoyXFkgiY85n5p1an7XRU0kppZQCxeklum//DTyNHUhzUUue Qgjci7tX/9P+qQVeZd4BHn9ZGuYxY7IrCXmv3e0PgrbhrrfSRSHaNOVityrWq7GyLRTAHfRze2Bj T8XIF70HhlXwznsaQVBOXTyKgDFiKBXus3gNxWn8rQda0gYCB3hDxZXdylzlj91hlw3vSt5dvOyM IpMz+6OArX8yAEOZuppu750X/W775HT+L0nIW9hnbqjFWuaDuitqL4TSq4+XjE0F7Eu1rbQHlOx/ lZlcBRZt9lKsBqgesPsBZJDoTNWwOZ8Uge/KVYlmiOAqmwdxmjhYXDQPZDYJYKSOajer6yqPBYmZ HAAwmAB2joOCc1H9A0c4+EnnOnBw5tZIixmwn9ekcD8EyLnhJpQBNFG7zDodBNGi5aNmACk0nFYA 4MAAXwDjAEkCS98A4A4QFWC3A8SPhNH1gNXPWmX17ZQbwgwrRmIB5vaWO4t/LAF0C3WO1jdbIi0y x2rPWeZfsIkTzB4AwLHkUAqg1/zItg1A2ai/JRDA16O7LBsAULsB+58eMv/3J052AOQ7wFxklo33 GKXa7bpNOn6ze+25urm1nQCjLOza0n0OGFD1yc1fNDeO/ZGbIT7c8wq5J65z1gFkJneCsADsjjNY LwARQm9uNIAo4WOHBQAYZi7yAFAApufArbBBB0rzAeQA+hv6NGNiR4OyQpmslLa6Kl/rmtWxGmAG MGDtXwFsSY21FbT17hz+ylTvaqy5QJP8tr/yMwCBi5zlw4Z3XI/zjgIkd3Kpkw9AitzbnZYAcCHl RP20Af1zzx0GFp4gFo3Vyf4aoHl/cJ520q3WXRE7dAmR6lc1iqGPtdMAhu/On8Z3AUeW/8OGRIN9 t4rpkzFrS56M1Yu/n5NgiCfjM0edH4DFes9jvFZQJHh9LowCsM0jTJAAwIEpIaqnwPpnk9tJDcB8 A+i/HDabF2umPVnwxKGPW/ZTpa900vWrAO8ubzqvEAyz27T7g72HYJU7yEMbzgBVHTfcWg7/R6XO Mbb7uEqc7fffGJt9AiArvSccN4AgfoqLUAaQde6vO20GIGDOEjkAOwAjQP4GFhYwlm2WWubvQM93 PTEa79LR1O60rqzL95oedDaoG7KAvZv3PEyWwM5ADz30AH/Q8SwvGrzwwpUFAevMuY+1D4fHPz0Z qPuS77/gk87PSMr8dp9qgKzwznb6BWP4xn2lIBmAgFwgKgBiAIcwTi9gEzcGUMlVm029ioEWXUt7 25HTryff2dea+Fcb3/Gg4xF+KBx+T8oCCCAAohfFjKyjz5gKVQdvFVWKYrh9wQOnrh7QXjZG9m49 6k6p8XDnlWNedGKswXbuUgS1mhWU3nShtDe2f4/87f4/X3ss8a1YFF4zPH8kXuP2MsV5XnzCs5Zk rAFzLC41IzX92T8l3Qyq/rwyb2N3t1+frzS3V21sNzV+fZjS0Trr1ut3KO2S94TXfduVV5kg1UgK 1xT9OsD+sJT5yRVAenp6+vHjz2nPSxvZkL38RCE4qSTDP13820ZKv78SXTY35KMGieK6LOTazAcX Ghtkj8rll68VtxYHLdzxa97R3GPyI9uA7EnZ9swosC9XwxdYVtRp9xM5YPt8+4b6o2FbFbtSHt4B SHSSd2p3Cf9Fh+zLbDk4ujxpuSjEaOwoRom2ZC0Q4OOvnfU2mMSqhOrPimF/Uf3/A/QVDsMwsxBN AAAAFHRFWHRBdXRob3IASmFrdWIgU3RlaW5lcub79y8AAABYdEVYdENvcHlyaWdodABDQzAgUHVi bGljIERvbWFpbiBEZWRpY2F0aW9uIGh0dHA6Ly9jcmVhdGl2ZWNvbW1vbnMub3JnL3B1YmxpY2Rv bWFpbi96ZXJvLzEuMC/G4735AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTEwLTE5VDA5OjI2OjI0 LTA2OjAwt6XDlQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNy0xMC0xOVQwOToyNjoyNC0wNjowMMb4 eykAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAIXRFWHRTb3VyY2UAaHR0 cDovL2ppbW1hYy5tdXNpY2hhbGwuY3ppZuNeAAAAAElFTkSuQmCC " + id="icon:16-32" + x="560" + y="252" /> + <image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAABGdBTUEAALGPC/xhBQAAACBjSFJN AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAA3lBMVEUAAACIiIjd7t13d2Zm Zmb///+ZmZl3d3eIiHfMzLtmZlV3iHeZmYiqqpnMzMyImYiqqma7u7uZqplVVWaZiIiqqqoiMyLu /8zd7u5mVVXd3czd3d27qruqqqqZmZnMzMzu7rvu7szMzLu7u7vd7szu/5nu/0Tu/1Xd3czu/6ru 7mbuqjPumTPu/zPu/4juZjPuMyLudzPu/3fM3czuIiLu/2aqu6ru7nfuzETuVSLu/7vu7ojuRCLu 7pnuVTPu7qrumUTuzFW7u6rd7rvu3UTd3bvuiDPu7lWZqpkAAAD6RFqgAAAAHXRSTlMAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAONWQjsAAAABYktHRACIBR1IAAAACXBIWXMAAA7pAAAO6QEO M0IcAAAAB3RJTUUH4QoTAxoYuNdegwAAAaBJREFUOMt9k+tCgkAQhZmC2VKLrOy+sLJyUQRBMc0u dlN7/ydqhErUtfNz52N2mTlH08qCXNpOAezt6zsJQwdkyDnoqGSWh2DZoulYSwRxs4oaoGy5nu82 HQ4Hh+U2cABYAUsG7U7YjSI/FjbHql6j8+LrIwOAyxaVe0kakby+CCQHOM6bUHdLDoS7LGdZDhAy dJv2Pf4AstkejbsPVP4DSH5/4uSACcFj2HvKCq2AKIoHYOYd7OeXLFMAbtEBqnKaKoEpZzlgWOI1 UQC+sI5PlkAdW28qYBhgPR/EKTijBwUQS1YrBqnLdncb8MR7pRg2aHTH9m/SDUcFcAbgPKZbgCt/ 1wXAuBgnG4D/YRnnv9tsoNNPNwCaEq72rXPx+bQG+AG/WNmKWMcNy8vy2vSCy5KhKjjrzJMVEA/w ipWMCSa9c5H+AcMZ19eNS5fIySJNCsAXZKfrddeyG9OZLOa55XwhAW83nA9Vw5RiGIZR1BfSbDBF LjRTtmKyfcChzpTJacCXLYRtVZEp00f2ZjWKHjN35hfgbp81/o/3Vvy/AbdMWoCLUC7jAAAAFHRF WHRBdXRob3IASmFrdWIgU3RlaW5lcub79y8AAABYdEVYdENvcHlyaWdodABDQzAgUHVibGljIERv bWFpbiBEZWRpY2F0aW9uIGh0dHA6Ly9jcmVhdGl2ZWNvbW1vbnMub3JnL3B1YmxpY2RvbWFpbi96 ZXJvLzEuMC/G4735AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTEwLTE5VDA5OjI2OjI0LTA2OjAw t6XDlQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNy0xMC0xOVQwOToyNjoyNC0wNjowMMb4eykAAAAZ dEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAIXRFWHRTb3VyY2UAaHR0cDovL2pp bW1hYy5tdXNpY2hhbGwuY3ppZuNeAAAAAElFTkSuQmCC " + id="icon:32-4" + x="520" + y="236" /> + <image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,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 PlYL9sYF7qXfgThZruclYKE9TTsVxBCvru5TQJnY+I5vExAXRLpuQT2Agh+vs46ZoKoBr1egIqjc 2XMD/OCRGpw+DDL9MydcXiqE4wzHMN1ByF6a3ia9DrY02u2373d0i3/3u4CTwemarjvkaQzH88/D IP+hS1+4AFcMmdOu9BAiQ5UeVRcCUrE17TcUVCODhgUdALoF+OunAcHudY7fgnjLMVGzCvAiTvTh x/q/AFSBTADVq+AaApUPH8z1VEF6z7Rnb34KRl/jFoNZCN/BPjq/4zC0z/Cil6dCk4/b7gr9vck8 zgp4pEfHpbWQXVYrLN660LB4Maz7eH3d2tYQkRb+YnhvKUMnhXXyaA2OH+lHZ2aBLbYmrXgciG0y RRsK4qRzpqsaBJxyigTVIQjygYru977z6gcXW6V5Zn8J14fcmHTtWyH8zvv/4DsXMr+4PDUzGZbc WrJt+eePm8UfeBl6BMD9sNtzbudg8eRljotXwqxxUbroG3DxykVxMV6I0xE/OBSehbLA4lWh4aAZ 4jQmohkoBc4fub8PSmNOOdeCSpHlrXZDUUH+QredkOqTolwqgqvKtbYZfYQISWltaDkcrs7M6HZ9 O3gGel3x9Hn8xP/wCvhnJSQkJCQkgPmW5b6pBzS70GRMsASjY74u9wQEdGvUKLC/lO1nh4W3TYHg 7sGZ+glgT5EvqLqCoSx74/1DcIWMblf/Aka/3MvG74VoGO5T0nAlFF8ouHr7c9Bu1mY5av93Av5j ADzSmrR1n6ysgurM6vE146FBD4+cBm5QknEn4U4z8Mz2tno7QFBU0IjG+6SUR+xmaYDcvLytxqlC 3Nfe319xA7zmeLX3mAZ1fWua1rwBWp1DA4cBEL19VlLshj8v3j8dwD8r8dDa9aubgWW8JcHkB6G9 Qzq2PwTJB44vSu4AXBLdOAAdJ3c+1tERioblv3w7EjRzNTvUaog2zxwQc/LJxffEX4ejB856OyYH 7LPEDDkALn1y81Z6DQRGBxIYAoElAW8EnoXCUwbnfDeQFluUbeiTT/yR/gcq4u77i/6G7AAAABR0 RVh0QXV0aG9yAEpha3ViIFN0ZWluZXLm+/cvAAAAWHRFWHRDb3B5cmlnaHQAQ0MwIFB1YmxpYyBE b21haW4gRGVkaWNhdGlvbiBodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9wdWJsaWNkb21haW4v emVyby8xLjAvxuO9+QAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNy0xMC0xOVQwOToyNjoyMy0wNjow MHIC/RsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTctMTAtMTlUMDk6MjY6MjMtMDY6MDADX0WnAAAA GXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAACF0RVh0U291cmNlAGh0dHA6Ly9q aW1tYWMubXVzaWNoYWxsLmN6aWbjXgAAAABJRU5ErkJggg== " + id="icon:32-8" + x="480" + y="236" /> + <rect + id="icon:32-32" + y="236" + width="32" + x="440" + height="32" + style="fill:none" /> + <image + width="48" + height="48" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAABGdBTUEAALGPC/xhBQAAACBjSFJN AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAmVBMVEUAAACIiIj///+ZmZmI iIiqqqru7u7MzMzd3d3//////6r//93//+67u7vu/1Xu/zPu/4iImYju/0Tu7jPu3TPu/3eZmZnu /6ruqjPuRCLumTPu/2b//8yqu6ruRDPuIiLu/5m7zLvuiDPuMyLu7t3//7vuZjPu/+6ZmYjuuzPu VTPd7t27u6rMzLuZqpnudzPd3cyqqpkAAACMp0tyAAAABHRSTlMAAAAAs5NmmgAAAAFiS0dEAIgF HUgAAAAJcEhZcwAADukAAA7pAQ4zQhwAAAAHdElNRQfhChMDGhcoaEMSAAAB30lEQVRIx9XVbX+i MAwAcDpLoTYQijx44oRt6NTddnff/8tdNm5StFD2ar/r6/xNQm3ief/LYZyzL4X7IphPGOOhXCqY Se4Yj0DFiAkQ0S7CmPYFJOkqQ8RcQVhotpgsxheyTHH9Y4Pvp9pKcT9aGX2ZqAvf1XUHEOOSKtOW NFRLEQI0XXgPENNEgfCHaSiaPwi5zXHVhZvgPc0SPrq5ACoFFP149vhU1xZAafKtbHkPYB/Tjx8u 4TeATvKsL+AoktPZiLaCpu0BD/frunaAbdD3wAKVOQHcG8AHfHKAVBoflnGIDw6QgzYugrreOED5 YgLqOnMAFQ2umprYTYJUHgeAQ7WZBIk4Dv57vC2zSWDewkeKn4DnCXBVUVfTaQI0QnvDQ99p0PYV AP/61bFCputRkAO/u35yui3NFEOgXm+fNaWITyOAElhGh37Z48EKUohsc4NSVJn1iTbCPmh4oPq+ DRDLN/tgWnDR4K9boELt2Q8roPq87x6UMD6TWQTxajcEORTjA5nx35Cuziaobu94KFrViX8ghgfu eS6Bj5+gohWx8BwihBhP3bjPaXA7lxDjgUwQaaGkS4jc8SS0D1taWZV6LmbuRaZbudzLcP7mZfyP EMWccgzypcX+vecvb/BWd0ZJM5oAAAAUdEVYdEF1dGhvcgBKYWt1YiBTdGVpbmVy5vv3LwAAAFh0 RVh0Q29weXJpZ2h0AENDMCBQdWJsaWMgRG9tYWluIERlZGljYXRpb24gaHR0cDovL2NyZWF0aXZl Y29tbW9ucy5vcmcvcHVibGljZG9tYWluL3plcm8vMS4wL8bjvfkAAAAldEVYdGRhdGU6Y3JlYXRl ADIwMTctMTAtMTlUMDk6MjY6MjMtMDY6MDByAv0bAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE3LTEw LTE5VDA5OjI2OjIzLTA2OjAwA19FpwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vu PBoAAAAhdEVYdFNvdXJjZQBodHRwOi8vamltbWFjLm11c2ljaGFsbC5jemlm414AAAAASUVORK5C YII= " + id="icon:48-4" + x="384" + y="220" /> + <image + width="48" + height="48" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,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 90DRzb1QqM1ABXfYLzJhAn19Vd597136esIh3TOkEVauXEm12svuXe9TYhmMcZGFE/IwCUz/7HM2 dKTo5m1YOeAi1PPCi38mDkMpl8ujBwDg2oI0b32LsBIQ8CBcV4CZJaRg0YLtzwGphRHF4XhAsFxL a2srJ06eoLFx9RDvGwbA8uXLqSaxrFv3PJ7ei8McZN5YdGqh3/JadKFg+/NgqB6wXE21kvLq318h 7EuGVS0cVpCuenwVZ7q7ZdPmNynyY4ydiMwfD/UeUnS+PJUOcRYyTACdxHPrniWqVmXlypWDK3Kp AAC93RX27t3Dhx+1U+RniFtC5tejE4P+JD47C+EN7IG8tDiT9etforvnjKxYMfxK9bAByuUyZ073 yoaNGzh6pIcSP0VsAWaPQ+qDPPaLLhS9AUNIGIPDPFrefpsDBzt47NGhF3RHBHAWoqqRPP/HP3G8 M6XETzB2DMwcC1eVzi0nLhJCwjhcFrBz52527niHUmHsJZf5L3m1tfrnq6lkVVn3h99z+LO+HEKm IJMKyLQ6ZIx3wcWcYSout7Nt+w5a3m6m63SPLFu27FLVGPkOTVNTE65ndMniJdzyrXlEvEXCB6AO krlg/VrR1sfjNoxO5x8bN7L/4w85c6p3yPP9ZQOAPKTGTijpN66ZxiMPP4TY44RsASqc3dDwuJNq VXhu3Tp6e7o509U3YuVHDeCsrP3t0ziOoz/8wY+4+qqpJOxHKGKYTntbBy+/sp5qHMuqhtHbqRz1 bdampl/h+UWdNHki9993P1mqvPjXF+ju7SGupqO2O3nZAM7KU2t/je8GChBVQ1mxYujLgytyRf6L 8h/53K3pTQfdSQAAABR0RVh0QXV0aG9yAEpha3ViIFN0ZWluZXLm+/cvAAAAWHRFWHRDb3B5cmln aHQAQ0MwIFB1YmxpYyBEb21haW4gRGVkaWNhdGlvbiBodHRwOi8vY3JlYXRpdmVjb21tb25zLm9y Zy9wdWJsaWNkb21haW4vemVyby8xLjAvxuO9+QAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNy0xMC0x OVQwOToyNjoyMy0wNjowMHIC/RsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTctMTAtMTlUMDk6MjY6 MjMtMDY6MDADX0WnAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAACF0RVh0 U291cmNlAGh0dHA6Ly9qaW1tYWMubXVzaWNoYWxsLmN6aWbjXgAAAABJRU5ErkJggg== " + id="icon:48-8" + x="328" + y="220" /> + <rect + id="icon:48-32" + y="220" + width="48" + x="272" + height="48" + style="fill:none" /> + <rect + id="icon:256-32" + y="8" + width="256" + x="8" + height="256" + style="fill:none" /> + <g + transform="matrix(0.66666023,0,0,0.66666023,440.0003,236.00097)" + id="layer1-1"> + <path + transform="translate(-0.125,0.625)" + d="m 40.5,40.9375 a 17.1875,5.4375 0 1 1 -34.375,0 17.1875,5.4375 0 1 1 34.375,0 z" + id="path15677-2" + style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.36931817;fill:url(#radialGradient15685-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + inkscape:connector-curvature="0" /> + <g + id="g3215-7"> + <g + id="g3152-0" + transform="matrix(1.006289,0,0,1,0.477995,0.5)"> + <path + id="path15651-9" + d="M 23,3 C 15.599034,8.5765861 4,12 4,12 7,37.75 23.375,44 23.375,44 23.375,44 39.5,37.5 42.75,11.625 42.75,11.625 28.75,6.5 23,3 Z" + style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:0.99687034;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient2502-5);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99687046;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="M 23.023587,4.289309 C 16.08809,9.5151669 5.218554,12.723272 5.218554,12.723272 c 2.811321,24.130505 18.11714,29.987424 18.11714,29.987424 0,0 15.150159,-6.091195 18.195756,-30.338839 0,0 -13.119498,-4.8026735 -18.507863,-8.082548 z" + id="path15665-3" + inkscape:connector-curvature="0" /> + <path + id="path15667-6" + d="m 22.88299,7 v 33 c 0,0 -12.318457,-5.259424 -15.9999995,-26 C 12.13299,13.125 22.88299,7 22.88299,7 Z" + style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient3209-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + inkscape:connector-curvature="0" /> + </g> + </g> + </g> + <g + id="g904" + transform="matrix(5.33,0,0,5.33,7.671548,13.49)"> + <path + inkscape:connector-curvature="0" + style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.36931817;fill:url(#radialGradient906);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="path892" + d="m 40.5,40.9375 a 17.1875,5.4375 0 1 1 -34.375,0 17.1875,5.4375 0 1 1 34.375,0 z" + transform="translate(-0.125,0.625)" /> + <g + id="g902"> + <g + transform="matrix(1.006289,0,0,1,0.477995,0.5)" + id="g900"> + <path + inkscape:connector-curvature="0" + style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:0.99687034;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="M 23,3 C 15.599034,8.5765861 4,12 4,12 7,37.75 23.375,44 23.375,44 23.375,44 39.5,37.5 42.75,11.625 42.75,11.625 28.75,6.5 23,3 Z" + id="path894" /> + <path + inkscape:connector-curvature="0" + id="path896" + d="M 23.023587,4.289309 C 16.08809,9.5151669 5.218554,12.723272 5.218554,12.723272 c 2.811321,24.130505 18.11714,29.987424 18.11714,29.987424 0,0 15.150159,-6.091195 18.195756,-30.338839 0,0 -13.119498,-4.8026735 -18.507863,-8.082548 z" + style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient908);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99687046;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient910);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="m 22.88299,7 v 33 c 0,0 -12.318457,-5.259424 -15.9999995,-26 C 12.13299,13.125 22.88299,7 22.88299,7 Z" + id="path898" /> + </g> + </g> + </g> +</svg> diff --git a/dlls/comctl32/idi_td_warning.ico b/dlls/comctl32/idi_td_warning.ico new file mode 100644 index 0000000000000000000000000000000000000000..2d86498195c46a312b14f1e23925d10483242af5 GIT binary patch literal 5430 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 literal 0 HcmV?d00001 diff --git a/dlls/comctl32/idi_td_warning.svg b/dlls/comctl32/idi_td_warning.svg new file mode 100644 index 0000000000..a5ca96530a --- /dev/null +++ b/dlls/comctl32/idi_td_warning.svg @@ -0,0 +1,415 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg2" + height="272" + width="632" + version="1.1" + sodipodi:docname="oic_bang.svg" + inkscape:version="0.92.3 (2405546, 2018-03-11)"> + <metadata + id="metadata39"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1399" + inkscape:window-height="1043" + id="namedview37" + showgrid="false" + inkscape:zoom="1" + inkscape:cx="88.692134" + inkscape:cy="32" + inkscape:window-x="218" + inkscape:window-y="109" + inkscape:window-maximized="0" + inkscape:current-layer="svg2" /> + <defs + id="defs4"> + <linearGradient + id="linearGradient5048-1"> + <stop + id="stop5050-0" + stop-color="#000" + stop-opacity="0" + offset="0" /> + <stop + id="stop5056-5" + stop-color="#000" + offset="0.5" /> + <stop + id="stop5052-1" + stop-color="#000" + stop-opacity="0" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient5060-0"> + <stop + id="stop5062-8" + stop-color="#000" + offset="0" /> + <stop + id="stop5064-5" + stop-color="#000" + stop-opacity="0" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient3869" + y2="48.302" + gradientUnits="userSpaceOnUse" + x2="30.851" + gradientTransform="matrix(1.560474,0,-0.00679269,1.6218998,-0.88374412,-16.915188)" + y1="30.282" + x1="8.5469"> + <stop + id="stop6529-6" + stop-color="#FFF" + offset="0" /> + <stop + id="stop6531-2" + stop-color="#FFF" + stop-opacity="0.34020618" + offset="1" /> + </linearGradient> + <radialGradient + id="radialGradient3889" + xlink:href="#linearGradient5060-0" + gradientUnits="userSpaceOnUse" + cy="486.65" + cx="605.71" + gradientTransform="matrix(-0.06555823,0,0,0.04293512,55.671088,29.187249)" + r="117.14" /> + <radialGradient + id="radialGradient3892" + xlink:href="#linearGradient5060-0" + gradientUnits="userSpaceOnUse" + cy="486.65" + cx="605.71" + gradientTransform="matrix(0.06555823,0,0,0.04293512,8.3076485,29.187249)" + r="117.14" /> + <linearGradient + id="linearGradient3895" + y2="609.51" + xlink:href="#linearGradient5048-1" + gradientUnits="userSpaceOnUse" + x2="302.86" + gradientTransform="matrix(0.06555823,0,0,0.04293512,8.2947466,29.187249)" + y1="366.65" + x1="302.86" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5048-1" + id="linearGradient868" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.06555823,0,0,0.04293512,8.2947466,29.187249)" + x1="302.86" + y1="366.65" + x2="302.86" + y2="609.51" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5060-0" + id="radialGradient870" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.06555823,0,0,0.04293512,8.3076485,29.187249)" + cx="605.71" + cy="486.65" + r="117.14" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5060-0" + id="radialGradient872" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-0.06555823,0,0,0.04293512,55.671088,29.187249)" + cx="605.71" + cy="486.65" + r="117.14" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5048-1" + id="linearGradient874" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.06555823,0,0,0.04293512,8.2947466,29.187249)" + x1="302.86" + y1="366.65" + x2="302.86" + y2="609.51" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5060-0" + id="radialGradient876" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.06555823,0,0,0.04293512,8.3076485,29.187249)" + cx="605.71" + cy="486.65" + r="117.14" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5060-0" + id="radialGradient878" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-0.06555823,0,0,0.04293512,55.671088,29.187249)" + cx="605.71" + cy="486.65" + r="117.14" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3869" + id="linearGradient880" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.560474,0,-0.00679269,1.6218998,-0.88374412,-16.915188)" + x1="8.5469" + y1="30.282" + x2="30.851" + y2="48.302" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5048-1" + id="linearGradient937" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.06555823,0,0,0.04293512,8.2947466,29.187249)" + x1="302.86" + y1="366.65" + x2="302.86" + y2="609.51" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5060-0" + id="radialGradient939" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.06555823,0,0,0.04293512,8.3076485,29.187249)" + cx="605.71" + cy="486.65" + r="117.14" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5060-0" + id="radialGradient941" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-0.06555823,0,0,0.04293512,55.671088,29.187249)" + cx="605.71" + cy="486.65" + r="117.14" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3869" + id="linearGradient943" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.560474,0,-0.00679269,1.6218998,-0.88374412,-16.915188)" + x1="8.5469" + y1="30.282" + x2="30.851" + y2="48.302" /> + </defs> + <image + id="icon:16-4" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAAXNSR0IArs4c6QAAADBQTFRFfwAA AAAAAH8Af38AAAB/fwB/AH9/wMDAf39//wAAAP8A//8AAAD//wD/AP//////LRS/BQAAAAF0Uk5T AEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2QsVCiMMU3rP ZwAAAE1JREFUCNddirsNwFAIxI4Nkg6JaemQmIbuSSwXPkkTV6ezAYAuLKy/QWbryM8O9rOOQ3ST kInIQybiHu04C+0kQ7Ii8n4qYhsU9ws+HqI5HSgLUb9WAAAAAElFTkSuQmCC " + height="16" + width="16" + y="252" + x="608" /> + <image + id="icon:32-4" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAAXNSR0IArs4c6QAAADBQTFRFfwAA AAAAAH8Af38AAAB/fwB/AH9/wMDAf39//wAAAP8A//8AAAD//wD/AP//////LRS/BQAAAAF0Uk5T AEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2QsVCiA0UFUk OgAAAIdJREFUKM+NkcENgDAIRe0GeuqhU3rSDSTpNN5MWE6gUsAmxn/jJe+TwDT9zbLEOW3bHMF+ RJAB1k+QdoDgDCBDvYLzBmQgemcAZCB6h8BZHGDjLM4ZAFdcxZVIpwOyFKstbgANiMFRRwBtUdAM Bo/TKxT0CnXonJa1Xc9CDr3IZ+Yn+vz4+g1H7XoBNjWWbwAAAABJRU5ErkJggg== " + height="32" + width="32" + y="236" + x="520" /> + <image + id="icon:48-4" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAAXNSR0IArs4c6QAAADBQTFRFfwAA AAAAAH8Af38AAAB/fwB/AH9/wMDAf39//wAAAP8A//8AAAD//wD/AP//////LRS/BQAAAAF0Uk5T AEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH2QsVChwq2alg pgAAANJJREFUOMu1lDEKwzAMRZMb2FMKOWWmdO1UQ0/TraDL1fK3bKtSCoFWYx68h4ydafrLxOh/ n/c9uGBJaTsF5mtK93AGZJPvOgJscl0ZPF4eyKYMHFcGRA7gBAPj4gSRE+EEA+MqCSeChBNBwomU RLzYSEncVhNBAkC5kGDwEcEWz9Vsgi0Y6EjdooLBVbcoQEWQIAIYXPWgMAOQgxLQXHJQpTFGJBEj 6YgkAHqkJaDqEUnItIgkOqgutcUQwaXVU1yHYEnObN9AfsV2At69nZ/+WN4ecxoPLuqsSQAAAABJ RU5ErkJggg== " + height="48" + width="48" + y="220" + x="384" /> + <image + id="icon:16-8" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAAXNSR0IArs4c6QAAAT5QTFRFz4RH AAAAKCEWKSIWVD8fVUAfgV0mhF8nzlwAz18Ez18Fz2EH0GEI0GIJ0WII0GMK0GQM02QK0GUNz2YQ 1WYK0GcS0WcT1mcK12gJ0GkV12kK2mkI3GoGz2wa3GsH4GsFz24e4GwE42wC5GwBrHkv524B6HAA sHww6XAA0HQo0HUr63IA7HMA7nQA73QA73UA8XYA8nYA0Hw483gA9HgA9HkA9XkA9XoA9nwE9n4G 9n8HzoZL94EK94IK9oUN9oUOzoxW94gR94kTzo9czZFf94wWzZRmzphszZlu+JcizZ12+Zkm+Zom zqF+6qA2+p0q+p4r+qEuzaaG+6Iv+6Qw+6QyzauQza2U+6s6/K08/K49/K4+zLOe/K8+zLqszL6z zL+1zMC3zMS9zMXAzMfDzMnGzMrIzMvKzMvLzMzMy8LsZAAAAAF0Uk5TAEDm2GYAAAABYktHRACI BR1IAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2QsTFwQPISNDRwAAAJtJREFUGNNjYIAA SVkGFKClrGSEIiBoYsyHzFdQs7RQ1UQSEDHz9jQVRPDFtG2iIq00EOZKmfkzMfuYicP4Qrp20Sys UbY6wlABabPAWDb22AAzCQifV98xNlZFPTbWXo8fLCBjHhoLBsFmciA+t6ErkMPICCScDHiAAopm IREREX5+QCLQTJ6BQUDPDAnoijLwcXIgAS4+BnQAANVfGykK+atOAAAAAElFTkSuQmCC " + height="16" + width="16" + y="252" + x="584" /> + <image + id="icon:32-8" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAAAXNSR0IArs4c6QAAAjpQTFRFzl8A EhQRExQSHRwWIR4TKyMVLSQWNywZSDYaUDwaZEgiak0hf10lz1oAzF4Amm4q0GICxGQXy2MP0WME zmUDz2YE0GcG0GcUpXIq0WgW02oYqXUtwm4r1WsZ0G0Xz20h1mwbw3Uvz3Mk1nId3HEW3nIJ13Mf 0HQs2HQg3Hcjz3k21nkqynw813or3nkl0Xs4u4Qt2nwt4Xso9nkA230uyoE/93oAz4BA5H0h3H4v wIgx9H4A9n8D2oI4zYVJ94AFz4ZK+IEH0IhS34Y84Ic9w4xjzYtT9YUZ94YK9oYa8YcjzY1a+Icc 44o/9YoN+Ygd5ItA9osP9Yoc0I9c9osd45BD+o4V2JYz+I4q65A+2Zc0z5Vm95IV9ZErz5Zt7ZJA 9ZEz5pNM95Is7pNB+pQZ3Zo3+JMtqKCZ95M1+5Ua8ZU8+JQ38ZVDzZx265dQ+pU4z5139pg37ZlS +Zoo95k49plA0J94+psp95pB954p+ZtC+pxD9p5DzaSB7Z9V+qAszaWI9p9L+6EtzqaJ96BM/KIu 8KJY/qMw+aJN8aNf+qNO+6Yw86c+8qRg9ag3zKyT9qZV/Kgx96dW/aky96o69qddzq6V+KhX8alj +Ks7+Khe+qwz8qpk+aw8+qlY+alf86tl+6098qxr9qxg/K4+yrSe9a1m961h/a8/9q5n9a5tzLag zLioury5+LFwzbmpzbuxw768z72ywMK+y8C0ysK7zMS9zcW+zMbFzcfGx8nGycvIz8rIyszJBYl6 qwAAAAF0Uk5TAEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH 2QsTFwEAzOuqkwAAAYZJREFUOMutk8tLAmEUxbP30x7ER2PRi2rTJjiuciIkIQ3phY8KBwprUUJh GhhJYgwJlRFkGJWkFfTRor+x+00apo4rz+LOhfPj8HEPU1dXY7EeI6vqm7LfrBoxnlScL1UAZn4F 4jZ9YuRxBZCz/boBc2mQIqt6EdKbQwCWBx2ALVwBvhAQcFcmpC8rkPmgkZYqBtjiwC7nMWBjk1UM kCHnOOd2QK0AMHcECGW83lQCWPeXE1LWgvlcqt6wxZeBaBnAdoIUwHmT4ZZfA46yCFMWsNIDWhto eICTEoAdKkCMvPYWGvcEl0SMvgN2snhnm5g+utY/gB1TQEJYAx1iPlNnB8XEFNW8JhyemdU++4BS BLBzF3CtOYPd4lY8J8NSFDFNNXs032swzGgLdeb6A4YvnYWAm+bGPW0RnW0XCLNKNfNfZVL55RRw 5gEpuQhcPJeIblGIYCp05NAA5lf0AHmpTwATT5+vadLdlaqq8ehZJBIOB48CAUVRJodExJhRT129 tfidfwAAAK06nSDw1gAAAABJRU5ErkJggg== " + height="32" + width="32" + y="236" + x="480" /> + <image + id="icon:48-8" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAAXNSR0IArs4c6QAAAhxQTFRF010C EhQRExQSFBUTFhgVGhkSJB0ULiUXMCcYMykWRjQdSjcbUT0bWEMhY0chaEsfa04iclMhe1oiiGAq jGMm0FsA0VwB1F8E1WAF0GICm28r0WME1GQA02QG1GUH2GcA1mcLpnMronUq2GgN1WsN3GsB1mwP 2G0R3m0F2m8U23AV33ML33MZ5nMQ5HcS3ngbuYMz4Hodu4Qt9nkA6HsX4nwg93oA5H0hv4cw+HsC 5X4i9H4A6IAa9n8D94AF6YEm44Mk6oId+IEH7IMe5oUmzIww5YUv9YUI7oUh94YK6Icxz48z6ogp 9oYa+IcN8Ycj+Icc8ogk6okz0pE1+Ygd9osP9Yoc9Ion7Ys19osd+IwR74wu94wf6o41+Y0T1ZQ4 9owo+o4V940p848o+I4q8o859JAq7JE4+Y8r95IV9ZEr7pI5+ZMX95Is9pI075RC95M1+5Ua3ps4 8ZU895cZ+JQ38ZVD8pY98pZE9Jc24p4z9pg39Zg/+Zoo95k49plA+psp95pB/Jwq+ZtC8pxP9J1C 56I4+pxD+Z8r9Z5K9J5R+qAs959E9p9L+6Et96BM9aBS66Y7/qMw+aUv+aJN86c2+qNO86Ra+6Yw +aNV9aVU9qZV/Kgx96dW/aky9qdd+KhX+Ks7+Khe+qlY+alf+600+609+qpg/a419qxg/K4++6th 961h/a8/+K9i969o+bBj+LBp+bFq+7JrhZU4EgAAAAF0Uk5TAEDm2GYAAAABYktHRACIBR1IAAAA CXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH2QsTFwoPv6BuyQAAAmxJREFUSMfVVv1r01AU3fP7 W6frgwpPq8JAFDbMD4olFYtaxtyoohvMyijUonFUpkbFbh0RP7a5rehQ2QqzltF2dZdN8g+ae5tk 7ZY02W96fsi9ac7hvL53btq2tv8F3MC2+F2F0rVtKESn/jihX/Cv4NM5SVIKvgXioi4ZqFz2qwj8 UFCQKPkUiK51iVC44U/Bf6bqgr5lX4LA1YpkIn/bj4KvDFiC6LLwYXCriNzkKF61B94WfC2O1KVa xLjKxZAn/+535I8AvMOqPvKyCOpRJJYBAJtwsdPD4GEe+aMGHz5jp7xobXFKp6VXUQD9dHrnWxo8 05A0Tnz4SgF53coipMu4/QC93d03Ae7T6bU4C/4mh5RJgGOMHQaYx7t7E+4WQg8bjB5jNScYazdK EhWfXC34exUJcwbzDGMdRlmiDGpuFuIPPu/H73uFsbNYn+AnOReLwDTNzTwSnzN2CWsV1xh1sRC/ kT9EO/prBxumhjKoOlrwxZRtALCXfaFaxn2WNSeFqMe6zoeDu81mnALiIOClBMXa5LXvN5saZdDB om4wYtLg23Grm6SAbBHwCs1N1aJBze56HLdW0Ny8tEjDR4/0Wv0cPhnYJAiuxnA3yhbpEGMHbAuK ebZZIWYaYm1gH2N7bDVlMN4kEGs4N9GNdZ/ctbPDvoGhLacnNDPWNj6+bbghi1iDILQum7F2QXLT 6YmcPfnOoPdBxBacWw1LfpASTQbesCz4Yp8/gaTU54K/monHIo2QLYQbIcfvmIMUfDqbX1jIE2an pj5oiImxsWw2q6pqJpNRlHQ6PTh4/fTGz3jAD/g/+i/kL9uvixLY2fQDAAAAAElFTkSuQmCC " + height="48" + width="48" + y="220" + x="328" /> + <g + id="g3912" + transform="translate(264,212)"> + <rect + id="rect6709" + style="color:#000000;opacity:0.40206;fill:url(#linearGradient937);fill-rule:nonzero" + height="10.427" + width="31.655001" + y="44.929001" + x="16.162001" /> + <path + id="path6711" + style="color:#000000;opacity:0.40206185;fill:url(#radialGradient939);fill-rule:nonzero" + d="m 47.817,44.93 v 10.427 c 3.3761,0.01963 8.1617,-2.3361 8.1617,-5.2139 0,-2.8779 -3.7675,-5.2126 -8.1617,-5.2126 z" + inkscape:connector-curvature="0" /> + <path + id="path6713" + style="color:#000000;opacity:0.40206185;fill:url(#radialGradient941);fill-rule:nonzero" + d="m 16.162,44.93 v 10.427 c -3.3761,0.01963 -8.1617,-2.3361 -8.1617,-5.2139 0,-2.8779 3.7675,-5.2126 8.1617,-5.2126 z" + inkscape:connector-curvature="0" /> + <rect + id="rect3954" + style="color:#000000;opacity:0.40206;fill:url(#linearGradient3895);fill-rule:nonzero" + height="10.427" + width="31.655001" + y="44.929001" + x="16.162001" /> + <path + id="path3956" + style="color:#000000;opacity:0.40206185;fill:url(#radialGradient3892);fill-rule:nonzero" + d="m 47.817,44.93 v 10.427 c 3.3761,0.01963 8.1617,-2.3361 8.1617,-5.2139 0,-2.8779 -3.7675,-5.2126 -8.1617,-5.2126 z" + inkscape:connector-curvature="0" /> + <path + id="path3958" + style="color:#000000;opacity:0.40206185;fill:url(#radialGradient3889);fill-rule:nonzero" + d="m 16.162,44.93 v 10.427 c -3.3761,0.01963 -8.1617,-2.3361 -8.1617,-5.2139 0,-2.8779 3.7675,-5.2126 8.1617,-5.2126 z" + inkscape:connector-curvature="0" /> + <path + id="path6485" + style="fill:#f57900;fill-opacity:1;fill-rule:nonzero;stroke:#ce5c00;stroke-width:1.0000006;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 53.377512,48.102633 34.648246,12.947202 c -0.538335,-0.976539 -1.512437,-1.51906 -2.597291,-1.51906 -1.084857,0 -2.063954,0.651023 -2.61047,1.627565 L 10.85069,48.211139 c -0.437579,0.868035 -0.442577,2.061583 0.09622,2.929619 0.538791,0.868035 1.404859,1.302052 2.489716,1.302052 h 37.319056 c 1.084854,0 2.063498,-0.542521 2.501079,-1.410558 0.546062,-0.868035 0.550605,-1.953078 0.120758,-2.929619 z" + inkscape:connector-curvature="0" /> + <path + id="path6496" + d="m 18.423,46.161 c -0.28308,0.46637 -0.0036,0.83946 0.46489,0.83946 h 26.422 c 0.46848,0 0.75115,-0.3731 0.47206,-0.83946 L 32.48995,21.35 c -0.27909,-0.46637 -0.65387,-0.46637 -0.84326,0 l -13.223,24.811 z" + inkscape:connector-curvature="0" + style="fill:#fcaf3e;fill-rule:nonzero" /> + <path + id="path1325" + style="opacity:0.5;fill:none;stroke:url(#linearGradient943);stroke-width:1.00000072;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 51.698081,47.302582 34.177912,14.45915 c -0.746169,-1.414858 -1.013803,-1.868802 -2.147767,-1.868802 -0.975297,0 -1.485603,0.661109 -2.190403,1.99662 L 12.514035,47.403953 c -1.006069,1.84248 -1.11386,2.322747 -0.629608,3.133696 0.48425,0.810951 1.106003,0.766782 3.403324,0.81968 h 34.052637 c 2.138764,0.02645 2.620537,-0.136551 3.014053,-0.947497 0.491045,-0.810952 0.282181,-1.454343 -0.65636,-3.10725 z" + inkscape:connector-curvature="0" /> + <path + id="path6500" + d="m 32.028,44.271 c -1.1441,0 -2.0242,-0.89434 -2.0242,-2.057 0,-1.2521 0.79208,-2.057 2.0242,-2.057 1.23212,0 1.9362,0.8049 2.0242,2.057 0,1.1626 -0.79208,2.057 -2.0242,2.057 z m -0.64455,-6.6478 -1.1156,-8.9136 h 3.5204 l -1.1156,10.383 -1.2891,-1.4692 z" + inkscape:connector-curvature="0" + style="fill:#121312;fill-rule:nonzero" /> + </g> + <image + id="icon:16-32" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAMwA zADM38FfGgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9kLExcFAd+AXwEAAAHmSURBVDjL pdK/axNhHMfx9/Pj7vJc7pI7er00za+GohRNERQKgoiTiw46iIo2durmonYsKAiiiw4ZxEkXV/8C EdyUYNvBoUXwxyIRgh1EMQk5h2q0mEiLn+358vm+nuUrGJHmeWa0xdMEOkmPYwcf835YT44CLItH UYZ85FPSmgejekOB1Qscl4J9gYcIfFQCR17VObwjIAGBojEe4knbRmlNHGCUoLEjYGWes5Yi7xtQ hSlkoYyfRkjYu3KRE/8EmotYCu7GIZ5MuajxHDqeRNoOcYiHpJFc376z7aG+seg4eK4DqjhF7eo6 s0sbqEIFz4CjidbecGkosDZPWghuxgGe8HxkGFErG2plg4pySOMSh3iJ4M6zBVJ/Af2Ea2kH27FA F6sgYLbscKCSAiFQxSrGBuNggh6XtwEv6owJwVIU4MpsiMwEAOwvGmols1UMxxBehlxAWgiWm2fI DgA74Ybvouxfv//MqbksJw9lfh9XqYptge+idYplAPHyHCXLYn06j7HiGGt6ZrCgTz8HoPfk6GDW 3XhNp93m7Ue+9rvs0Y7N7ayHVgr0xCRJrzcof3o4t3Vcf8zURAG92Sbw0J+/cEus1tmsxGRti13l exc+tGjpPtx/1+JKkrArQkBHSO7xv/kBmlJhOC8yq0gAAAAASUVORK5CYII= " + height="16" + width="16" + y="252" + x="560" /> + <image + id="icon:32-32" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAABl0RVh0 U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAU5SURBVFiFvZddbBRVFMd/587H7uxHd7fb bWe3u7QI1AJCRVEoYGKikhBDfDEQjaMPfiTGmJCYGEMCDxo/YvwMhjefjC8+GJ981KjBLzQDBgSs WEtrt0SbtlQoy3bn+jCVUnYBXYsnuQ9z7plzf+c/d+bMFa01zZrviQKMde/parM5VLM3HvLkCRGZ RNT0oYdlv++JNJPHbOYm35N+K5l964a7dzjKtBg+8PEjf47+fATY/29zNaWAEt4pbt4eld++Rh/7 iPz6u2LKtF70PYlfdwDfk21OcVWvYyO67KOnTmGeHSaz4pYI8Mx1BfA9EaXU2+7Nd8SCwU8v+oOh A7T19DnKij7re9J63QCAnYmlfYVIMIWeHJr3VqZQEydo673VFGHvdQHwPTHFMN9oX9Mfrw1+dslM uPmDkYNkulZElB1/wvekuOgAwGPpFevT9swoTJcBMPIlzGW94Wz1HOqPo+RWrzdFeHlRAXxPHGXZ L+VWrXdqg1+ETsPEyJdQrTkklgAgKB8ine+0lJO63/ekd9EAgF2tvRscY+okzIyH6+dLiGkiAmZp aRgVVGHsMO6qdZYS3lgUAN+TlLKd3dkVfdFg6AAAYkcw3M75JKkM0pIGQP9+jGRrxjAS2Tt9T277 zwACu3M39Vtq/ChUzgBgFJYQaGGgXGGgXKFS1ZjFORV0EKqwsi+qhH3/CcD3xFXR5NOZ7pWRYPib ECjqoNpcAq3ZsneAzXsGGBm/gEokUZlcyDAxSCJhi53pWON7ck/TACK80L52symnfaieC6vvXIoo wTIVHamwleQzVjhX6gYRQKPHfqCjZ3VMCfuu1qiuCOB7coMRb30o1dltBb99FwLFkhjZtosxpaxN 0lHEImEaFXUwcm6owvQojlUj2lYsAvf/awARXnX7tlgyehBqF4BLdvucFbMWbnphQzUKXaDCtPr0 ETqW98RF5E3fk4adtyGA78kaq6X93mSu3QjKh0KglgwqlV4QV2qzyKetheC2jdEx94bMjBPV0yTc JWng0X8MoIS33L4tth75GnQNAOuy6gGWtUdwM1ad3yiUwAgLDn4/Tnt3d1yUetn3xLkmgO/JJitb 2hhPJ5U+fTQMas0h8UTdQjv60zywOV3nF8PEKCwJLy5MY1XHackviQjsuiaAEva5azc5+tSXgAYR jGJ33SIAH347xYnRCkFQ/19pdBQQOwKAHj9JrlSMYZi7fU8WEC8A8D3ZFnWX9cYcJXp8IEyUc1HR OuUYKFd46t0Rnnu/zOfHztaroBRGZ1d4MTuDOTNGpliyRNjTEMD3RETkbXdNf0zPfXJRClXoalh9 IWNRyFik4wZL2+v3AYBq60CcWKjC5BBZNxcRw37S9yTfSIGdiVJvISLn0FOnwuo7OlG23TB5PKr4 /pUejrx2I125SMMYEcEozjcq42yZbLHTVJe0azVXvSlKvd6++vZ4cOrL+QpSreja7BWHooalgqvH JFpAGaEKZ0bJ5NIWVnSH78lymP8tfzBZ6k1HZieo/Tl2EaB6/HDDypo2XUPOjtFWcO3hk7++Dtyn AKoB21NuPhacGVncBRtZZZp4ImqYin4RaTEBJs/z08QvP15IbNxqq8I6qFXDttpoBDXQAfoa85eP MF5DEDA5NFybqjAA2KK1Zmu35HZv4IMWiy2IoWTumV1UjqucH692tqyb06ADpqsMPv8Vj38yzBfy 9+FURGIpmy7HpBPQhuJ8EwJf0WqaSC0gUQ2YnKwwCJS11rNy+elYRBSgtNaziwkgEnbDy/PWAfzf 9hcUENjDRAHAvAAAAABJRU5ErkJggg== " + height="32" + width="32" + y="236" + x="440" /> + <rect + id="icon:48-32" + height="48" + width="48" + y="220" + x="272" + style="fill:none" /> + <rect + id="icon:256-32" + height="256" + width="256" + y="8" + x="8" + style="fill:none" /> + <g + id="g866" + transform="matrix(5.33,0,0,5.33,-34.641599,-31.053459)"> + <rect + x="16.162001" + y="44.929001" + width="31.655001" + height="10.427" + style="color:#000000;opacity:0.40206;fill:url(#linearGradient868);fill-rule:nonzero" + id="rect846" /> + <path + inkscape:connector-curvature="0" + d="m 47.817,44.93 v 10.427 c 3.3761,0.01963 8.1617,-2.3361 8.1617,-5.2139 0,-2.8779 -3.7675,-5.2126 -8.1617,-5.2126 z" + style="color:#000000;opacity:0.40206185;fill:url(#radialGradient870);fill-rule:nonzero" + id="path848" /> + <path + inkscape:connector-curvature="0" + d="m 16.162,44.93 v 10.427 c -3.3761,0.01963 -8.1617,-2.3361 -8.1617,-5.2139 0,-2.8779 3.7675,-5.2126 8.1617,-5.2126 z" + style="color:#000000;opacity:0.40206185;fill:url(#radialGradient872);fill-rule:nonzero" + id="path850" /> + <rect + x="16.162001" + y="44.929001" + width="31.655001" + height="10.427" + style="color:#000000;opacity:0.40206;fill:url(#linearGradient874);fill-rule:nonzero" + id="rect852" /> + <path + inkscape:connector-curvature="0" + d="m 47.817,44.93 v 10.427 c 3.3761,0.01963 8.1617,-2.3361 8.1617,-5.2139 0,-2.8779 -3.7675,-5.2126 -8.1617,-5.2126 z" + style="color:#000000;opacity:0.40206185;fill:url(#radialGradient876);fill-rule:nonzero" + id="path854" /> + <path + inkscape:connector-curvature="0" + d="m 16.162,44.93 v 10.427 c -3.3761,0.01963 -8.1617,-2.3361 -8.1617,-5.2139 0,-2.8779 3.7675,-5.2126 8.1617,-5.2126 z" + style="color:#000000;opacity:0.40206185;fill:url(#radialGradient878);fill-rule:nonzero" + id="path856" /> + <path + inkscape:connector-curvature="0" + d="M 53.377512,48.102633 34.648246,12.947202 c -0.538335,-0.976539 -1.512437,-1.51906 -2.597291,-1.51906 -1.084857,0 -2.063954,0.651023 -2.61047,1.627565 L 10.85069,48.211139 c -0.437579,0.868035 -0.442577,2.061583 0.09622,2.929619 0.538791,0.868035 1.404859,1.302052 2.489716,1.302052 h 37.319056 c 1.084854,0 2.063498,-0.542521 2.501079,-1.410558 0.546062,-0.868035 0.550605,-1.953078 0.120758,-2.929619 z" + style="fill:#f57900;fill-opacity:1;fill-rule:nonzero;stroke:#ce5c00;stroke-width:1.0000006;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path858" /> + <path + style="fill:#fcaf3e;fill-rule:nonzero" + inkscape:connector-curvature="0" + d="m 18.423,46.161 c -0.28308,0.46637 -0.0036,0.83946 0.46489,0.83946 h 26.422 c 0.46848,0 0.75115,-0.3731 0.47206,-0.83946 L 32.48995,21.35 c -0.27909,-0.46637 -0.65387,-0.46637 -0.84326,0 l -13.223,24.811 z" + id="path860" /> + <path + inkscape:connector-curvature="0" + d="M 51.698081,47.302582 34.177912,14.45915 c -0.746169,-1.414858 -1.013803,-1.868802 -2.147767,-1.868802 -0.975297,0 -1.485603,0.661109 -2.190403,1.99662 L 12.514035,47.403953 c -1.006069,1.84248 -1.11386,2.322747 -0.629608,3.133696 0.48425,0.810951 1.106003,0.766782 3.403324,0.81968 h 34.052637 c 2.138764,0.02645 2.620537,-0.136551 3.014053,-0.947497 0.491045,-0.810952 0.282181,-1.454343 -0.65636,-3.10725 z" + style="opacity:0.5;fill:none;stroke:url(#linearGradient880);stroke-width:1.00000072;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path862" /> + <path + style="fill:#121312;fill-rule:nonzero" + inkscape:connector-curvature="0" + d="m 32.028,44.271 c -1.1441,0 -2.0242,-0.89434 -2.0242,-2.057 0,-1.2521 0.79208,-2.057 2.0242,-2.057 1.23212,0 1.9362,0.8049 2.0242,2.057 0,1.1626 -0.79208,2.057 -2.0242,2.057 z m -0.64455,-6.6478 -1.1156,-8.9136 h 3.5204 l -1.1156,10.383 -1.2891,-1.4692 z" + id="path864" /> + </g> +</svg> -- 2.17.0

2 6

[PATCH 2/2] mstask: Implement ITask::GetNextRunTime() for DAILY trigger type.
by Dmitry Timoshkov 21 May '18

21 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 44 ++++++++++++++++++++++++++++++++++++++++ dlls/mstask/tests/task_trigger.c | 18 +++++++++++++++- 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index c004764af0..012bf48612 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -445,6 +445,27 @@ static void get_end_time(const TASK_TRIGGER *trigger, FILETIME *ft) SystemTimeToFileTime(&st, ft); } +static void filetime_add_ms(FILETIME *ft, ULONGLONG ms) +{ + union u_ftll + { + FILETIME ft; + ULONGLONG ll; + } *ftll = (union u_ftll *)ft; + + ftll->ll += ms * (ULONGLONG)10000; +} + +static void filetime_add_hours(FILETIME *ft, ULONG hours) +{ + filetime_add_ms(ft, (ULONGLONG)hours * 60 * 60 * 1000); +} + +static void filetime_add_days(FILETIME *ft, ULONG days) +{ + filetime_add_hours(ft, (ULONGLONG)days * 24); +} + static HRESULT WINAPI MSTASK_ITask_GetNextRunTime(ITask *iface, SYSTEMTIME *rt) { TaskImpl *This = impl_from_ITask(iface); @@ -483,6 +504,29 @@ static HRESULT WINAPI MSTASK_ITask_GetNextRunTime(ITask *iface, SYSTEMTIME *rt) } break; + case TASK_TIME_TRIGGER_DAILY: + st = current_st; + st.wHour = This->trigger[i].wStartHour; + st.wMinute = This->trigger[i].wStartMinute; + st.wSecond = 0; + st.wMilliseconds = 0; + SystemTimeToFileTime(&st, &current_ft); + while (CompareFileTime(&current_ft, &end_ft) < 0) + { + if (CompareFileTime(&current_ft, &begin_ft) >= 0) + { + if (!have_best_time || CompareFileTime(&current_ft, &best_ft) < 0) + { + best_ft = current_ft; + have_best_time = TRUE; + } + break; + } + + filetime_add_days(&current_ft, This->trigger[i].Type.Daily.DaysInterval); + } + break; + default: FIXME("trigger type %u is not handled\n", This->trigger[i].TriggerType); break; diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index e880ce4996..f7ab461aa9 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -522,7 +522,23 @@ static void test_GetNextRunTime(void) st.wDay, st.wMonth, st.wYear, st.wDayOfWeek, st.wHour, st.wMinute, st.wSecond); - /* FIXME: TASK_TIME_TRIGGER_DAILY */ + /* TASK_TIME_TRIGGER_DAILY */ + + hr = ITaskTrigger_GetTrigger(trigger, &data); + ok(hr == S_OK, "got %#x\n", hr); + data.rgFlags &= ~TASK_TRIGGER_FLAG_DISABLED; + data.TriggerType = TASK_TIME_TRIGGER_DAILY; + data.Type.Daily.DaysInterval = 1; + hr = ITaskTrigger_SetTrigger(trigger, &data); + ok(hr == S_OK, "got %#x\n", hr); + + memset(&st, 0xff, sizeof(st)); + hr = ITask_GetNextRunTime(task, &st); + ok(hr == S_OK, "got %#x\n", hr); + ok(!memcmp(&st, &cmp, sizeof(st)), "got %u/%u/%u wday %u %u:%02u:%02u\n", + st.wDay, st.wMonth, st.wYear, st.wDayOfWeek, + st.wHour, st.wMinute, st.wSecond); + /* FIXME: TASK_TIME_TRIGGER_WEEKLY */ /* FIXME: TASK_TIME_TRIGGER_MONTHLYDATE */ /* FIXME: TASK_TIME_TRIGGER_MONTHLYDOW */ -- 2.16.3

1 0

[PATCH 1/2] mstask: Implement ITask::GetNextRunTime() for ONCE trigger type.
by Dmitry Timoshkov 21 May '18

21 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 90 ++++++++++++++++++++++++++++++++++++++-- dlls/mstask/tests/task_trigger.c | 81 +++++++++++++++++++++++++++++++++--- 2 files changed, 163 insertions(+), 8 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index d487aeb5a5..c004764af0 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -408,11 +408,95 @@ static HRESULT WINAPI MSTASK_ITask_GetRunTimes( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_GetNextRunTime(ITask *iface, SYSTEMTIME *st) +static void get_begin_time(const TASK_TRIGGER *trigger, FILETIME *ft) { - FIXME("(%p, %p): stub\n", iface, st); + SYSTEMTIME st; - memset(st, 0, sizeof(*st)); + st.wYear = trigger->wBeginYear; + st.wMonth = trigger->wBeginMonth; + st.wDay = trigger->wBeginDay; + st.wDayOfWeek = 0; + st.wHour = 0; + st.wMinute = 0; + st.wSecond = 0; + st.wMilliseconds = 0; + SystemTimeToFileTime(&st, ft); +} + +static void get_end_time(const TASK_TRIGGER *trigger, FILETIME *ft) +{ + SYSTEMTIME st; + + if (!(trigger->rgFlags & TASK_TRIGGER_FLAG_HAS_END_DATE)) + { + ft->dwHighDateTime = ~0u; + ft->dwLowDateTime = ~0u; + return; + } + + st.wYear = trigger->wEndYear; + st.wMonth = trigger->wEndMonth; + st.wDay = trigger->wEndDay; + st.wDayOfWeek = 0; + st.wHour = 0; + st.wMinute = 0; + st.wSecond = 0; + st.wMilliseconds = 0; + SystemTimeToFileTime(&st, ft); +} + +static HRESULT WINAPI MSTASK_ITask_GetNextRunTime(ITask *iface, SYSTEMTIME *rt) +{ + TaskImpl *This = impl_from_ITask(iface); + SYSTEMTIME st, current_st; + FILETIME current_ft, begin_ft, end_ft, best_ft; + BOOL have_best_time = FALSE; + DWORD i; + + TRACE("(%p, %p)\n", iface, rt); + + GetLocalTime(&current_st); + + for (i = 0; i < This->trigger_count; i++) + { + if (!(This->trigger[i].rgFlags & TASK_TRIGGER_FLAG_DISABLED)) + { + get_begin_time(&This->trigger[i], &begin_ft); + get_end_time(&This->trigger[i], &end_ft); + + switch (This->trigger[i].TriggerType) + { + case TASK_TIME_TRIGGER_ONCE: + st = current_st; + st.wHour = This->trigger[i].wStartHour; + st.wMinute = This->trigger[i].wStartMinute; + st.wSecond = 0; + st.wMilliseconds = 0; + SystemTimeToFileTime(&st, &current_ft); + if (CompareFileTime(&begin_ft, &current_ft) <= 0 && CompareFileTime(&current_ft, &end_ft) < 0) + { + if (!have_best_time || CompareFileTime(&current_ft, &best_ft) < 0) + { + best_ft = current_ft; + have_best_time = TRUE; + } + } + break; + + default: + FIXME("trigger type %u is not handled\n", This->trigger[i].TriggerType); + break; + } + } + } + + if (have_best_time) + { + FileTimeToSystemTime(&best_ft, rt); + return S_OK; + } + + memset(rt, 0, sizeof(*rt)); return SCHED_S_TASK_NO_VALID_TRIGGERS; } diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index 9a20a5672c..e880ce4996 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -422,6 +422,53 @@ static void test_task_trigger(void) ok(ref == 0, "got %u\n", ref); } +static void time_add_ms(SYSTEMTIME *st, DWORD ms) +{ + union + { + FILETIME ft; + ULONGLONG ll; + } ftll; + BOOL ret; + + trace("old: %u/%u/%u wday %u %u:%02u:%02u.%03u\n", + st->wDay, st->wMonth, st->wYear, st->wDayOfWeek, + st->wHour, st->wMinute, st->wSecond, st->wMilliseconds); + ret = SystemTimeToFileTime(st, &ftll.ft); + ok(ret, "SystemTimeToFileTime error %u\n", GetLastError()); + + ftll.ll += ms * (ULONGLONG)10000; + ret = FileTimeToSystemTime(&ftll.ft, st); + ok(ret, "FileTimeToSystemTime error %u\n", GetLastError()); + trace("new: %u/%u/%u wday %u %u:%02u:%02u.%03u\n", + st->wDay, st->wMonth, st->wYear, st->wDayOfWeek, + st->wHour, st->wMinute, st->wSecond, st->wMilliseconds); +} + +static void trigger_add_ms(TASK_TRIGGER *data, DWORD ms, SYSTEMTIME *ret) +{ + SYSTEMTIME st; + + st.wYear = data->wBeginYear; + st.wMonth = data->wBeginMonth; + st.wDayOfWeek = 0; + st.wDay = data->wBeginDay; + st.wHour = data->wStartHour; + st.wMinute = data->wStartMinute; + st.wSecond = 0; + st.wMilliseconds = 0; + + time_add_ms(&st, ms); + + data->wBeginYear = st.wYear; + data->wBeginMonth = st.wMonth; + data->wBeginDay = st.wDay; + data->wStartHour = st.wHour; + data->wStartMinute = st.wMinute; + + *ret = st; +} + static void test_GetNextRunTime(void) { static const WCHAR task_name[] = { 'T','e','s','t','i','n','g',0 }; @@ -429,8 +476,9 @@ static void test_GetNextRunTime(void) HRESULT hr; ITask *task; ITaskTrigger *trigger; + TASK_TRIGGER data; WORD idx; - SYSTEMTIME st; + SYSTEMTIME st, cmp; hr = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); @@ -442,9 +490,9 @@ static void test_GetNextRunTime(void) memset(&st, 0xff, sizeof(st)); hr = ITask_GetNextRunTime(task, &st); ok(hr == SCHED_S_TASK_NO_VALID_TRIGGERS, "got %#x\n", hr); - ok(!memcmp(&st, &st_empty, sizeof(st)), "got %d/%d/%d wday %d %d:%d:%d.%03d\n", + ok(!memcmp(&st, &st_empty, sizeof(st)), "got %u/%u/%u wday %u %u:%02u:%02u\n", st.wDay, st.wMonth, st.wYear, st.wDayOfWeek, - st.wHour, st.wMinute, st.wSecond, st.wMilliseconds); + st.wHour, st.wMinute, st.wSecond); hr = ITask_CreateTrigger(task, &idx, &trigger); ok(hr == S_OK, "got %#x\n", hr); @@ -452,9 +500,32 @@ static void test_GetNextRunTime(void) memset(&st, 0xff, sizeof(st)); hr = ITask_GetNextRunTime(task, &st); ok(hr == SCHED_S_TASK_NO_VALID_TRIGGERS, "got %#x\n", hr); - ok(!memcmp(&st, &st_empty, sizeof(st)), "got %d/%d/%d wday %d %d:%d:%d.%03d\n", + ok(!memcmp(&st, &st_empty, sizeof(st)), "got %u/%u/%u wday %u %u:%02u:%02u\n", st.wDay, st.wMonth, st.wYear, st.wDayOfWeek, - st.wHour, st.wMinute, st.wSecond, st.wMilliseconds); + st.wHour, st.wMinute, st.wSecond); + + /* TASK_TIME_TRIGGER_ONCE */ + + hr = ITaskTrigger_GetTrigger(trigger, &data); + ok(hr == S_OK, "got %#x\n", hr); + data.rgFlags &= ~TASK_TRIGGER_FLAG_DISABLED; + data.TriggerType = TASK_TIME_TRIGGER_ONCE; + /* add 5 minutes to avoid races */ + trigger_add_ms(&data, 5 * 60 * 1000, &cmp); + hr = ITaskTrigger_SetTrigger(trigger, &data); + ok(hr == S_OK, "got %#x\n", hr); + + memset(&st, 0xff, sizeof(st)); + hr = ITask_GetNextRunTime(task, &st); + ok(hr == S_OK, "got %#x\n", hr); + ok(!memcmp(&st, &cmp, sizeof(st)), "got %u/%u/%u wday %u %u:%02u:%02u\n", + st.wDay, st.wMonth, st.wYear, st.wDayOfWeek, + st.wHour, st.wMinute, st.wSecond); + + /* FIXME: TASK_TIME_TRIGGER_DAILY */ + /* FIXME: TASK_TIME_TRIGGER_WEEKLY */ + /* FIXME: TASK_TIME_TRIGGER_MONTHLYDATE */ + /* FIXME: TASK_TIME_TRIGGER_MONTHLYDOW */ ITaskTrigger_Release(trigger); ITask_Release(task); -- 2.16.3

1 0

[PATCH] testbot/CheckForWinetestUpdate: Exit if we cannot replace the latest WineTest.
by Francois Gouget 21 May '18

21 May '18

Otherwise we would create jobs that test the old (presumably already tested) WineTest and the next CheckWinetestUpdate run will redo it all anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/CheckForWinetestUpdate.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 37bd776f2..ff8c30c23 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -238,6 +238,8 @@ mkdir "$DataDir/latest"; if (!move($StagingFileName, $LatestFileName)) { LogMsg "Could not move '$StagingFileName' to '$LatestFileName': $!\n"; + unlink($StagingFileName); + exit 1; } utime time, $Response->last_modified, $LatestFileName; -- 2.17.0

1 0

[PATCH] testbot/CheckForWinetestUpdate: Hard link the latest WineTest.
by Francois Gouget 21 May '18

21 May '18

This is ok because the latest WineTest executable is moved into place rather than being overwritten. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/CheckForWinetestUpdate.pl | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index a7abec707..37bd776f2 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -65,21 +65,10 @@ sub AddJob($$$) { my ($BaseJob, $LatestBaseName, $Bits) = @_; - # Create a copy in staging so it can then be moved into the job directory - my ($fh, $StagingFileName) = OpenNewFile("$DataDir/staging", "_$LatestBaseName"); - if (!$fh) - { - LogMsg "Could not create the staging file: $!\n"; - return 0; - } - if (!copy("$DataDir/latest/$LatestBaseName", $fh)) - { - LogMsg "Could not copy '$DataDir/latest/$LatestBaseName' to '$StagingFileName': $!\n"; - close($fh); - unlink($StagingFileName); - return 0; - } - close($fh); + # Create a hard link in staging so it can then be moved into the job + # directory. This is ok because the latest file is never overwritten. + my $StagingFileName = CreateNewLink("$DataDir/latest/$LatestBaseName", + "$DataDir/staging", "_$LatestBaseName"); # First create a new job my $Jobs = CreateJobs(); -- 2.17.0

1 0

[PATCH] include: Add IMFReadWriteClassFactory interface
by Alistair Leslie-Hughes 21 May '18

21 May '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/mfreadwrite.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index ad1cef6784..133e5b2dd0 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -131,6 +131,20 @@ interface IMFSinkWriterEx : IMFSinkWriter [out] IMFTransform **transform); } +[ + object, + uuid(e7fe2e12-661c-40da-92f9-4f002ab67627), + local +] +interface IMFReadWriteClassFactory : IUnknown +{ + HRESULT CreateInstanceFromURL([in] REFCLSID clsid, [in] LPCWSTR url, [in] IMFAttributes *attributes, + [in] REFIID riid, [out, iid_is(riid)] void **object ); + + HRESULT CreateInstanceFromObject([in] REFCLSID clsid, [in] IUnknown *unk, [in] IMFAttributes *attributes, + [in] REFIID riid, [out, iid_is(riid)] void **object ); +} + cpp_quote( "HRESULT WINAPI MFCreateSourceReaderFromByteStream(IMFByteStream *stream, IMFAttributes *attributes," ) cpp_quote( " IMFSourceReader **reader);" ) cpp_quote( "HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAttributes *attributes," ) -- 2.17.0

1 0

[PATCH] include: Add more WM interfaces
by Alistair Leslie-Hughes 21 May '18

21 May '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/wmsdkidl.idl | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index d1cbcd2..5b5f05b 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -495,6 +495,18 @@ interface IWMProfileManager : IUnknown [out] IWMProfile **ppProfile); } +[ + object, + uuid(7a924e51-73c1-494d-8019-23d37ed9b89a), + pointer_default(unique), + local +] +interface IWMProfileManager2 : IWMProfileManager +{ + HRESULT GetSystemProfileVersion(WMT_VERSION *version); + HRESULT SetSystemProfileVersion(WMT_VERSION version); +}; + cpp_quote("HRESULT WINAPI WMCreateProfileManager(IWMProfileManager**);") [ @@ -1615,6 +1627,73 @@ interface IWMReaderPlaylistBurn : IUnknown HRESULT EndPlaylistBurn([in] HRESULT result); } +[ + object, + uuid(72995a79-5090-42a4-9c8c-d9d0b6d34be5), + pointer_default(unique), + local +] +interface IWMPropertyVault : IUnknown +{ + HRESULT GetPropertyCount([in] DWORD *count); + + HRESULT GetPropertyByName( + [in] const WCHAR *name, + [out] WMT_ATTR_DATATYPE *type, + [out, size_is( *size )] BYTE *value, + [in, out] DWORD *size); + + HRESULT SetProperty( + [in] const WCHAR *name, + [in] WMT_ATTR_DATATYPE type, + [in] BYTE *value, + [in] DWORD size); + + HRESULT GetPropertyByIndex( + [in] DWORD index, + [out, size_is( *pdwNameLen )] WCHAR *name, + [in, out] DWORD *length, + [out] WMT_ATTR_DATATYPE *type, + [out, size_is( *size )] BYTE *value, + [in, out] DWORD *size); + + HRESULT CopyPropertiesFrom([in] IWMPropertyVault *vault); + + HRESULT Clear(); +}; + +[ + object, + uuid(fc54a285-38c4-45b5-aa23-85b9f7cb424b), + pointer_default(unique), + local +] +interface IWMWriterPreprocess : IUnknown +{ + HRESULT GetMaxPreprocessingPasses( + [in] DWORD input, + [in] DWORD flags, + [out] DWORD *passes); + + HRESULT SetNumPreprocessingPasses( + [in] DWORD input, + [in] DWORD flags, + [in] DWORD passes); + + HRESULT BeginPreprocessingPass( + [in] DWORD input, + [in] DWORD flags); + + HRESULT PreprocessSample( + [in] DWORD input, + [in] QWORD sample_time, + [in] DWORD flags, + [in] INSSBuffer *sample); + + HRESULT EndPreprocessingPass( + [in] DWORD input, + [in] DWORD flags); +}; cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") cpp_quote("HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**);") -- 1.9.1

1 0

[PATCH 3/3] d3d11: Implement depth clip control.
by Henri Verbeet 19 May '18

19 May '18

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10core/tests/device.c | 2 -- dlls/d3d11/device.c | 3 --- dlls/d3d11/state.c | 1 + dlls/d3d11/tests/d3d11.c | 2 -- dlls/wined3d/context.c | 2 +- dlls/wined3d/cs.c | 2 +- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/state.c | 28 +++++++++++++++++++++++----- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_private.h | 6 +++--- include/wine/wined3d.h | 1 + 12 files changed, 35 insertions(+), 19 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 4b39c1be256..50521bda443 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -16894,12 +16894,10 @@ static void test_depth_clip(void) ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); set_viewport(device, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); draw_quad_z(&test_context, 2.0f); -todo_wine check_texture_float(texture, 0.6f, 1); draw_quad_z(&test_context, 0.5f); check_texture_float(texture, 0.5f, 1); draw_quad_z(&test_context, -1.0f); -todo_wine check_texture_float(texture, 0.4f, 1); ID3D10DepthStencilView_Release(dsv); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c930248e54a..863f71f80b9 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -948,9 +948,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon const_bias.f = desc->DepthBias; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SLOPESCALEDEPTHBIAS, scale_bias.d); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, const_bias.d); - /* GL_DEPTH_CLAMP */ - if (!desc->DepthClipEnable) - FIXME("Ignoring DepthClipEnable %#x.\n", desc->DepthClipEnable); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, desc->ScissorEnable); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, desc->MultisampleEnable); wined3d_device_set_render_state(device->wined3d_device, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index f880a2374d7..d4c3befd269 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1068,6 +1068,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str } wined3d_desc.front_ccw = desc->FrontCounterClockwise; + wined3d_desc.depth_clip = desc->DepthClipEnable; /* We cannot fail after creating a wined3d_rasterizer_state object. It * would lead to double free. */ diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2a8ec0a8d88..894c744b977 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -27396,12 +27396,10 @@ static void test_depth_clip(void) ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); set_viewport(context, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); draw_quad_z(&test_context, 2.0f); -todo_wine check_texture_float(texture, 0.6f, 1); draw_quad_z(&test_context, 0.5f); check_texture_float(texture, 0.5f, 1); draw_quad_z(&test_context, -1.0f); -todo_wine check_texture_float(texture, 0.4f, 1); ID3D11DepthStencilView_Release(dsv); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 300b79b6992..21ad11d9586 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2663,7 +2663,7 @@ static void context_set_render_offscreen(struct wined3d_context *context, BOOL o context_invalidate_state(context, STATE_SCISSORRECT); if (!context->gl_info->supported[ARB_CLIP_CONTROL]) { - context_invalidate_state(context, STATE_FRONTFACE); + context_invalidate_state(context, STATE_RASTERIZER); context_invalidate_state(context, STATE_POINTSPRITECOORDORIGIN); context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); } diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index e4a29406a4f..3f1ca8ce658 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1490,7 +1490,7 @@ static void wined3d_cs_exec_set_rasterizer_state(struct wined3d_cs *cs, const vo const struct wined3d_cs_set_rasterizer_state *op = data; cs->state.rasterizer_state = op->state; - device_invalidate_state(cs->device, STATE_FRONTFACE); + device_invalidate_state(cs->device, STATE_RASTERIZER); } void wined3d_cs_emit_set_rasterizer_state(struct wined3d_cs *cs, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 32c255240f7..a4e4a0c0044 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -122,6 +122,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_cull_distance", ARB_CULL_DISTANCE }, {"GL_ARB_debug_output", ARB_DEBUG_OUTPUT }, {"GL_ARB_depth_buffer_float", ARB_DEPTH_BUFFER_FLOAT }, + {"GL_ARB_depth_clamp", ARB_DEPTH_CLAMP }, {"GL_ARB_depth_texture", ARB_DEPTH_TEXTURE }, {"GL_ARB_derivative_control", ARB_DERIVATIVE_CONTROL }, {"GL_ARB_draw_buffers", ARB_DRAW_BUFFERS }, @@ -3879,6 +3880,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {EXT_TEXTURE_SNORM, MAKEDWORD_VERSION(3, 1)}, /* We don't need or want GL_ARB_texture_rectangle (core in 3.1). */ + {ARB_DEPTH_CLAMP, MAKEDWORD_VERSION(3, 2)}, {ARB_DRAW_ELEMENTS_BASE_VERTEX, MAKEDWORD_VERSION(3, 2)}, /* ARB_geometry_shader4 exposes a somewhat different API compared to 3.2 * core geometry shaders so it's not really correct to expose the diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 34e08e9ba51..3b2f84538db 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4318,7 +4318,23 @@ static void indexbuffer(struct wined3d_context *context, const struct wined3d_st } } -static void frontface(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void depth_clip(const struct wined3d_rasterizer_state *r, const struct wined3d_gl_info *gl_info) +{ + if (!gl_info->supported[ARB_DEPTH_CLAMP]) + { + if (r && !r->desc.depth_clip) + FIXME("Depth clamp not supported by this GL implementation.\n"); + return; + } + + if (r && !r->desc.depth_clip) + gl_info->gl_ops.gl.p_glEnable(GL_DEPTH_CLAMP); + else + gl_info->gl_ops.gl.p_glDisable(GL_DEPTH_CLAMP); + checkGLcall("depth clip"); +} + +static void rasterizer(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; GLenum mode; @@ -4329,9 +4345,10 @@ static void frontface(struct wined3d_context *context, const struct wined3d_stat gl_info->gl_ops.gl.p_glFrontFace(mode); checkGLcall("glFrontFace"); + depth_clip(state->rasterizer_state, gl_info); } -static void frontface_cc(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void rasterizer_cc(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; GLenum mode; @@ -4340,6 +4357,7 @@ static void frontface_cc(struct wined3d_context *context, const struct wined3d_s gl_info->gl_ops.gl.p_glFrontFace(mode); checkGLcall("glFrontFace"); + depth_clip(state->rasterizer_state, gl_info); } static void psorigin_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4509,8 +4527,8 @@ const struct StateEntryTemplate misc_state_template[] = { STATE_BLEND, { STATE_BLEND, state_blend_object }, WINED3D_GL_EXT_NONE }, { STATE_STREAMSRC, { STATE_STREAMSRC, streamsrc }, WINED3D_GL_EXT_NONE }, { STATE_VDECL, { STATE_VDECL, vdecl_miscpart }, WINED3D_GL_EXT_NONE }, - { STATE_FRONTFACE, { STATE_FRONTFACE, frontface_cc }, ARB_CLIP_CONTROL }, - { STATE_FRONTFACE, { STATE_FRONTFACE, frontface }, WINED3D_GL_EXT_NONE }, + { STATE_RASTERIZER, { STATE_RASTERIZER, rasterizer_cc }, ARB_CLIP_CONTROL }, + { STATE_RASTERIZER, { STATE_RASTERIZER, rasterizer }, WINED3D_GL_EXT_NONE }, { STATE_SCISSORRECT, { STATE_SCISSORRECT, scissorrect }, WINED3D_GL_EXT_NONE }, { STATE_POINTSPRITECOORDORIGIN, { STATE_POINTSPRITECOORDORIGIN, state_nop }, ARB_CLIP_CONTROL }, { STATE_POINTSPRITECOORDORIGIN, { STATE_POINTSPRITECOORDORIGIN, psorigin }, WINED3D_GL_VERSION_2_0 }, @@ -5449,7 +5467,7 @@ static void validate_state_table(struct StateEntry *state_table) STATE_VIEWPORT, STATE_LIGHT_TYPE, STATE_SCISSORRECT, - STATE_FRONTFACE, + STATE_RASTERIZER, STATE_POINTSPRITECOORDORIGIN, STATE_BASEVERTEXINDEX, STATE_FRAMEBUFFER, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 655fdb1d8d3..ade1227581c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4654,8 +4654,8 @@ const char *debug_d3dstate(DWORD state) return wine_dbg_sprintf("STATE_CLIPPLANE(%#x)", state - STATE_CLIPPLANE(0)); if (STATE_IS_MATERIAL(state)) return "STATE_MATERIAL"; - if (STATE_IS_FRONTFACE(state)) - return "STATE_FRONTFACE"; + if (STATE_IS_RASTERIZER(state)) + return "STATE_RASTERIZER"; if (STATE_IS_POINTSPRITECOORDORIGIN(state)) return "STATE_POINTSPRITECOORDORIGIN"; if (STATE_IS_BASEVERTEXINDEX(state)) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 3140526ca11..525c29803a5 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -55,6 +55,7 @@ enum wined3d_gl_extension ARB_CULL_DISTANCE, ARB_DEBUG_OUTPUT, ARB_DEPTH_BUFFER_FLOAT, + ARB_DEPTH_CLAMP, ARB_DEPTH_TEXTURE, ARB_DERIVATIVE_CONTROL, ARB_DRAW_BUFFERS, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3e344a5f0f3..26979b3226e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1639,10 +1639,10 @@ enum wined3d_pipeline #define STATE_MATERIAL (STATE_CLIPPLANE(MAX_CLIP_DISTANCES)) #define STATE_IS_MATERIAL(a) ((a) == STATE_MATERIAL) -#define STATE_FRONTFACE (STATE_MATERIAL + 1) -#define STATE_IS_FRONTFACE(a) ((a) == STATE_FRONTFACE) +#define STATE_RASTERIZER (STATE_MATERIAL + 1) +#define STATE_IS_RASTERIZER(a) ((a) == STATE_RASTERIZER) -#define STATE_POINTSPRITECOORDORIGIN (STATE_FRONTFACE + 1) +#define STATE_POINTSPRITECOORDORIGIN (STATE_RASTERIZER + 1) #define STATE_IS_POINTSPRITECOORDORIGIN(a) ((a) == STATE_POINTSPRITECOORDORIGIN) #define STATE_BASEVERTEXINDEX (STATE_POINTSPRITECOORDORIGIN + 1) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 15e14e5c5f3..7681aa2a0bf 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1986,6 +1986,7 @@ struct wined3d_blend_state_desc struct wined3d_rasterizer_state_desc { BOOL front_ccw; + BOOL depth_clip; }; struct wined3d_sampler_desc -- 2.11.0

1 0

[PATCH 2/3] d2d1/tests: Add a simple test for creating d2d devices.
by Henri Verbeet 19 May '18

19 May '18

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index f8332946b95..8299ceb7d4d 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -19,7 +19,7 @@ #define COBJMACROS #include <limits.h> #include <math.h> -#include "d2d1.h" +#include "d2d1_1.h" #include "wincrypt.h" #include "wine/test.h" #include "initguid.h" @@ -6426,6 +6426,47 @@ static void test_bezier_intersect(void) DestroyWindow(window); } +static void test_create_device(void) +{ + ID3D10Device1 *d3d_device; + IDXGIDevice *dxgi_device; + ID2D1Factory1 *factory; + ID2D1Factory *factory2; + ID2D1Device *device; + ULONG refcount; + HRESULT hr; + + if (!(d3d_device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + ID3D10Device1_Release(d3d_device); + return; + } + + hr = ID3D10Device1_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to get IDXGIDevice interface, hr %#x.\n", hr); + + hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, &device); + ok(SUCCEEDED(hr), "Failed to get ID2D1Device, hr %#x.\n", hr); + + ID2D1Device_GetFactory(device, &factory2); + ok(factory2 == (ID2D1Factory *)factory, "Got unexpected factory %p, expected %p.\n", factory2, factory); + ID2D1Factory_Release(factory2); + ID2D1Device_Release(device); + + IDXGIDevice_Release(dxgi_device); + ID3D10Device1_Release(d3d_device); + + refcount = ID2D1Factory1_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); +} + START_TEST(d2d1) { test_clip(); @@ -6454,4 +6495,5 @@ START_TEST(d2d1) test_gdi_interop(); test_layer(); test_bezier_intersect(); + test_create_device(); } -- 2.11.0

1 0

[PATCH 1/3] d2d1: Add ID2D1Device stub.
by Henri Verbeet 19 May '18

19 May '18

From: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/Makefile.in | 2 +- dlls/d2d1/d2d1_private.h | 10 +++ dlls/d2d1/{render_target.c => device.c} | 121 ++++++++++++++++++++++++++++++++ dlls/d2d1/factory.c | 14 +++- include/d2d1_1.idl | 61 +++++++++++++++- 5 files changed, 204 insertions(+), 4 deletions(-) rename dlls/d2d1/{render_target.c => device.c} (97%) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 20d3f26f6fa..4bfe3b5953d 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -8,12 +8,12 @@ C_SRCS = \ bitmap_render_target.c \ brush.c \ dc_render_target.c \ + device.c \ factory.c \ geometry.c \ hwnd_render_target.c \ layer.c \ mesh.c \ - render_target.c \ state_block.c \ stroke.c \ wic_render_target.c diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index dbfb83c249e..21e2b8835a5 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -477,6 +477,16 @@ void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory * ID2D1Geometry *src_geometry, const D2D_MATRIX_3X2_F *transform) DECLSPEC_HIDDEN; struct d2d_geometry *unsafe_impl_from_ID2D1Geometry(ID2D1Geometry *iface) DECLSPEC_HIDDEN; +struct d2d_device +{ + ID2D1Device ID2D1Device_iface; + LONG refcount; + ID2D1Factory1 *factory; + IDXGIDevice *dxgi_device; +}; + +void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDevice *dxgi_device) DECLSPEC_HIDDEN; + static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { size_t new_capacity, max_capacity; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/device.c similarity index 97% rename from dlls/d2d1/render_target.c rename to dlls/d2d1/device.c index 7afbc84ec56..f74e9f85201 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/device.c @@ -38,6 +38,11 @@ struct d2d_draw_text_layout_ctx D2D1_DRAW_TEXT_OPTIONS options; }; +static inline struct d2d_device *impl_from_ID2D1Device(ID2D1Device *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_device, ID2D1Device_iface); +} + static ID2D1Brush *d2d_draw_get_text_brush(struct d2d_draw_text_layout_ctx *context, IUnknown *effect) { ID2D1Brush *brush = NULL; @@ -3289,3 +3294,119 @@ HRESULT d2d_d3d_render_target_create_rtv(ID2D1RenderTarget *iface, IDXGISurface1 return S_OK; } + +static HRESULT WINAPI d2d_device_QueryInterface(ID2D1Device *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1Device) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1Device_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI d2d_device_AddRef(ID2D1Device *iface) +{ + struct d2d_device *device = impl_from_ID2D1Device(iface); + ULONG refcount = InterlockedIncrement(&device->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI d2d_device_Release(ID2D1Device *iface) +{ + struct d2d_device *device = impl_from_ID2D1Device(iface); + ULONG refcount = InterlockedDecrement(&device->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + { + IDXGIDevice_Release(device->dxgi_device); + ID2D1Factory1_Release(device->factory); + heap_free(device); + } + + return refcount; +} + +static void WINAPI d2d_device_GetFactory(ID2D1Device *iface, ID2D1Factory **factory) +{ + struct d2d_device *device = impl_from_ID2D1Device(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); + + *factory = (ID2D1Factory *)device->factory; + ID2D1Factory1_AddRef(device->factory); +} + +static HRESULT WINAPI d2d_device_CreateDeviceContext(ID2D1Device *iface, D2D1_DEVICE_CONTEXT_OPTIONS options, + ID2D1DeviceContext **context) +{ + FIXME("iface %p, options %#x, context %p stub!\n", iface, options, context); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d2d_device_CreatePrintControl(ID2D1Device *iface, IWICImagingFactory *wic_factory, + IPrintDocumentPackageTarget *document_target, const D2D1_PRINT_CONTROL_PROPERTIES *desc, + ID2D1PrintControl **print_control) +{ + FIXME("iface %p, wic_factory %p, document_target %p, desc %p, print_control %p stub!\n", iface, wic_factory, + document_target, desc, print_control); + + return E_NOTIMPL; +} + +static void WINAPI d2d_device_SetMaximumTextureMemory(ID2D1Device *iface, UINT64 max_texture_memory) +{ + FIXME("iface %p, max_texture_memory %s stub!\n", iface, wine_dbgstr_longlong(max_texture_memory)); +} + +static UINT64 WINAPI d2d_device_GetMaximumTextureMemory(ID2D1Device *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static HRESULT WINAPI d2d_device_ClearResources(ID2D1Device *iface, UINT msec_since_use) +{ + FIXME("iface %p, msec_since_use %u stub!\n", iface, msec_since_use); + + return E_NOTIMPL; +} + +static const struct ID2D1DeviceVtbl d2d_device_vtbl = +{ + d2d_device_QueryInterface, + d2d_device_AddRef, + d2d_device_Release, + d2d_device_GetFactory, + d2d_device_CreateDeviceContext, + d2d_device_CreatePrintControl, + d2d_device_SetMaximumTextureMemory, + d2d_device_GetMaximumTextureMemory, + d2d_device_ClearResources, +}; + +void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *iface, IDXGIDevice *dxgi_device) +{ + device->ID2D1Device_iface.lpVtbl = &d2d_device_vtbl; + device->refcount = 1; + device->factory = iface; + ID2D1Factory1_AddRef(device->factory); + device->dxgi_device = dxgi_device; + IDXGIDevice_AddRef(device->dxgi_device); +} diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 9bacc8583c5..7810e957d4d 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -375,9 +375,19 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory1 static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDevice(ID2D1Factory1 *iface, IDXGIDevice *dxgi_device, ID2D1Device **device) { - FIXME("iface %p, dxgi_device %p, device %p stub!\n", iface, dxgi_device, device); + struct d2d_device *object; - return E_NOTIMPL; + TRACE("iface %p, dxgi_device %p, device %p.\n", iface, dxgi_device, device); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + d2d_device_init(object, iface, dxgi_device); + + TRACE("Create device %p.\n", object); + *device = &object->ID2D1Device_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory1 *iface, diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 1fbbb301dd4..2b1ef2e46ba 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -18,12 +18,22 @@ import "d2d1.idl"; -interface ID2D1Device; +interface ID2D1DeviceContext; interface ID2D1StrokeStyle1; interface ID2D1PathGeometry1; interface ID2D1DrawingStateBlock1; interface ID2D1GdiMetafile; interface ID2D1Properties; +interface IPrintDocumentPackageTarget; +interface ID2D1PrintControl; +interface IWICImagingFactory; + +typedef enum D2D1_DEVICE_CONTEXT_OPTIONS +{ + D2D1_DEVICE_CONTEXT_OPTIONS_NONE = 0x0, + D2D1_DEVICE_CONTEXT_OPTIONS_ENABLE_MULTITHREADED_OPTIMIZATIONS = 0x1, + D2D1_DEVICE_CONTEXT_OPTIONS_FORCE_DWORD = 0xffffffff, +} D2D1_DEVICE_CONTEXT_OPTIONS; typedef enum D2D1_STROKE_TRANSFORM_TYPE { @@ -50,6 +60,22 @@ typedef enum D2D1_UNIT_MODE D2D1_UNIT_MODE_FORCE_DWORD = 0xffffffff, } D2D1_UNIT_MODE; +typedef enum D2D1_PRINT_FONT_SUBSET_MODE +{ + D2D1_PRINT_FONT_SUBSET_MODE_DEFAULT = 0x0, + D2D1_PRINT_FONT_SUBSET_MODE_EACHPAGE = 0x1, + D2D1_PRINT_FONT_SUBSET_MODE_NONE = 0x2, + D2D1_PRINT_FONT_SUBSET_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_PRINT_FONT_SUBSET_MODE; + +typedef enum D2D1_COLOR_SPACE +{ + D2D1_COLOR_SPACE_CUSTOM = 0x0, + D2D1_COLOR_SPACE_SRGB = 0x1, + D2D1_COLOR_SPACE_SCRGB = 0x2, + D2D1_COLOR_SPACE_FORCE_DWORD = 0xffffffff, +} D2D1_COLOR_SPACE; + typedef struct D2D1_PROPERTY_BINDING D2D1_PROPERTY_BINDING; typedef struct D2D1_STROKE_STYLE_PROPERTIES1 @@ -75,10 +101,43 @@ typedef struct D2D1_DRAWING_STATE_DESCRIPTION1 D2D1_UNIT_MODE unitMode; } D2D1_DRAWING_STATE_DESCRIPTION1; +typedef struct D2D1_PRINT_CONTROL_PROPERTIES +{ + D2D1_PRINT_FONT_SUBSET_MODE fontSubset; + float rasterDPI; + D2D1_COLOR_SPACE colorSpace; +} D2D1_PRINT_CONTROL_PROPERTIES; + typedef HRESULT (__stdcall *PD2D1_EFFECT_FACTORY)(IUnknown **effect); [ object, + uuid(47dd575d-ac05-4cdd-8049-9b02cd16f44c), + local, +] +interface ID2D1Device : ID2D1Resource +{ + HRESULT CreateDeviceContext( + [in] D2D1_DEVICE_CONTEXT_OPTIONS options, + [out] ID2D1DeviceContext **context + ); + HRESULT CreatePrintControl( + [in] IWICImagingFactory *wic_factory, + [in] IPrintDocumentPackageTarget *document_target, + [in] const D2D1_PRINT_CONTROL_PROPERTIES *desc, + [out] ID2D1PrintControl **print_control + ); + void SetMaximumTextureMemory( + [in] UINT64 max_texture_memory + ); + UINT64 GetMaximumTextureMemory(); + HRESULT ClearResources( + [in, defaultvalue(0)] UINT msec_since_use + ); +} + +[ + object, uuid(bb12d362-daee-4b9a-aa1d-14ba401cfa1f), local, ] -- 2.11.0

1 0

[PATCH 1/2] comctl32/taskdialog: Add a helper to initialize dialog data.
by Nikolay Sivov 19 May '18

19 May '18

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index ba19ed51a6..644f60fbb8 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -533,6 +533,11 @@ static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, WORD EndDialog(dialog_info->hwnd, command_id); } +static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) +{ + dialog_info->hwnd = hwnd; +} + static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { static const WCHAR taskdialog_info_propnameW[] = {'T','a','s','k','D','i','a','l','o','g','I','n','f','o',0}; @@ -550,9 +555,10 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR break; case WM_INITDIALOG: dialog_info = (struct taskdialog_info *)lParam; - dialog_info->hwnd = hwnd; - SetPropW(hwnd, taskdialog_info_propnameW, dialog_info); + taskdialog_init(dialog_info, hwnd); + + SetPropW(hwnd, taskdialog_info_propnameW, dialog_info); taskdialog_notify(dialog_info, TDN_DIALOG_CONSTRUCTED, 0, 0); break; case WM_SHOWWINDOW: -- 2.17.0

1 1

[PATCH] comctl32/listview: Don't invalidate when new style is same as old
by Alex Henrie 18 May '18

18 May '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This fixes most of https://bugs.winehq.org/show_bug.cgi?id=44845 With this patch, the horizontal scrollbar is still shown when it should not be, but the installer doesn't get stuck in a loop. dlls/comctl32/listview.c | 8 +++++--- dlls/comctl32/tests/listview.c | 8 ++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index d63c23a659..200bf93be5 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11108,14 +11108,13 @@ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lpss) { - UINT uNewView = lpss->styleNew & LVS_TYPEMASK; - UINT uOldView = lpss->styleOld & LVS_TYPEMASK; + UINT uNewView, uOldView; UINT style; TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", wStyleType, lpss->styleOld, lpss->styleNew); - if (wStyleType != GWL_STYLE) return 0; + if (wStyleType != GWL_STYLE || lpss->styleNew == infoPtr->dwStyle) return 0; infoPtr->dwStyle = lpss->styleNew; @@ -11127,6 +11126,9 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, ((lpss->styleNew & WS_VSCROLL) == 0)) ShowScrollBar(infoPtr->hwndSelf, SB_VERT, FALSE); + uNewView = lpss->styleNew & LVS_TYPEMASK; + uOldView = lpss->styleOld & LVS_TYPEMASK; + if (uNewView != uOldView) { HIMAGELIST himl; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index c9a165c39c..c2d33c41f5 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1781,6 +1781,7 @@ static void test_redraw(void) HDC hdc; BOOL res; DWORD r; + RECT rect; hwnd = create_listview_control(LVS_REPORT); subclass_header(hwnd); @@ -1838,6 +1839,13 @@ static void test_redraw(void) ReleaseDC(hwndparent, hdc); + /* test setting the window style to what it already was */ + UpdateWindow(hwnd); + SetWindowLongA(hwnd, GWL_STYLE, GetWindowLongA(hwnd, GWL_STYLE)); + GetUpdateRect(hwnd, &rect, FALSE); + ok(rect.left == 0 && rect.top == 0 && rect.right == 0 && rect.bottom == 0, + "Expected empty update rect, got %s\n", wine_dbgstr_rect(&rect)); + DestroyWindow(hwnd); } -- 2.17.0

2 1

[PATCH] include/winuser.h: Add DOF_* definitions.
by Gijs Vermeulen 18 May '18

18 May '18

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- For compiling Windows File Manager (WinFile) with winelib. See https://bugs.winehq.org/show_bug.cgi?id=45026 and https://bugs.winehq.org/attachment.cgi?id=61206 include/winuser.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/winuser.h b/include/winuser.h index d0893a49c6..8e9e91bf65 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2158,6 +2158,13 @@ typedef struct tagDROPSTRUCT DWORD dwControlData; } DROPSTRUCT, *PDROPSTRUCT, *LPDROPSTRUCT; +#define DOF_EXECUTABLE 0x8001 +#define DOF_DOCUMENT 0x8002 +#define DOF_DIRECTORY 0x8003 +#define DOF_MULTIPLE 0x8004 +#define DOF_PROGMAN 0x0001 +#define DOF_SHELLDATA 0x0002 + /* modifiers for RegisterHotKey */ #define MOD_ALT 0x0001 #define MOD_CONTROL 0x0002 -- 2.13.6

1 0

[PATCH] winedbg: Use gdb's default handling of breakpoints.
by Zebediah Figura 18 May '18

18 May '18

We're essentially doing the same thing, so there's no reason not to leave the handling entirely to gdb. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- programs/winedbg/gdbproxy.c | 129 +------------------------------------------- 1 file changed, 2 insertions(+), 127 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 3909cb5..3ecf629 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -72,13 +72,6 @@ #define GDBPXY_TRC_WIN32_ERROR 0x20 #define GDBPXY_TRC_COMMAND_FIXME 0x80 -struct gdb_ctx_Xpoint -{ - enum be_xpoint_type type; /* (-1) == be_xpoint_free means free */ - void* addr; - unsigned long val; -}; - struct gdb_context { /* gdb information */ @@ -105,8 +98,6 @@ struct gdb_context CONTEXT context; /* Win32 information */ struct dbg_process* process; -#define NUM_XPOINT 32 - struct gdb_ctx_Xpoint Xpoints[NUM_XPOINT]; /* Unix environment */ unsigned long wine_segs[3]; /* load addresses of the ELF wine exec segments (text, bss and data) */ }; @@ -1570,28 +1561,6 @@ static enum packet_return packet_thread(struct gdb_context* gdbctx) } } -static BOOL read_memory(struct gdb_context *gdbctx, char *addr, char *buffer, SIZE_T blk_len, SIZE_T *r) -{ - /* Wrapper around process_io->read() that replaces values displaced by breakpoints. */ - - BOOL ret; - - ret = gdbctx->process->process_io->read(gdbctx->process->handle, addr, buffer, blk_len, r); - if (ret) - { - struct gdb_ctx_Xpoint *xpt; - - for (xpt = &gdbctx->Xpoints[NUM_XPOINT - 1]; xpt >= gdbctx->Xpoints; xpt--) - { - char *xpt_addr = xpt->addr; - - if (xpt->type != be_xpoint_free && xpt_addr >= addr && xpt_addr < addr + blk_len) - buffer[xpt_addr - addr] = xpt->val; - } - } - return ret; -} - static enum packet_return packet_read_memory(struct gdb_context* gdbctx) { char *addr; @@ -1608,7 +1577,8 @@ static enum packet_return packet_read_memory(struct gdb_context* gdbctx) for (nread = 0; nread < len; nread += r, addr += r) { blk_len = min(sizeof(buffer), len - nread); - if (!read_memory(gdbctx, addr, buffer, blk_len, &r) || r == 0) + if (!gdbctx->process->process_io->read(gdbctx->process->handle, addr, + buffer, blk_len, &r) || r == 0) { /* fail at first address, return error */ if (nread == 0) return packet_reply_error(gdbctx, EFAULT); @@ -2163,97 +2133,6 @@ static enum packet_return packet_thread_alive(struct gdb_context* gdbctx) return packet_reply_error(gdbctx, ESRCH); } -static enum packet_return packet_remove_breakpoint(struct gdb_context* gdbctx) -{ - void* addr; - unsigned len; - struct gdb_ctx_Xpoint* xpt; - enum be_xpoint_type t; - - /* FIXME: check packet_len */ - if (gdbctx->in_packet[0] < '0' || gdbctx->in_packet[0] > '4' || - gdbctx->in_packet[1] != ',' || - sscanf(gdbctx->in_packet + 2, "%p,%x", &addr, &len) != 2) - return packet_error; - if (gdbctx->trace & GDBPXY_TRC_COMMAND) - fprintf(stderr, "Remove bp %p[%u] typ=%c\n", - addr, len, gdbctx->in_packet[0]); - switch (gdbctx->in_packet[0]) - { - case '0': t = be_xpoint_break; len = 0; break; - case '1': t = be_xpoint_watch_exec; break; - case '2': t = be_xpoint_watch_read; break; - case '3': t = be_xpoint_watch_write; break; - default: return packet_error; - } - for (xpt = &gdbctx->Xpoints[NUM_XPOINT - 1]; xpt >= gdbctx->Xpoints; xpt--) - { - if (xpt->addr == addr && xpt->type == t) - { - if (be_cpu->remove_Xpoint(gdbctx->process->handle, - gdbctx->process->process_io, &gdbctx->context, - t, xpt->addr, xpt->val, len)) - { - xpt->type = be_xpoint_free; - return packet_ok; - } - break; - } - } - return packet_error; -} - -static enum packet_return packet_set_breakpoint(struct gdb_context* gdbctx) -{ - void* addr; - unsigned len; - struct gdb_ctx_Xpoint* xpt; - enum be_xpoint_type t; - - /* FIXME: check packet_len */ - if (gdbctx->in_packet[0] < '0' || gdbctx->in_packet[0] > '4' || - gdbctx->in_packet[1] != ',' || - sscanf(gdbctx->in_packet + 2, "%p,%x", &addr, &len) != 2) - return packet_error; - if (gdbctx->trace & GDBPXY_TRC_COMMAND) - fprintf(stderr, "Set bp %p[%u] typ=%c\n", - addr, len, gdbctx->in_packet[0]); - switch (gdbctx->in_packet[0]) - { - case '0': t = be_xpoint_break; len = 0; break; - case '1': t = be_xpoint_watch_exec; break; - case '2': t = be_xpoint_watch_read; break; - case '3': t = be_xpoint_watch_write; break; - default: return packet_error; - } - /* because of packet command handling, this should be made idempotent */ - for (xpt = &gdbctx->Xpoints[NUM_XPOINT - 1]; xpt >= gdbctx->Xpoints; xpt--) - { - if (xpt->addr == addr && xpt->type == t) - return packet_ok; /* nothing to do */ - } - /* really set the Xpoint */ - for (xpt = &gdbctx->Xpoints[NUM_XPOINT - 1]; xpt >= gdbctx->Xpoints; xpt--) - { - if (xpt->type == be_xpoint_free) - { - if (be_cpu->insert_Xpoint(gdbctx->process->handle, - gdbctx->process->process_io, &gdbctx->context, - t, addr, &xpt->val, len)) - { - xpt->addr = addr; - xpt->type = t; - return packet_ok; - } - fprintf(stderr, "cannot set xpoint\n"); - break; - } - } - /* no more entries... eech */ - fprintf(stderr, "Running out of spots for {break|watch}points\n"); - return packet_error; -} - /* =============================================== * * P A C K E T I N F R A S T R U C T U R E * * =============================================== * @@ -2287,8 +2166,6 @@ static struct packet_entry packet_entries[] = /*{'S', packet_step_signal}, hard(er) to implement */ {'T', packet_thread_alive}, {'v', packet_verbose}, - {'z', packet_remove_breakpoint}, - {'Z', packet_set_breakpoint}, }; static BOOL extract_packets(struct gdb_context* gdbctx) @@ -2578,8 +2455,6 @@ static BOOL gdb_init_context(struct gdb_context* gdbctx, unsigned flags, unsigne gdbctx->in_trap = FALSE; gdbctx->trace = /*GDBPXY_TRC_PACKET | GDBPXY_TRC_COMMAND |*/ GDBPXY_TRC_COMMAND_ERROR | GDBPXY_TRC_COMMAND_FIXME | GDBPXY_TRC_WIN32_EVENT; gdbctx->process = NULL; - for (i = 0; i < NUM_XPOINT; i++) - gdbctx->Xpoints[i].type = -1; for (i = 0; i < sizeof(gdbctx->wine_segs) / sizeof(gdbctx->wine_segs[0]); i++) gdbctx->wine_segs[i] = 0; -- 2.7.4

1 0