April 2016 - Wine-Commits - list.winehq.org

Vincent Povirk : gdiplus: Add test for creating a metafile with NULL frameRect.
by Alexandre Julliard April 7, 2016

April 7, 2016

Module: wine Branch: master Commit: 1e67fcce9d99bb427f2154c7dd490dd89c0e9fae URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e67fcce9d99bb427f2154c7d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 6 14:36:56 2016 -0500 gdiplus: Add test for creating a metafile with NULL frameRect. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 112 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 086a261..932fe1c 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -862,6 +862,117 @@ static void test_fillrect(void) expect(Ok, stat); } +static void test_nullframerect(void) { + GpStatus stat; + GpMetafile *metafile; + GpGraphics *graphics; + HDC hdc, metafile_dc; + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + GpBrush *brush; + HBRUSH hbrush, holdbrush; + GpRectF bounds; + GpUnit unit; + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, NULL, MetafileFrameUnitPixel, description, &metafile); + todo_wine expect(Ok, stat); + + DeleteDC(hdc); + + if (stat != Ok) + return; + + stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); + expect(Ok, stat); + expect(UnitPixel, unit); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf(1.0, bounds.Width); + expectf(1.0, bounds.Height); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipCreateSolidFill((ARGB)0xff0000ff, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangleI(graphics, brush, 25, 25, 75, 75); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); + expect(Ok, stat); + expect(UnitPixel, unit); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf(1.0, bounds.Width); + expectf(1.0, bounds.Height); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); + expect(Ok, stat); + expect(UnitPixel, unit); + expectf_(25.0, bounds.X, 0.05); + expectf_(25.0, bounds.Y, 0.05); + expectf_(75.0, bounds.Width, 0.05); + expectf_(75.0, bounds.Height, 0.05); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, NULL, MetafileFrameUnitMillimeter, description, &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipGetDC(graphics, &metafile_dc); + expect(Ok, stat); + + if (stat != Ok) + { + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)metafile); + return; + } + + hbrush = CreateSolidBrush(0xff0000); + + holdbrush = SelectObject(metafile_dc, hbrush); + + Rectangle(metafile_dc, 25, 25, 75, 75); + + SelectObject(metafile_dc, holdbrush); + + DeleteObject(hbrush); + + stat = GdipReleaseDC(graphics, metafile_dc); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); + expect(Ok, stat); + expect(UnitPixel, unit); + expectf_(25.0, bounds.X, 0.05); + expectf_(25.0, bounds.Y, 0.05); + expectf_(50.0, bounds.Width, 0.05); + expectf_(50.0, bounds.Height, 0.05); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + static const emfplus_record pagetransform_records[] = { {0, EMR_HEADER}, {0, EmfPlusRecordTypeHeader}, @@ -1226,6 +1337,7 @@ START_TEST(metafile) test_getdc(); test_emfonly(); test_fillrect(); + test_nullframerect(); test_pagetransform(); test_converttoemfplus(); test_frameunit();

1 0

Vincent Povirk : gdiplus: Fix bounds of recorded Metafile objects.
by Alexandre Julliard April 7, 2016

April 7, 2016

Module: wine Branch: master Commit: 18e65a95a7e294af04a62696a8181a72860c561f URL: http://source.winehq.org/git/wine.git/?a=commit;h=18e65a95a7e294af04a62696a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 6 14:36:55 2016 -0500 gdiplus: Fix bounds of recorded Metafile objects. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 19 +++++++++++-- dlls/gdiplus/tests/metafile.c | 63 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 922c101..79bf5c3 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -260,8 +260,9 @@ GpStatus WINGDIPAPI GdipRecordMetafile(HDC hdc, EmfType type, GDIPCONST GpRectF (*metafile)->image.palette = NULL; (*metafile)->image.xres = dpix; (*metafile)->image.yres = dpiy; - (*metafile)->bounds = *frameRect; - (*metafile)->unit = frameUnit; + (*metafile)->bounds.X = (*metafile)->bounds.Y = 0.0; + (*metafile)->bounds.Width = (*metafile)->bounds.Height = 1.0; + (*metafile)->unit = UnitPixel; (*metafile)->metafile_type = type; (*metafile)->record_dc = record_dc; (*metafile)->comment_data = NULL; @@ -471,6 +472,20 @@ GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) metafile->comment_data = NULL; metafile->comment_data_size = 0; + if (stat == Ok) + { + MetafileHeader header; + + stat = GdipGetMetafileHeaderFromEmf(metafile->hemf, &header); + if (stat == Ok) + { + metafile->bounds.X = header.X; + metafile->bounds.Y = header.Y; + metafile->bounds.Width = header.Width; + metafile->bounds.Height = header.Height; + } + } + return stat; } diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 0c52718..086a261 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -1141,6 +1141,68 @@ static void test_converttoemfplus(void) expect(Ok, stat); } +static void test_frameunit(void) +{ + GpStatus stat; + GpMetafile *metafile; + GpGraphics *graphics; + HDC hdc; + static const GpRectF frame = {0.0, 0.0, 5.0, 5.0}; + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + GpUnit unit; + REAL dpix, dpiy; + GpRectF bounds; + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitInch, description, &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + + if (stat != Ok) + return; + + stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); + expect(Ok, stat); + expect(UnitPixel, unit); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf(1.0, bounds.Width); + expectf(1.0, bounds.Height); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); + expect(Ok, stat); + expect(UnitPixel, unit); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf(1.0, bounds.Width); + expectf(1.0, bounds.Height); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipGetImageHorizontalResolution((GpImage*)metafile, &dpix); + expect(Ok, stat); + + stat = GdipGetImageVerticalResolution((GpImage*)metafile, &dpiy); + expect(Ok, stat); + + stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); + expect(Ok, stat); + expect(UnitPixel, unit); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf_(5.0 * dpix, bounds.Width, 1.0); + expectf_(5.0 * dpiy, bounds.Height, 1.0); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1166,6 +1228,7 @@ START_TEST(metafile) test_fillrect(); test_pagetransform(); test_converttoemfplus(); + test_frameunit(); GdiplusShutdown(gdiplusToken); }

1 0

Jacek Caban : mshtml: Added more IHTMLXMLHttpRequst::send tests.
by Alexandre Julliard April 7, 2016

April 7, 2016

Module: wine Branch: master Commit: 8c00ee2ac69b44d082023d3af9e477a08ec60ccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c00ee2ac69b44d082023d3af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 7 15:33:44 2016 +0200 mshtml: Added more IHTMLXMLHttpRequst::send tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/xmlhttprequest.c | 143 ++++++++++++++++++++++++++----------- 1 file changed, 100 insertions(+), 43 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index e1c2ef1..df5d644 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -573,6 +573,47 @@ static void test_responseXML(const char *expect_text) IDispatch_Release(disp); } +#define xhr_open(a,b) _xhr_open(__LINE__,a,b) +static HRESULT _xhr_open(unsigned line, const char *url_a, const char *method_a) +{ + BSTR method = a2bstr(method_a); + BSTR url = a2bstr(url_a); + VARIANT async, empty; + HRESULT hres; + + V_VT(&async) = VT_BOOL; + V_BOOL(&async) = VARIANT_TRUE; + V_VT(&empty) = VT_EMPTY; + + hres = IHTMLXMLHttpRequest_open(xhr, method, url, async, empty, empty); + ok_(__FILE__,line)(hres == S_OK, "open failed: %08x\n", hres); + + SysFreeString(method); + SysFreeString(url); + return hres; +} + +#define test_response_text(a) _test_response_text(__LINE__,a) +static void _test_response_text(unsigned line, const char *expect_text) +{ + BSTR text = NULL; + HRESULT hres; + + hres = IHTMLXMLHttpRequest_get_responseText(xhr, &text); + ok(hres == S_OK, "get_responseText failed: %08x\n", hres); + ok(text != NULL, "test == NULL\n"); + if(expect_text) { + unsigned len; + /* Some recent version of IE strip trailing '\n' from post.php response, while others don't. */ + len = SysStringLen(text); + if(text[len-1] == '\n') + text[len-1] = 0; + ok_(__FILE__,line)(!strcmp_wa(text, expect_text), "expect %s, got %s\n", + expect_text, wine_dbgstr_w(text)); + } + SysFreeString(text); +} + static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char *expect_text) { VARIANT vbool, vempty, var; @@ -725,14 +766,7 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char * ok(hres == S_OK, "get_readyState failed: %08x\n", hres); ok(val == 4, "Expect DONE, got %d\n", val); - hres = IHTMLXMLHttpRequest_get_responseText(xhr, &text); - ok(hres == S_OK, "get_responseText failed: %08x\n", hres); - ok(text != NULL, "test == NULL\n"); - if(expect_text) - ok(!strcmp_wa(text, expect_text), "expect %s, got %s\n", - expect_text, wine_dbgstr_w(text)); - SysFreeString(text); - + test_response_text(expect_text); test_responseXML(expect_text); IHTMLXMLHttpRequest_Release(xhr); @@ -741,8 +775,7 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char * static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const char *expect_text) { - VARIANT vbool, vempty, var; - BSTR method, url; + VARIANT var, vempty; BSTR text; LONG val; HRESULT hres; @@ -804,20 +837,10 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const char ok(hres == S_OK, "get_readyState failed: %08x\n", hres); ok(val == 0, "Expect UNSENT, got %d\n", val); - method = a2bstr("GET"); - url = a2bstr(xml_url); - V_VT(&vbool) = VT_BOOL; - V_BOOL(&vbool) = VARIANT_TRUE; - V_VT(&vempty) = VT_EMPTY; - SET_EXPECT(xmlhttprequest_onreadystatechange_opened); - hres = IHTMLXMLHttpRequest_open(xhr, method, url, vbool, vempty, vempty); - ok(hres == S_OK, "open failed: %08x\n", hres); + hres = xhr_open(xml_url, "GET"); CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); - SysFreeString(method); - SysFreeString(url); - if(FAILED(hres)) { IHTMLXMLHttpRequest_Release(xhr); xhr = NULL; @@ -855,6 +878,7 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const char SET_EXPECT(xmlhttprequest_onreadystatechange_loading); SET_EXPECT(xmlhttprequest_onreadystatechange_done); loading_cnt = 0; + V_VT(&vempty) = VT_EMPTY; hres = IHTMLXMLHttpRequest_send(xhr, vempty); ok(hres == S_OK, "send failed: %08x\n", hres); @@ -900,15 +924,7 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const char ok(hres == S_OK, "get_readyState failed: %08x\n", hres); ok(val == 4, "Expect DONE, got %d\n", val); - text = NULL; - hres = IHTMLXMLHttpRequest_get_responseText(xhr, &text); - ok(hres == S_OK, "get_responseText failed: %08x\n", hres); - ok(text != NULL, "test == NULL\n"); - if(expect_text) - ok(!strcmp_wa(text, expect_text), "expect %s, got %s\n", - expect_text, wine_dbgstr_w(text)); - SysFreeString(text); - + test_response_text(expect_text); test_responseXML(expect_text); IHTMLXMLHttpRequest_Release(xhr); @@ -917,15 +933,10 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const char static void test_async_xhr_abort(IHTMLDocument2 *doc, const char *xml_url) { - VARIANT vbool, vempty, var; - BSTR method, url; + VARIANT vempty, var; LONG val; HRESULT hres; - method = a2bstr("GET"); - url = a2bstr(xml_url); - V_VT(&vbool) = VT_BOOL; - V_BOOL(&vbool) = VARIANT_TRUE; V_VT(&vempty) = VT_EMPTY; trace("abort before send() is fired\n"); @@ -938,8 +949,7 @@ static void test_async_xhr_abort(IHTMLDocument2 *doc, const char *xml_url) hres = IHTMLXMLHttpRequest_put_onreadystatechange(xhr, var); SET_EXPECT(xmlhttprequest_onreadystatechange_opened); - hres = IHTMLXMLHttpRequest_open(xhr, method, url, vbool, vempty, vempty); - ok(hres == S_OK, "open failed: %08x\n", hres); + xhr_open(xml_url, "GET"); CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); hres = IHTMLXMLHttpRequest_abort(xhr); @@ -963,8 +973,7 @@ static void test_async_xhr_abort(IHTMLDocument2 *doc, const char *xml_url) hres = IHTMLXMLHttpRequest_put_onreadystatechange(xhr, var); SET_EXPECT(xmlhttprequest_onreadystatechange_opened); - hres = IHTMLXMLHttpRequest_open(xhr, method, url, vbool, vempty, vempty); - ok(hres == S_OK, "open failed: %08x\n", hres); + xhr_open(xml_url, "GET"); CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); loading_cnt = 0; @@ -992,9 +1001,56 @@ static void test_async_xhr_abort(IHTMLDocument2 *doc, const char *xml_url) IHTMLXMLHttpRequest_Release(xhr); xhr = NULL; +} - SysFreeString(method); - SysFreeString(url); +static void test_xhr_post(IHTMLDocument2 *doc) +{ + VARIANT v; + HRESULT hres; + + trace("send string...\n"); + + create_xmlhttprequest(doc); + if(!xhr) + return; + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&xmlhttprequest_onreadystatechange_obj; + hres = IHTMLXMLHttpRequest_put_onreadystatechange(xhr, v); + ok(hres == S_OK, "put_onreadystatechange failed: %08x\n", hres); + + SET_EXPECT(xmlhttprequest_onreadystatechange_opened); + xhr_open("http://test.winehq.org/tests/post.php", "POST"); + CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); + + set_request_header(xhr, "Content-Type", "application/x-www-form-urlencoded"); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("X=Testing"); + + loading_cnt = 0; + SET_EXPECT(xmlhttprequest_onreadystatechange_opened); + SET_EXPECT(xmlhttprequest_onreadystatechange_headers_received); + SET_EXPECT(xmlhttprequest_onreadystatechange_loading); + SET_EXPECT(xmlhttprequest_onreadystatechange_done); + + hres = IHTMLXMLHttpRequest_send(xhr, v); + ok(hres == S_OK, "send failed: %08x\n", hres); + if(SUCCEEDED(hres)) + pump_msgs(&called_xmlhttprequest_onreadystatechange_done); + + todo_wine CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); + CHECK_CALLED(xmlhttprequest_onreadystatechange_headers_received); + CHECK_CALLED(xmlhttprequest_onreadystatechange_loading); + CHECK_CALLED(xmlhttprequest_onreadystatechange_done); + ok(loading_cnt == 1, "loading_cnt = %d\n", loading_cnt); + + SysFreeString(V_BSTR(&v)); + + test_response_text("X => Testing"); + + IHTMLXMLHttpRequest_Release(xhr); + xhr = NULL; } static IHTMLDocument2 *create_doc_from_url(const char *start_url) @@ -1045,7 +1101,7 @@ START_TEST(xmlhttprequest) static const char start_url[] = "http://test.winehq.org/tests/hello.html"; static const char xml_url[] = "http://test.winehq.org/tests/xmltest.xml"; static const char large_page_url[] = "http://test.winehq.org/tests/data.php"; - static const char expect_response_text[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<a>TEST</a>\n"; + static const char expect_response_text[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<a>TEST</a>"; CoInitialize(NULL); @@ -1057,6 +1113,7 @@ START_TEST(xmlhttprequest) test_async_xhr(doc, xml_url, expect_response_text); test_async_xhr(doc, large_page_url, NULL); test_async_xhr_abort(doc, large_page_url); + test_xhr_post(doc); IHTMLDocument2_Release(doc); } SysFreeString(content_type);

1 0

Jacek Caban : mshtml: Added support for sending BSTR over IHTMLXMLHttpRequst::send.
by Alexandre Julliard April 7, 2016

April 7, 2016

Module: wine Branch: master Commit: 5ae224dee81fcf4bb5ee76cf0980ac197c6748fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ae224dee81fcf4bb5ee76cf0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 7 15:33:34 2016 +0200 mshtml: Added support for sending BSTR over IHTMLXMLHttpRequst::send. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/xmlhttprequest.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index d55570c..ada3b20 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -524,22 +524,37 @@ static HRESULT WINAPI HTMLXMLHttpRequest_open(IHTMLXMLHttpRequest *iface, BSTR b static HRESULT WINAPI HTMLXMLHttpRequest_send(IHTMLXMLHttpRequest *iface, VARIANT varBody) { HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface); - nsresult nsres; + nsIWritableVariant *nsbody = NULL; + nsresult nsres = NS_OK; TRACE("(%p)->(%s)\n", This, debugstr_variant(&varBody)); switch(V_VT(&varBody)) { - case VT_NULL: - case VT_EMPTY: - case VT_ERROR: - break; - default: - FIXME("varBody(%s) unsupported\n", debugstr_variant(&varBody)); - return E_FAIL; - } + case VT_NULL: + case VT_EMPTY: + case VT_ERROR: + break; + case VT_BSTR: { + nsAString nsstr; + + nsbody = create_nsvariant(); + if(!nsbody) + return E_OUTOFMEMORY; - nsres = nsIXMLHttpRequest_Send(This->nsxhr, NULL); + nsAString_InitDepend(&nsstr, V_BSTR(&varBody)); + nsres = nsIWritableVariant_SetAsAString(nsbody, &nsstr); + nsAString_Finish(&nsstr); + break; + } + default: + FIXME("unsupported body type %s\n", debugstr_variant(&varBody)); + return E_NOTIMPL; + } + if(NS_SUCCEEDED(nsres)) + nsres = nsIXMLHttpRequest_Send(This->nsxhr, (nsIVariant*)nsbody); + if(nsbody) + nsIWritableVariant_Release(nsbody); if(NS_FAILED(nsres)) { ERR("nsIXMLHttpRequest_Send failed: %08x\n", nsres); return E_FAIL;

1 0

Daniel Lehman : msvcr120: Add remainder.
by Alexandre Julliard April 7, 2016

April 7, 2016

Module: wine Branch: master Commit: d9a0c55e7eb6ea9cb822260decef4a49d425c6a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9a0c55e7eb6ea9cb822260de… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Apr 5 12:53:12 2016 -0700 msvcr120: Add remainder. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 2 + .../api-ms-win-crt-math-l1-1-0.spec | 6 +-- dlls/msvcr120/msvcr120.spec | 6 +-- dlls/msvcr120/tests/msvcr120.c | 48 ++++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 6 +-- dlls/msvcrt/math.c | 40 ++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 +-- include/config.h.in | 6 +++ 9 files changed, 110 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 0547967..223d5c6 100755 --- a/configure +++ b/configure @@ -16876,6 +16876,8 @@ for ac_func in \ lrintf \ lround \ lroundf \ + remainder \ + remainderf \ rint \ rintf \ round \ diff --git a/configure.ac b/configure.ac index 20478df..6189aa9 100644 --- a/configure.ac +++ b/configure.ac @@ -2534,6 +2534,8 @@ AC_CHECK_FUNCS(\ lrintf \ lround \ lroundf \ + remainder \ + remainderf \ rint \ rintf \ round \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 2809b66..f752c83 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -304,9 +304,9 @@ @ stub norml @ cdecl pow(double double) ucrtbase.pow @ cdecl -arch=arm,x86_64 powf(float float) ucrtbase.powf -@ stub remainder -@ stub remainderf -@ stub remainderl +@ cdecl remainder(double double) ucrtbase.remainder +@ cdecl remainderf(float float) ucrtbase.remainderf +@ cdecl remainderl(double double) ucrtbase.remainderl @ stub remquo @ stub remquof @ stub remquol diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 58d04e1..ad9749a 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2324,9 +2324,9 @@ @ cdecl rand() MSVCRT_rand @ cdecl rand_s(ptr) MSVCRT_rand_s @ cdecl realloc(ptr long) MSVCRT_realloc -@ stub remainder -@ stub remainderf -@ stub remainderl +@ cdecl remainder(double double) MSVCR120_remainder +@ cdecl remainderf(float float) MSVCR120_remainderf +@ cdecl remainderl(double double) MSVCR120_remainderl @ cdecl remove(str) MSVCRT_remove @ stub remquo @ stub remquof diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 54c86c6..e267111 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -88,6 +88,12 @@ static void (CDECL *p_free)(void*); static float (CDECL *p_strtof)(const char *, char **); static int (CDECL *p__finite)(double); static float (CDECL *p_wcstof)(const wchar_t*, wchar_t**); +static double (CDECL *p_remainder)(double, double); +static int* (CDECL *p_errno)(void); + +/* make sure we use the correct errno */ +#undef errno +#define errno (*p_errno()) static BOOL init(void) { @@ -113,6 +119,8 @@ static BOOL init(void) p_strtof = (void*)GetProcAddress(module, "strtof"); p__finite = (void*)GetProcAddress(module, "_finite"); p_wcstof = (void*)GetProcAddress(module, "wcstof"); + p_remainder = (void*)GetProcAddress(module, "remainder"); + p_errno = (void*)GetProcAddress(module, "_errno"); return TRUE; } @@ -389,6 +397,45 @@ static void test__strtof(void) p_setlocale(LC_ALL, "C"); } +static void test_remainder(void) +{ + struct { + double x, y, r; + errno_t e; + } tests[] = { + { 3.0, 2.0, -1.0, -1 }, + { 1.0, 1.0, 0.0, -1 }, + { INFINITY, 0.0, NAN, EDOM }, + { INFINITY, 42.0, NAN, EDOM }, + { NAN, 0.0, NAN, EDOM }, + { NAN, 42.0, NAN, EDOM }, + { 0.0, INFINITY, 0.0, -1 }, + { 42.0, INFINITY, 42.0, -1 }, + { 0.0, NAN, NAN, EDOM }, + { 42.0, NAN, NAN, EDOM }, + { 1.0, 0.0, NAN, EDOM }, + { INFINITY, INFINITY, NAN, EDOM }, + }; + errno_t e; + double r; + int i; + + if(sizeof(void*) != 8) /* errno handling slightly different on 32-bit */ + return; + + for(i=0; i<sizeof(tests)/sizeof(*tests); i++) { + errno = -1; + r = p_remainder(tests[i].x, tests[i].y); + e = errno; + + ok(tests[i].e == e, "expected errno %i, but got %i\n", tests[i].e, e); + if(_isnan(tests[i].r)) + ok(_isnan(r), "expected NAN, but got %f\n", r); + else + ok(tests[i].r == r, "expected result %f, but got %f\n", tests[i].r, r); + } +} + START_TEST(msvcr120) { if (!init()) return; @@ -400,4 +447,5 @@ START_TEST(msvcr120) test__GetConcurrency(); test__W_Gettnames(); test__strtof(); + test_remainder(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 7f195e4..fb3e4a3 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1987,9 +1987,9 @@ @ cdecl rand() msvcr120.rand @ cdecl rand_s(ptr) msvcr120.rand_s @ cdecl realloc(ptr long) msvcr120.realloc -@ stub remainder -@ stub remainderf -@ stub remainderl +@ cdecl remainder(double double) msvcr120.remainder +@ cdecl remainderf(float float) msvcr120.remainderf +@ cdecl remainderl(double double) msvcr120.remainderl @ cdecl remove(str) msvcr120.remove @ stub remquo @ stub remquof diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index bd0b92b..b9e0533 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2790,3 +2790,43 @@ LDOUBLE CDECL MSVCR120_scalbnl(LDOUBLE num, MSVCRT_long power) { return MSVCRT__scalb(num, power); } + +/********************************************************************* + * remainder (MSVCR120.@) + */ +double CDECL MSVCR120_remainder(double x, double y) +{ +#ifdef HAVE_REMAINDER + /* this matches 64-bit Windows. 32-bit Windows is slightly different */ + if(!finite(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if(isnan(y) || y==0.0) *MSVCRT__errno() = MSVCRT_EDOM; + return remainder(x, y); +#else + FIXME( "not implemented\n" ); + return 0.0; +#endif +} + +/********************************************************************* + * remainderf (MSVCR120.@) + */ +float CDECL MSVCR120_remainderf(float x, float y) +{ +#ifdef HAVE_REMAINDERF + /* this matches 64-bit Windows. 32-bit Windows is slightly different */ + if(!finitef(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if(isnanf(y) || y==0.0f) *MSVCRT__errno() = MSVCRT_EDOM; + return remainderf(x, y); +#else + FIXME( "not implemented\n" ); + return 0.0f; +#endif +} + +/********************************************************************* + * remainderl (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_remainderl(LDOUBLE x, LDOUBLE y) +{ + return MSVCR120_remainder(x, y); +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 1ef5c3b..0670f6e 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2458,9 +2458,9 @@ @ cdecl rand() MSVCRT_rand @ cdecl rand_s(ptr) MSVCRT_rand_s @ cdecl realloc(ptr long) MSVCRT_realloc -@ stub remainder -@ stub remainderf -@ stub remainderl +@ cdecl remainder(double double) MSVCR120_remainder +@ cdecl remainderf(float float) MSVCR120_remainderf +@ cdecl remainderl(double double) MSVCR120_remainderl @ cdecl remove(str) MSVCRT_remove @ stub remquo @ stub remquof diff --git a/include/config.h.in b/include/config.h.in index cb0ddd6..0650f31 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -726,6 +726,12 @@ /* Define to 1 if you have the `readlink' function. */ #undef HAVE_READLINK +/* Define to 1 if you have the `remainder' function. */ +#undef HAVE_REMAINDER + +/* Define to 1 if you have the `remainderf' function. */ +#undef HAVE_REMAINDERF + /* Define to 1 if the system has the type `request_sense'. */ #undef HAVE_REQUEST_SENSE

1 0

Sebastian Lackner : ntdll/tests: Fix some test failures on Win 8+.
by Alexandre Julliard April 7, 2016

April 7, 2016

Module: wine Branch: master Commit: 7389e84dd0eaa50f9e62c5791d4178b241180056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7389e84dd0eaa50f9e62c5791… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 7 08:44:20 2016 +0200 ntdll/tests: Fix some test failures on Win 8+. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 7c30408..0862f1c 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -541,7 +541,8 @@ static void test_filepipeinfo(void) check_pipe_handle_state(hServer, 0, 1); hClient = CreateFileW(testpipe, GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0); - ok(hClient != INVALID_HANDLE_VALUE, "can't open pipe, GetLastError: %x\n", GetLastError()); + ok(hClient != INVALID_HANDLE_VALUE || broken(GetLastError() == ERROR_PIPE_BUSY) /* > Win 8 */, + "can't open pipe, GetLastError: %x\n", GetLastError()); check_pipe_handle_state(hServer, 0, 1); check_pipe_handle_state(hClient, 0, 0); @@ -617,7 +618,8 @@ static void test_filepipeinfo(void) check_pipe_handle_state(hServer, 1, 0); hClient = CreateFileW(testpipe, GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0); - ok(hClient != INVALID_HANDLE_VALUE, "can't open pipe, GetLastError: %x\n", GetLastError()); + ok(hClient != INVALID_HANDLE_VALUE || broken(GetLastError() == ERROR_PIPE_BUSY) /* > Win 8 */, + "can't open pipe, GetLastError: %x\n", GetLastError()); check_pipe_handle_state(hServer, 1, 0); check_pipe_handle_state(hClient, 0, 0);

1 0

Vincent Povirk : gdiplus: Implement GdipRecordMetafileStream.
by Alexandre Julliard April 7, 2016

April 7, 2016

Module: wine Branch: master Commit: a9e4e3b4031c86b476f3b2488df130655212908c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9e4e3b4031c86b476f3b2488… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 6 14:36:58 2016 -0500 gdiplus: Implement GdipRecordMetafileStream. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 7 ------ dlls/gdiplus/image.c | 4 ++++ dlls/gdiplus/metafile.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 0013d75..10092f1 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -343,6 +343,7 @@ struct GpMetafile{ BYTE *comment_data; DWORD comment_data_size; DWORD comment_data_length; + IStream *record_stream; /* playback */ GpGraphics *playback_graphics; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 15c0bed..dac52ef 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6436,13 +6436,6 @@ GpStatus WINGDIPAPI GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT16 brush, positions, flags, matrix); } -GpStatus WINGDIPAPI GdipRecordMetafileStream(IStream *stream, HDC hdc, EmfType type, GDIPCONST GpRect *frameRect, - MetafileFrameUnit frameUnit, GDIPCONST WCHAR *desc, GpMetafile **metafile) -{ - FIXME("(%p %p %d %p %d %p %p): stub\n", stream, hdc, type, frameRect, frameUnit, desc, metafile); - return NotImplemented; -} - /***************************************************************************** * GdipIsVisibleClipEmpty [GDIPLUS.@] */ diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index f803efa..d1a5593 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2142,6 +2142,10 @@ static GpStatus free_image_data(GpImage *image) metafile->record_graphics->image = NULL; metafile->record_graphics->busy = TRUE; } + if (metafile->record_stream) + { + IStream_Release(metafile->record_stream); + } } else { diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 82a7abf..ee16d8e 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -308,6 +308,27 @@ GpStatus WINGDIPAPI GdipRecordMetafileI(HDC hdc, EmfType type, GDIPCONST GpRect return GdipRecordMetafile(hdc, type, pFrameRectF, frameUnit, desc, metafile); } +GpStatus WINGDIPAPI GdipRecordMetafileStream(IStream *stream, HDC hdc, EmfType type, GDIPCONST GpRectF *frameRect, + MetafileFrameUnit frameUnit, GDIPCONST WCHAR *desc, GpMetafile **metafile) +{ + GpStatus stat; + + TRACE("(%p %p %d %p %d %p %p)\n", stream, hdc, type, frameRect, frameUnit, desc, metafile); + + if (!stream) + return InvalidParameter; + + stat = GdipRecordMetafile(hdc, type, frameRect, frameUnit, desc, metafile); + + if (stat == Ok) + { + (*metafile)->record_stream = stream; + IStream_AddRef(stream); + } + + return stat; +} + GpStatus METAFILE_GetGraphicsContext(GpMetafile* metafile, GpGraphics **result) { GpStatus stat; @@ -487,6 +508,37 @@ GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) } } + if (stat == Ok && metafile->record_stream) + { + BYTE *buffer; + UINT buffer_size; + + buffer_size = GetEnhMetaFileBits(metafile->hemf, 0, NULL); + + buffer = heap_alloc(buffer_size); + if (buffer) + { + HRESULT hr; + + GetEnhMetaFileBits(metafile->hemf, buffer_size, buffer); + + hr = IStream_Write(metafile->record_stream, buffer, buffer_size, NULL); + + if (FAILED(hr)) + stat = hresult_to_status(hr); + + heap_free(buffer); + } + else + stat = OutOfMemory; + } + + if (metafile->record_stream) + { + IStream_Release(metafile->record_stream); + metafile->record_stream = NULL; + } + return stat; }

1 0

Vincent Povirk : gdiplus: Allow recording metafiles with a NULL frame.
by Alexandre Julliard April 7, 2016

April 7, 2016

Module: wine Branch: master Commit: 4ed1b4f5e8fdad19555899ad2ec14da903205e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ed1b4f5e8fdad19555899ad2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 6 14:36:57 2016 -0500 gdiplus: Allow recording metafiles with a NULL frame. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 71 ++++++++++++++++++++++--------------------- dlls/gdiplus/tests/metafile.c | 14 ++++----- 2 files changed, 43 insertions(+), 42 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 79bf5c3..82a7abf 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -195,7 +195,7 @@ GpStatus WINGDIPAPI GdipRecordMetafile(HDC hdc, EmfType type, GDIPCONST GpRectF HDC record_dc; REAL dpix, dpiy; REAL framerect_factor_x, framerect_factor_y; - RECT rc; + RECT rc, *lprc; GpStatus stat; TRACE("(%p %d %p %d %p %p)\n", hdc, type, frameRect, frameUnit, desc, metafile); @@ -203,46 +203,47 @@ GpStatus WINGDIPAPI GdipRecordMetafile(HDC hdc, EmfType type, GDIPCONST GpRectF if (!hdc || type < EmfTypeEmfOnly || type > EmfTypeEmfPlusDual || !metafile) return InvalidParameter; - if (!frameRect) - { - FIXME("not implemented for NULL rect\n"); - return NotImplemented; - } - dpix = (REAL)GetDeviceCaps(hdc, HORZRES) / GetDeviceCaps(hdc, HORZSIZE) * 25.4; dpiy = (REAL)GetDeviceCaps(hdc, VERTRES) / GetDeviceCaps(hdc, VERTSIZE) * 25.4; - switch (frameUnit) + if (frameRect) { - case MetafileFrameUnitPixel: - framerect_factor_x = 2540.0 / dpix; - framerect_factor_y = 2540.0 / dpiy; - break; - case MetafileFrameUnitPoint: - framerect_factor_x = framerect_factor_y = 2540.0 / 72.0; - break; - case MetafileFrameUnitInch: - framerect_factor_x = framerect_factor_y = 2540.0; - break; - case MetafileFrameUnitDocument: - framerect_factor_x = framerect_factor_y = 2540.0 / 300.0; - break; - case MetafileFrameUnitMillimeter: - framerect_factor_x = framerect_factor_y = 100.0; - break; - case MetafileFrameUnitGdi: - framerect_factor_x = framerect_factor_y = 1.0; - break; - default: - return InvalidParameter; - } + switch (frameUnit) + { + case MetafileFrameUnitPixel: + framerect_factor_x = 2540.0 / dpix; + framerect_factor_y = 2540.0 / dpiy; + break; + case MetafileFrameUnitPoint: + framerect_factor_x = framerect_factor_y = 2540.0 / 72.0; + break; + case MetafileFrameUnitInch: + framerect_factor_x = framerect_factor_y = 2540.0; + break; + case MetafileFrameUnitDocument: + framerect_factor_x = framerect_factor_y = 2540.0 / 300.0; + break; + case MetafileFrameUnitMillimeter: + framerect_factor_x = framerect_factor_y = 100.0; + break; + case MetafileFrameUnitGdi: + framerect_factor_x = framerect_factor_y = 1.0; + break; + default: + return InvalidParameter; + } + + rc.left = framerect_factor_x * frameRect->X; + rc.top = framerect_factor_y * frameRect->Y; + rc.right = rc.left + framerect_factor_x * frameRect->Width; + rc.bottom = rc.top + framerect_factor_y * frameRect->Height; - rc.left = framerect_factor_x * frameRect->X; - rc.top = framerect_factor_y * frameRect->Y; - rc.right = rc.left + framerect_factor_x * frameRect->Width; - rc.bottom = rc.top + framerect_factor_y * frameRect->Height; + lprc = &rc; + } + else + lprc = NULL; - record_dc = CreateEnhMetaFileW(hdc, NULL, &rc, desc); + record_dc = CreateEnhMetaFileW(hdc, NULL, lprc, desc); if (!record_dc) return GenericError; diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 932fe1c..550dc6b 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -876,7 +876,7 @@ static void test_nullframerect(void) { hdc = CreateCompatibleDC(0); stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, NULL, MetafileFrameUnitPixel, description, &metafile); - todo_wine expect(Ok, stat); + expect(Ok, stat); DeleteDC(hdc); @@ -917,10 +917,10 @@ static void test_nullframerect(void) { stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); expect(Ok, stat); expect(UnitPixel, unit); - expectf_(25.0, bounds.X, 0.05); - expectf_(25.0, bounds.Y, 0.05); - expectf_(75.0, bounds.Width, 0.05); - expectf_(75.0, bounds.Height, 0.05); + todo_wine expectf_(25.0, bounds.X, 0.05); + todo_wine expectf_(25.0, bounds.Y, 0.05); + todo_wine expectf_(75.0, bounds.Width, 0.05); + todo_wine expectf_(75.0, bounds.Height, 0.05); stat = GdipDisposeImage((GpImage*)metafile); expect(Ok, stat); @@ -966,8 +966,8 @@ static void test_nullframerect(void) { expect(UnitPixel, unit); expectf_(25.0, bounds.X, 0.05); expectf_(25.0, bounds.Y, 0.05); - expectf_(50.0, bounds.Width, 0.05); - expectf_(50.0, bounds.Height, 0.05); + todo_wine expectf_(50.0, bounds.Width, 0.05); + todo_wine expectf_(50.0, bounds.Height, 0.05); stat = GdipDisposeImage((GpImage*)metafile); expect(Ok, stat);

1 0

Henri Verbeet : wined3d: Merge drawStridedSlow() and drawStridedSlowVs().
by Alexandre Julliard April 7, 2016

April 7, 2016

Module: wine Branch: master Commit: f3c155cc56eb31fa9294d388e755208a2633c398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c155cc56eb31fa9294d388e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 6 19:12:05 2016 +0200 wined3d: Merge drawStridedSlow() and drawStridedSlowVs(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 15 +-- dlls/wined3d/context.c | 5 +- dlls/wined3d/directx.c | 6 +- dlls/wined3d/drawprim.c | 351 ++++++++++++++++++------------------------------ dlls/wined3d/state.c | 20 +-- dlls/wined3d/utils.c | 26 ++-- 6 files changed, 166 insertions(+), 257 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f3c155cc56eb31fa9294d…

1 0

Stefan Dösinger : wined3d: Get rid of wined3d_texture_ops.texture_sub_resource_load().
by Alexandre Julliard April 7, 2016

April 7, 2016

Module: wine Branch: master Commit: 7d23c8a4d822e8bcda4be074f915538bdfcf846b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d23c8a4d822e8bcda4be074f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 6 19:12:07 2016 +0200 wined3d: Get rid of wined3d_texture_ops.texture_sub_resource_load(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 21 --------------------- dlls/wined3d/texture.c | 18 +++--------------- dlls/wined3d/volume.c | 8 -------- dlls/wined3d/wined3d_private.h | 5 ----- 4 files changed, 3 insertions(+), 49 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8d898bc..9c015cc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1422,27 +1422,6 @@ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const checkGLcall("set_compatible_renderbuffer"); } -/* Context activation is done by the caller. */ -void surface_load(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) -{ - DWORD location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; - - TRACE("surface %p, srgb %#x.\n", surface, srgb); - - if (surface->container->resource.pool == WINED3D_POOL_SCRATCH) - ERR("Not supported on scratch surfaces.\n"); - - if (surface_get_sub_resource(surface)->locations & location) - { - TRACE("surface is already in texture\n"); - return; - } - TRACE("Reloading because surface is dirty.\n"); - - surface_load_location(surface, context, location); - surface_evict_sysmem(surface); -} - /* See also float_16_to_32() in wined3d_private.h */ static inline unsigned short float_32_to_16(const float *in) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3476b32..b31b0e1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -663,7 +663,9 @@ void wined3d_texture_load(struct wined3d_texture *texture, /* Reload the surfaces if the texture is marked dirty. */ for (i = 0; i < sub_count; ++i) { - texture->texture_ops->texture_sub_resource_load(texture->sub_resources[i].resource, context, srgb); + if (!texture->texture_ops->texture_load_location(texture, i, context, + srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB)) + ERR("Failed to load location (srgb %#x).\n", srgb); } texture->flags |= flag; } @@ -1087,12 +1089,6 @@ static HRESULT wined3d_texture_upload_data(struct wined3d_texture *texture, return WINED3D_OK; } -static void texture2d_sub_resource_load(struct wined3d_resource *sub_resource, - struct wined3d_context *context, BOOL srgb) -{ - surface_load(surface_from_resource(sub_resource), context, srgb); -} - static void texture2d_sub_resource_upload_data(struct wined3d_resource *sub_resource, const struct wined3d_context *context, const struct wined3d_sub_resource_data *data) { @@ -1203,7 +1199,6 @@ static void texture2d_cleanup_sub_resources(struct wined3d_texture *texture) static const struct wined3d_texture_ops texture2d_ops = { - texture2d_sub_resource_load, texture2d_sub_resource_upload_data, texture2d_load_location, texture2d_prepare_location, @@ -1689,12 +1684,6 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 return WINED3D_OK; } -static void texture3d_sub_resource_load(struct wined3d_resource *sub_resource, - struct wined3d_context *context, BOOL srgb) -{ - wined3d_volume_load(volume_from_resource(sub_resource), context, srgb); -} - static void texture3d_sub_resource_upload_data(struct wined3d_resource *sub_resource, const struct wined3d_context *context, const struct wined3d_sub_resource_data *data) { @@ -1766,7 +1755,6 @@ static void texture3d_cleanup_sub_resources(struct wined3d_texture *texture) static const struct wined3d_texture_ops texture3d_ops = { - texture3d_sub_resource_load, texture3d_sub_resource_upload_data, texture3d_load_location, texture3d_prepare_location, diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 60bc2d7..02b5db6 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -355,14 +355,6 @@ done: return TRUE; } -/* Context activation is done by the caller. */ -void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) -{ - wined3d_texture_prepare_texture(volume->container, context, srgb_mode); - wined3d_volume_load_location(volume, context, - srgb_mode ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB); -} - void wined3d_volume_cleanup(struct wined3d_volume *volume) { TRACE("volume %p.\n", volume); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ca1065f..cb6d967 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2416,8 +2416,6 @@ struct gl_texture struct wined3d_texture_ops { - void (*texture_sub_resource_load)(struct wined3d_resource *sub_resource, - struct wined3d_context *context, BOOL srgb); void (*texture_sub_resource_upload_data)(struct wined3d_resource *sub_resource, const struct wined3d_context *context, const struct wined3d_sub_resource_data *data); BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, @@ -2580,8 +2578,6 @@ static inline struct wined3d_volume *volume_from_resource(struct wined3d_resourc void wined3d_volume_cleanup(struct wined3d_volume *volume) DECLSPEC_HIDDEN; HRESULT wined3d_volume_init(struct wined3d_volume *volume, struct wined3d_texture *container, const struct wined3d_resource_desc *desc, UINT level) DECLSPEC_HIDDEN; -void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, - BOOL srgb_mode) DECLSPEC_HIDDEN; BOOL wined3d_volume_load_location(struct wined3d_volume *volume, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; BOOL wined3d_volume_prepare_location(struct wined3d_volume *volume, @@ -2698,7 +2694,6 @@ void surface_get_drawable_size(const struct wined3d_surface *surface, const stru HRESULT wined3d_surface_init(struct wined3d_surface *surface, struct wined3d_texture *container, const struct wined3d_resource_desc *desc, GLenum target, unsigned int level, unsigned int layer, DWORD flags) DECLSPEC_HIDDEN; -void surface_load(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; HRESULT surface_load_location(struct wined3d_surface *surface,

1 0