January 2016 - Wine-commits

Nikolay Sivov : shlwapi: Fix initializer causing compiler warning.
by Alexandre Julliard 09 Jan '16

09 Jan '16

Module: wine Branch: master Commit: 37cdf65949a22e53195520326a58a79a604ad2af URL: http://source.winehq.org/git/wine.git/?a=commit;h=37cdf65949a22e53195520326… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 7 17:09:47 2016 +0300 shlwapi: Fix initializer causing compiler warning. Spotted by Józef. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/stopwatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/stopwatch.c b/dlls/shlwapi/stopwatch.c index c7b4356..fcee075 100644 --- a/dlls/shlwapi/stopwatch.c +++ b/dlls/shlwapi/stopwatch.c @@ -190,7 +190,7 @@ void WINAPI StopWatch_MarkJavaStop(LPCWSTR lpszEvent, HWND hWnd, DWORD dwReserve */ DWORD WINAPI GetPerfTime(void) { - static LARGE_INTEGER iCounterFreq = { 0 }; + static LARGE_INTEGER iCounterFreq = { {0} }; LARGE_INTEGER iCounter; TRACE("()\n");

1 0

Nikolay Sivov : xaudio2: Add another missing break for consistency.
by Alexandre Julliard 09 Jan '16

09 Jan '16

Module: wine Branch: master Commit: f505f5fdebe5094988f26f052e6cae110dce2d16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f505f5fdebe5094988f26f052… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 7 18:20:25 2016 +0300 xaudio2: Add another missing break for consistency. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 1f5a91f..5f30432 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -465,6 +465,7 @@ static ALenum get_al_format(const WAVEFORMATEX *fmt) case 8: return AL_FORMAT_71CHN16; } + break; } }else if(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE &&

1 0

Jacek Caban : mshtml: Added IHTMLCurrentStyle:: styleFloat property implementation.
by Alexandre Julliard 09 Jan '16

09 Jan '16

Module: wine Branch: master Commit: fef68e1af918a06c3f450f19c2a57332bb19d7e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fef68e1af918a06c3f450f19c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 7 16:30:18 2016 +0100 mshtml: Added IHTMLCurrentStyle::styleFloat property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcurstyle.c | 6 ++++-- dlls/mshtml/tests/style.c | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 8e7a146..4257074 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -163,8 +163,10 @@ static HRESULT WINAPI HTMLCurrentStyle_get_position(IHTMLCurrentStyle *iface, BS static HRESULT WINAPI HTMLCurrentStyle_get_styleFloat(IHTMLCurrentStyle *iface, BSTR *p) { HTMLCurrentStyle *This = impl_from_IHTMLCurrentStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr(This->nsstyle, STYLEID_FLOAT, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_color(IHTMLCurrentStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 5d8e158..18905b1 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2899,6 +2899,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_textTransform failed: %08x\n", hres); SysFreeString(str); + hres = IHTMLCurrentStyle_get_styleFloat(current_style, &str); + ok(hres == S_OK, "get_styleFloat failed: %08x\n", hres); + ok(!strcmp_wa(str, "none"), "styleFloat = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + current_style2 = get_current_style2_iface((IUnknown*)current_style); b = 100;

1 0

Jacek Caban : mshtml: Added IHTMLDocument3::uniqueID implementation.
by Alexandre Julliard 09 Jan '16

09 Jan '16

Module: wine Branch: master Commit: 8f6097a99bacca0c241c29b54d8f8500b30a78c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6097a99bacca0c241c29b54… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 6 18:39:39 2016 +0100 mshtml: Added IHTMLDocument3::uniqueID implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 15 +++++++++++---- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 8e59e98..30236aa 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2018,11 +2018,18 @@ static HRESULT WINAPI HTMLDocument3_get_documentElement(IHTMLDocument3 *iface, I return hres; } -static HRESULT WINAPI HTMLDocument3_uniqueID(IHTMLDocument3 *iface, BSTR *p) +static HRESULT WINAPI HTMLDocument3_get_uniqueID(IHTMLDocument3 *iface, BSTR *p) { HTMLDocument *This = impl_from_IHTMLDocument3(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + WCHAR buf[32]; + + static const WCHAR formatW[] = {'m','s','_','_','i','d','%','u',0}; + + TRACE("(%p)->(%p)\n", This, p); + + sprintfW(buf, formatW, ++This->doc_node->unique_id); + *p = SysAllocString(buf); + return *p ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI HTMLDocument3_attachEvent(IHTMLDocument3 *iface, BSTR event, @@ -2428,7 +2435,7 @@ static const IHTMLDocument3Vtbl HTMLDocument3Vtbl = { HTMLDocument3_recalc, HTMLDocument3_createTextNode, HTMLDocument3_get_documentElement, - HTMLDocument3_uniqueID, + HTMLDocument3_get_uniqueID, HTMLDocument3_attachEvent, HTMLDocument3_detachEvent, HTMLDocument3_put_onrowsdelete, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c32824e..2b8fa82 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -776,6 +776,8 @@ struct HTMLDocumentNode { UINT charset; + unsigned unique_id; + struct list selection_list; struct list range_list; struct list plugin_hosts; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 1be81e5..e90fc70 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6208,6 +6208,35 @@ static void test_default_selection(IHTMLDocument2 *doc) IHTMLTxtRange_Release(range); } +static void test_unique_id(IHTMLDocument2 *doc) +{ + IHTMLDocument3 *doc3 = get_doc3_iface(doc); + BSTR id, id2; + HRESULT hres; + + static const WCHAR prefixW[] = {'m','s','_','_','i','d',0}; + + hres = IHTMLDocument3_get_uniqueID(doc3, &id); + ok(hres == S_OK, "get_uniqueID failed: %08x\n", hres); + ok(SysStringLen(id) >= sizeof(prefixW)/sizeof(*prefixW), "id %s too short\n", wine_dbgstr_w(id)); + + hres = IHTMLDocument3_get_uniqueID(doc3, &id2); + ok(hres == S_OK, "get_uniqueID failed: %08x\n", hres); + ok(SysStringLen(id2) >= sizeof(prefixW)/sizeof(*prefixW), "id %s too short\n", wine_dbgstr_w(id2)); + + ok(lstrcmpW(id, id2), "same unique ids %s\n", wine_dbgstr_w(id)); + + id[sizeof(prefixW)/sizeof(*prefixW)-1] = 0; + ok(!lstrcmpW(id, prefixW), "unexpected prefix %s\n", wine_dbgstr_w(id)); + id2[sizeof(prefixW)/sizeof(*prefixW)-1] = 0; + ok(!lstrcmpW(id2, prefixW), "unexpected prefix %s\n", wine_dbgstr_w(id2)); + + SysFreeString(id); + SysFreeString(id2); + + IHTMLDocument3_Release(doc3); +} + static void test_doc_elem(IHTMLDocument2 *doc) { IHTMLDocument2 *doc_node, *owner_doc; @@ -6244,6 +6273,8 @@ static void test_doc_elem(IHTMLDocument2 *doc) test_elem_client_rect((IUnknown*)elem); IHTMLElement_Release(elem); + + test_unique_id(doc); } static void test_default_body(IHTMLBodyElement *body)

1 0

Nikolay Sivov : dwrite/tests: Some tests for drawing underlines.
by Alexandre Julliard 09 Jan '16

09 Jan '16

Module: wine Branch: master Commit: f8a228d261ad6b54ec5b5909b167ccd30476e0d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8a228d261ad6b54ec5b5909b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 8 12:55:36 2016 +0300 dwrite/tests: Some tests for drawing underlines. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 72 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 68 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index f1534bf..888edb9 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1,7 +1,7 @@ /* * Text layout/format tests * - * Copyright 2012, 2014-2015 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2016 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -257,6 +257,7 @@ static const char *get_draw_kind_name(unsigned short kind) struct drawcall_entry { enum drawcall_kind kind; WCHAR string[10]; /* only meaningful for DrawGlyphRun() */ + WCHAR locale[LOCALE_NAME_MAX_LENGTH]; }; struct drawcall_sequence @@ -364,6 +365,18 @@ static void ok_sequence_(struct drawcall_sequence **seq, int sequence_index, ok_(file, line) (cmp == 0, "%s: glyphrun string %s was expected, but got %s instead\n", context, wine_dbgstr_w(expected->string), wine_dbgstr_w(actual->string)); } + else if ((expected->kind & DRAW_KINDS_MASK) == DRAW_UNDERLINE) { + int cmp = lstrcmpW(expected->locale, actual->locale); + if (cmp != 0 && todo) { + failcount++; + todo_wine + ok_(file, line) (0, "%s: underline locale %s was expected, but got %s instead\n", + context, wine_dbgstr_w(expected->locale), wine_dbgstr_w(actual->locale)); + } + else + ok_(file, line) (cmp == 0, "%s: underline locale %s was expected, but got %s instead\n", + context, wine_dbgstr_w(expected->locale), wine_dbgstr_w(actual->locale)); + } expected++; actual++; } @@ -536,6 +549,7 @@ static HRESULT WINAPI testrenderer_DrawUnderline(IDWriteTextRenderer *iface, entry.kind = DRAW_UNDERLINE; if (effect) entry.kind |= DRAW_EFFECT; + lstrcpyW(entry.locale, underline->localeName); add_call(sequences, RENDERER_ID, &entry); return S_OK; } @@ -1348,7 +1362,7 @@ static const struct drawcall_entry draw_seq[] = { { DRAW_GLYPHRUN|DRAW_EFFECT, {'n',0} }, { DRAW_GLYPHRUN, {'g',0} }, { DRAW_INLINE }, - { DRAW_UNDERLINE }, + { DRAW_UNDERLINE, {0}, {'r','u',0} }, { DRAW_STRIKETHROUGH }, { DRAW_LAST_KIND } }; @@ -4276,12 +4290,28 @@ static void test_SetOpticalAlignment(void) static const struct drawcall_entry drawunderline_seq[] = { { DRAW_GLYPHRUN, {'a','e',0x0300,0} }, /* reported runs can't mix different underline values */ { DRAW_GLYPHRUN, {'d',0} }, - { DRAW_UNDERLINE }, + { DRAW_UNDERLINE, {0}, {'e','n','-','u','s',0} }, + { DRAW_LAST_KIND } +}; + +static const struct drawcall_entry drawunderline2_seq[] = { + { DRAW_GLYPHRUN, {'a',0} }, + { DRAW_GLYPHRUN, {'e',0} }, + { DRAW_UNDERLINE, {0}, {'e','n','-','u','s',0} }, + { DRAW_LAST_KIND } +}; + +static const struct drawcall_entry drawunderline3_seq[] = { + { DRAW_GLYPHRUN, {'a',0} }, + { DRAW_GLYPHRUN, {'e',0} }, + { DRAW_UNDERLINE, {0}, {'e','n','-','c','a',0} }, + { DRAW_UNDERLINE, {0}, {'e','n','-','u','s',0} }, { DRAW_LAST_KIND } }; static void test_SetUnderline(void) { + static const WCHAR encaW[] = {'e','n','-','C','A',0}; static const WCHAR strW[] = {'a','e',0x0300,'d',0}; /* accent grave */ DWRITE_CLUSTER_METRICS clusters[4]; IDWriteTextFormat *format; @@ -4299,7 +4329,6 @@ static void test_SetUnderline(void) hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); - IDWriteTextFormat_Release(format); count = 0; hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, sizeof(clusters)/sizeof(clusters[0]), &count); @@ -4324,6 +4353,41 @@ todo_wine ok_sequence(sequences, RENDERER_ID, drawunderline_seq, "draw underline test", TRUE); IDWriteTextLayout_Release(layout); + + /* 2 characters, same font, significantly different font size. Set underline for both, see how many + underline drawing calls is there. */ + hr = IDWriteFactory_CreateTextLayout(factory, strW, 2, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + range.startPosition = 0; + range.length = 2; + hr = IDWriteTextLayout_SetUnderline(layout, TRUE, range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + range.startPosition = 0; + range.length = 1; + hr = IDWriteTextLayout_SetFontSize(layout, 100.0f, range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + flush_sequence(sequences, RENDERER_ID); + hr = IDWriteTextLayout_Draw(layout, NULL, &testrenderer, 0.0f, 0.0f); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok_sequence(sequences, RENDERER_ID, drawunderline2_seq, "draw underline test 2", TRUE); + + /* now set different locale for second char, draw again */ + range.startPosition = 0; + range.length = 1; + hr = IDWriteTextLayout_SetLocaleName(layout, encaW, range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + flush_sequence(sequences, RENDERER_ID); + hr = IDWriteTextLayout_Draw(layout, NULL, &testrenderer, 0.0f, 0.0f); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok_sequence(sequences, RENDERER_ID, drawunderline3_seq, "draw underline test 2", TRUE); + + IDWriteTextLayout_Release(layout); + + IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Store locale name in lower case for text format.
by Alexandre Julliard 09 Jan '16

09 Jan '16

Module: wine Branch: master Commit: b1094bc7d7c9c22118b8fd07ffad85b79bec0dc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1094bc7d7c9c22118b8fd07f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 8 12:55:37 2016 +0300 dwrite: Store locale name in lower case for text format. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 8 +++++++- dlls/dwrite/tests/layout.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index ef8d8bf..d4b3557 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1,7 +1,7 @@ /* * Text format and layout * - * Copyright 2012, 2014-2015 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2016 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -3923,7 +3923,11 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I layout->format.locale = heap_strdupW(textformat->format.locale); layout->format.family_name = heap_strdupW(textformat->format.family_name); if (!layout->format.locale || !layout->format.family_name) + { + heap_free(layout->format.locale); + heap_free(layout->format.family_name); return E_OUTOFMEMORY; + } if (layout->format.trimmingsign) IDWriteInlineObject_AddRef(layout->format.trimmingsign); @@ -4662,6 +4666,8 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle This->format.family_len = strlenW(family_name); This->format.locale = heap_strdupW(locale); This->format.locale_len = strlenW(locale); + /* force locale name to lower case, layout will inherit this modified value */ + strlwrW(This->format.locale); This->format.weight = weight; This->format.style = style; This->format.fontsize = size; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 888edb9..bb5963f 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1999,7 +1999,7 @@ static void test_SetLocaleName(void) static const WCHAR eNuSW[] = {'e','N','-','u','S',0}; static const WCHAR strW[] = {'a','b','c','d',0}; WCHAR buffW[LOCALE_NAME_MAX_LENGTH+sizeof(strW)/sizeof(WCHAR)]; - IDWriteTextFormat *format; + IDWriteTextFormat *format, *format2; IDWriteTextLayout *layout; DWRITE_TEXT_RANGE range; IDWriteFactory *factory; @@ -2007,6 +2007,33 @@ static void test_SetLocaleName(void) factory = create_factory(); + /* create format with mixed case locale name, get it back */ + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, eNuSW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextFormat_GetLocaleName(format, buffW, sizeof(buffW)/sizeof(buffW[0])); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW)); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextFormat, (void**)&format2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextFormat_GetLocaleName(format2, buffW, sizeof(buffW)/sizeof(buffW[0])); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW)); + + hr = IDWriteTextLayout_GetLocaleName(layout, 0, buffW, sizeof(buffW)/sizeof(buffW[0]), NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW)); + + IDWriteTextFormat_Release(format2); + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Józef Kucia : include: Add declarations for D3DUSAGEs added with d3d9ex.
by Alexandre Julliard 09 Jan '16

09 Jan '16

Module: wine Branch: master Commit: 391734702f4947937f5e1681f7e790951ed3cf53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=391734702f4947937f5e1681f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 7 16:22:44 2016 +0100 include: Add declarations for D3DUSAGEs added with d3d9ex. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d9types.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/d3d9types.h b/include/d3d9types.h index cec42ec..8ebedcc 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -113,6 +113,14 @@ #define D3DUSAGE_AUTOGENMIPMAP __MSABI_LONG(0x00000400) #define D3DUSAGE_DMAP __MSABI_LONG(0x00004000) +/* Parts added with d3d9ex */ +#if !defined(D3D_DISABLE_9EX) +#define D3DUSAGE_RESTRICTED_CONTENT __MSABI_LONG(0x00000800) +#define D3DUSAGE_RESTRICT_SHARED_RESOURCE_DRIVER __MSABI_LONG(0x00001000) +#define D3DUSAGE_RESTRICT_SHARED_RESOURCE __MSABI_LONG(0x00002000) +#define D3DUSAGE_TEXTAPI __MSABI_LONG(0x10000000) +#endif /* D3D_DISABLE_9EX */ + #define D3DUSAGE_QUERY_FILTER __MSABI_LONG(0x00020000) #define D3DUSAGE_QUERY_LEGACYBUMPMAP __MSABI_LONG(0x00008000) #define D3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING __MSABI_LONG(0x00080000)

1 0

Józef Kucia : d3d9: Implement d3d9_device_CreateDepthStencilSurfaceEx().
by Alexandre Julliard 09 Jan '16

09 Jan '16

Module: wine Branch: master Commit: 89c6a755c4c752558b8d3bf3ba3883d8d3ab4cbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=89c6a755c4c752558b8d3bf3b… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Jan 7 16:22:45 2016 +0100 d3d9: Implement d3d9_device_CreateDepthStencilSurfaceEx(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 294e680..ef019b1 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3352,16 +3352,28 @@ static HRESULT WINAPI d3d9_device_CreateDepthStencilSurfaceEx(IDirect3DDevice9Ex UINT width, UINT height, D3DFORMAT format, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL discard, IDirect3DSurface9 **surface, HANDLE *shared_handle, DWORD usage) { - FIXME("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u,\n" - "discard %#x, surface %p, shared_handle %p, usage %#x stub!\n", + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + DWORD flags = WINED3D_SURFACE_MAPPABLE; + + TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u, " + "discard %#x, surface %p, shared_handle %p, usage %#x.\n", iface, width, height, format, multisample_type, multisample_quality, discard, surface, shared_handle, usage); - *surface = NULL; + if (usage & D3DUSAGE_DEPTHSTENCIL) + { + WARN("Invalid usage %#x.\n", usage); + return D3DERR_INVALIDCALL; + } + if (shared_handle) FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); - return E_NOTIMPL; + if (discard) + flags |= WINED3D_SURFACE_DISCARD; + + return d3d9_device_create_surface(device, width, height, format, flags, surface, + D3DUSAGE_DEPTHSTENCIL | usage, D3DPOOL_DEFAULT, multisample_type, multisample_quality, NULL); } static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_ResetEx(IDirect3DDevice9Ex *iface,

1 0

Józef Kucia : d3d9/tests: Add test for CreateDepthStencilSurfaceEx().
by Alexandre Julliard 09 Jan '16

09 Jan '16

Module: wine Branch: master Commit: 38d2d462df799b54a3fae80838b4984563a1e5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d2d462df799b54a3fae8083… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 7 16:22:46 2016 +0100 d3d9/tests: Add test for CreateDepthStencilSurfaceEx(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 151db41..e1ca770 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -42,6 +42,11 @@ struct device_desc DWORD flags; }; +static BOOL adapter_is_warp(const D3DADAPTER_IDENTIFIER9 *identifier) +{ + return !strcmp(identifier->Driver, "d3d10warp.dll"); +} + static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) { unsigned int i; @@ -644,6 +649,81 @@ out: IDirect3D9Ex_Release(d3d9ex); } +static void test_create_depth_stencil_surface_ex(void) +{ + static const struct + { + DWORD usage; + HRESULT hr; + BOOL broken_warp; + } + tests[] = + { + {0, D3D_OK, FALSE}, + {D3DUSAGE_DEPTHSTENCIL, D3DERR_INVALIDCALL, FALSE}, + {D3DUSAGE_RESTRICTED_CONTENT, D3D_OK, TRUE}, + }; + + D3DADAPTER_IDENTIFIER9 identifier; + D3DSURFACE_DESC surface_desc; + IDirect3DDevice9Ex *device; + IDirect3DSurface9 *surface; + IDirect3D9 *d3d; + unsigned int i; + HWND window; + HRESULT hr; + ULONG ref; + BOOL warp; + + window = create_window(); + + if (!(device = create_device(window, NULL))) + { + skip("Failed to create a D3D device.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9Ex_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D9, hr %#x.\n", hr); + hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + warp = adapter_is_warp(&identifier); + IDirect3D9_Release(d3d); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + surface = (IDirect3DSurface9 *)0xdeadbeef; + hr = IDirect3DDevice9Ex_CreateDepthStencilSurfaceEx(device, 64, 64, D3DFMT_D24S8, + D3DMULTISAMPLE_NONE, 0, TRUE, &surface, NULL, tests[i].usage); + ok(hr == tests[i].hr || broken(warp && tests[i].broken_warp), + "Test %u: Got unexpected hr %#x.\n", i, hr); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface9_GetDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Test %u: GetDesc failed, hr %#x.\n", i, hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Test %u: Got unexpected type %#x.\n", + i, surface_desc.Type); + ok(surface_desc.Pool == D3DPOOL_DEFAULT, "Test %u: Got unexpected pool %#x.\n", + i, surface_desc.Pool); + ok(surface_desc.Usage == (tests[i].usage | D3DUSAGE_DEPTHSTENCIL), + "Test %u: Got unexpected usage %#x.\n", i, surface_desc.Usage); + + ref = IDirect3DSurface9_Release(surface); + ok(!ref, "Test %u: Surface has %u references left.\n", i, ref); + } + else + { + ok(surface == (IDirect3DSurface9 *)0xdeadbeef || broken(warp && tests[i].broken_warp), + "Test %u: Got unexpected surface pointer %p.\n", i, surface); + } + } + + ref = IDirect3DDevice9Ex_Release(device); + ok(!ref, "Device has %u references left.\n", ref); + DestroyWindow(window); +} + static void test_user_memory(void) { static const struct @@ -3078,6 +3158,7 @@ START_TEST(d3d9ex) test_swapchain_get_displaymode_ex(); test_get_adapter_luid(); test_get_adapter_displaymode_ex(); + test_create_depth_stencil_surface_ex(); test_user_memory(); test_reset(); test_reset_resources();

1 0

Józef Kucia : d3d9/tests: Add missing space to trace( ) message.
by Alexandre Julliard 09 Jan '16

09 Jan '16

Module: wine Branch: master Commit: 810423960d14f197f936379605ba244a67a228bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=810423960d14f197f93637960… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 7 16:22:47 2016 +0100 d3d9/tests: Add missing space to trace() message. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index e1ca770..99ba823 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -622,7 +622,7 @@ static void test_get_adapter_displaymode_ex(void) todo_wine ok(S2(U1(startmode)).dmDisplayOrientation == DMDO_180 && rotation == D3DDISPLAYROTATION_180, "rotation is %d instead of %d\n", rotation, S2(U1(startmode)).dmDisplayOrientation); - trace("GetAdapterDisplayModeEx returned Width = %d,Height = %d, RefreshRate = %d, Format = %x, ScanLineOrdering = %x, rotation = %d\n", + trace("GetAdapterDisplayModeEx returned Width = %d, Height = %d, RefreshRate = %d, Format = %x, ScanLineOrdering = %x, rotation = %d\n", mode_ex.Width, mode_ex.Height, mode_ex.RefreshRate, mode_ex.Format, mode_ex.ScanLineOrdering, rotation); /* test GetAdapterDisplayModeEx with null pointer for D3DDISPLAYROTATION */

1 0