January 2016 - Wine-Commits

Józef Kucia : wined3d: Add support for buffers in wined3d_device_update_sub_resource().
by Alexandre Julliard Jan. 5, 2016

Jan. 5, 2016

Module: wine Branch: master Commit: 62658ec5b836fd2af8ac58cd212f97c4a25899fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=62658ec5b836fd2af8ac58cd2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 4 13:03:36 2016 +0100 wined3d: Add support for buffers in wined3d_device_update_sub_resource(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 38 +++++++++++++++++++++++++++++--------- dlls/wined3d/device.c | 17 +++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 48 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d20931b..444015f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1113,6 +1113,33 @@ void CDECL wined3d_buffer_unmap(struct wined3d_buffer *buffer) } } +HRESULT wined3d_buffer_upload_data(struct wined3d_buffer *buffer, + const struct wined3d_box *box, const void *data) +{ + UINT offset, size; + HRESULT hr; + BYTE *ptr; + + if (box) + { + offset = box->left; + size = box->right - box->left; + } + else + { + offset = 0; + size = buffer->resource.size; + } + + if (FAILED(hr = wined3d_buffer_map(buffer, offset, size, &ptr, 0))) + return hr; + + memcpy(ptr, data, size); + + wined3d_buffer_unmap(buffer); + return WINED3D_OK; +} + static ULONG buffer_resource_incref(struct wined3d_resource *resource) { return wined3d_buffer_incref(buffer_from_resource(resource)); @@ -1240,20 +1267,13 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device if (data) { - BYTE *ptr; - - hr = wined3d_buffer_map(buffer, 0, size, &ptr, 0); - if (FAILED(hr)) + if (FAILED(hr = wined3d_buffer_upload_data(buffer, NULL, data->data))) { - ERR("Failed to map buffer, hr %#x\n", hr); + ERR("Failed to upload data, hr %#x.\n", hr); buffer_unload(&buffer->resource); resource_cleanup(&buffer->resource); return hr; } - - memcpy(ptr, data->data, size); - - wined3d_buffer_unmap(buffer); } buffer->maps = HeapAlloc(GetProcessHeap(), 0, sizeof(*buffer->maps)); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 76c4e7d..d8a6462 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3989,6 +3989,23 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str TRACE("device %p, resource %p, sub_resource_idx %u, box %p, data %p, row_pitch %u, depth_pitch %u.\n", device, resource, sub_resource_idx, box, data, row_pitch, depth_pitch); + if (resource->type == WINED3D_RTYPE_BUFFER) + { + struct wined3d_buffer *buffer = buffer_from_resource(resource); + HRESULT hr; + + if (sub_resource_idx > 0) + { + WARN("Invalid sub_resource_idx %u.\n", sub_resource_idx); + return; + } + + if (FAILED(hr = wined3d_buffer_upload_data(buffer, box, data))) + WARN("Failed to update buffer data, hr %#x.\n", hr); + + return; + } + if (resource->type != WINED3D_RTYPE_TEXTURE) { FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 288d683..293e807 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2758,6 +2758,8 @@ BYTE *buffer_get_sysmem(struct wined3d_buffer *This, struct wined3d_context *con void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; void buffer_mark_used(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; +HRESULT wined3d_buffer_upload_data(struct wined3d_buffer *buffer, + const struct wined3d_box *box, const void *data) DECLSPEC_HIDDEN; struct wined3d_rendertarget_view {

1 0

Zhenbo Li : mshtml: Add IHTMLXMLHttpRequest::responseXML() method implementation.
by Alexandre Julliard Jan. 5, 2016

Jan. 5, 2016

Module: wine Branch: master Commit: 798b1e06f38328121e0f201a9a44ba020e07e1f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=798b1e06f38328121e0f201a9… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Fri Dec 25 15:30:06 2015 +0800 mshtml: Add IHTMLXMLHttpRequest::responseXML() method implementation. Signed-off-by: Zhenbo Li <litimetal(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/xmlhttprequest.c | 111 +++++++++++++++++++++++++++++++++++++ dlls/mshtml/xmlhttprequest.c | 41 +++++++++++++- 2 files changed, 150 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index 0997206..b402aeb 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -20,11 +20,13 @@ #include <wine/test.h> #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" #include "ole2.h" #include "mshtml.h" +#include "objsafe.h" static BSTR a2bstr(const char *str) { @@ -454,6 +456,109 @@ static void test_header(const struct HEADER_TYPE expect[], int num) } } +static const char *debugstr_variant(const VARIANT *var) +{ + static char buf[400]; + + if (!var) + return "(null)"; + + switch (V_VT(var)) + { + case VT_EMPTY: + return "{VT_EMPTY}"; + case VT_BSTR: + sprintf(buf, "{VT_BSTR: %s}", wine_dbgstr_w(V_BSTR(var))); + break; + case VT_BOOL: + sprintf(buf, "{VT_BOOL: %x}", V_BOOL(var)); + break; + case VT_UI4: + sprintf(buf, "{VT_UI4: %u}", V_UI4(var)); + break; + default: + sprintf(buf, "{vt %d}", V_VT(var)); + break; + } + + return buf; +} + +static void test_illegal_xml(IXMLDOMDocument *xmldom) +{ + IXMLDOMNode *first, *last; + VARIANT variant; + HRESULT hres; + BSTR bstr; + + hres = IXMLDOMDocument_get_baseName(xmldom, NULL); + ok(hres == E_INVALIDARG, "Expect E_INVALIDARG, got %08x\n", hres); + hres = IXMLDOMDocument_get_baseName(xmldom, &bstr); + ok(hres == S_FALSE, "get_baseName failed: %08x\n", hres); + ok(bstr == NULL, "bstr(%p): %s\n", bstr, wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + hres = IXMLDOMDocument_get_dataType(xmldom, NULL); + ok(hres == E_INVALIDARG, "Expect E_INVALIDARG, got %08x\n", hres); + hres = IXMLDOMDocument_get_dataType(xmldom, &variant); + ok(hres == S_FALSE, "get_dataType failed: %08x\n", hres); + ok(V_VT(&variant) == VT_NULL, "got %s\n", debugstr_variant(&variant)); + VariantClear(&variant); + + hres = IXMLDOMDocument_get_text(xmldom, &bstr); + ok(!strcmp_wa(bstr, ""), "text = %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + hres = IXMLDOMDocument_get_firstChild(xmldom, NULL); + ok(hres == E_INVALIDARG, "Expect E_INVALIDARG, got %08x\n", hres); + + first = (void*)0xdeadbeef; + hres = IXMLDOMDocument_get_firstChild(xmldom, &first); + ok(hres == S_FALSE, "get_firstChild failed: %08x\n", hres); + ok(first == NULL, "first != NULL\n"); + + last = (void*)0xdeadbeef; + hres = IXMLDOMDocument_get_lastChild(xmldom, &last); + ok(hres == S_FALSE, "get_lastChild failed: %08x\n", hres); + ok(last == NULL, "last != NULL\n"); +} + +static void test_responseXML(const char *expect_text) +{ + IDispatch *disp; + IXMLDOMDocument *xmldom; + IObjectSafety *safety; + DWORD enabled = 0, supported = 0; + HRESULT hres; + + disp = NULL; + hres = IHTMLXMLHttpRequest_get_responseXML(xhr, &disp); + ok(hres == S_OK, "get_responseXML failed: %08x\n", hres); + ok(disp != NULL, "disp == NULL\n"); + + xmldom = NULL; + hres = IDispatch_QueryInterface(disp, &IID_IXMLDOMDocument, (void**)&xmldom); + ok(hres == S_OK, "QueryInterface(IXMLDOMDocument) failed: %08x\n", hres); + ok(xmldom != NULL, "xmldom == NULL\n"); + + hres = IXMLDOMDocument_QueryInterface(xmldom, &IID_IObjectSafety, (void**)&safety); + ok(hres == S_OK, "QueryInterface IObjectSafety failed: %08x\n", hres); + hres = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled); + ok(hres == S_OK, "GetInterfaceSafetyOptions failed: %08x\n", hres); + ok(broken(supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA)) || + supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER) /* msxml3 SP8+ */, + "Expected supported: (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), got %08x\n", supported); + ok(enabled == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), + "Expected enabled: (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), got 0x%08x\n", enabled); + IObjectSafety_Release(safety); + + if(!expect_text) + test_illegal_xml(xmldom); + + IXMLDOMDocument_Release(xmldom); + IDispatch_Release(disp); +} + static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char *expect_text) { VARIANT vbool, vempty, var; @@ -468,6 +573,8 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char * {"Content-Type", "application/xml"} }; + trace("test_sync_xhr\n"); + create_xmlhttprequest(doc); if(!xhr) return; @@ -612,6 +719,8 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char * expect_text, wine_dbgstr_w(text)); SysFreeString(text); + test_responseXML(expect_text); + IHTMLXMLHttpRequest_Release(xhr); xhr = NULL; } @@ -786,6 +895,8 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const char expect_text, wine_dbgstr_w(text)); SysFreeString(text); + test_responseXML(expect_text); + IHTMLXMLHttpRequest_Release(xhr); xhr = NULL; } diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index fdfa31f..d188478 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -30,6 +30,9 @@ #include "mshtml_private.h" #include "htmlevent.h" +#include "initguid.h" +#include "msxml6.h" +#include "objsafe.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -334,8 +337,42 @@ static HRESULT WINAPI HTMLXMLHttpRequest_get_responseText(IHTMLXMLHttpRequest *i static HRESULT WINAPI HTMLXMLHttpRequest_get_responseXML(IHTMLXMLHttpRequest *iface, IDispatch **p) { HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + IXMLDOMDocument *xmldoc = NULL; + BSTR str; + HRESULT hres; + VARIANT_BOOL vbool; + IObjectSafety *safety; + + TRACE("(%p)->(%p)\n", This, p); + + hres = CoCreateInstance(&CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&xmldoc); + if(FAILED(hres)) { + ERR("CoCreateInstance failed: %08x\n", hres); + return hres; + } + + hres = IHTMLXMLHttpRequest_get_responseText(iface, &str); + if(FAILED(hres)) { + IXMLDOMDocument_Release(xmldoc); + ERR("get_responseText failed: %08x\n", hres); + return hres; + } + + hres = IXMLDOMDocument_loadXML(xmldoc, str, &vbool); + SysFreeString(str); + if(hres != S_OK || vbool != VARIANT_TRUE) + WARN("loadXML failed: %08x, returning an empty xmldoc\n", hres); + + hres = IXMLDOMDocument_QueryInterface(xmldoc, &IID_IObjectSafety, (void**)&safety); + assert(SUCCEEDED(hres)); + hres = IObjectSafety_SetInterfaceSafetyOptions(safety, NULL, + INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER, + INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER); + assert(SUCCEEDED(hres)); + IObjectSafety_Release(safety); + + *p = (IDispatch*)xmldoc; + return S_OK; } static HRESULT WINAPI HTMLXMLHttpRequest_get_status(IHTMLXMLHttpRequest *iface, LONG *p)

1 0

Akihiro Sagawa : gdi32/tests: Refactor test_fake_bold_font() to avoid code duplications.
by Alexandre Julliard Jan. 5, 2016

Jan. 5, 2016

Module: wine Branch: master Commit: 6cd42f3df78543284e9785619a713d0fc874ddf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cd42f3df78543284e9785619… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Dec 31 13:33:12 2015 +0900 gdi32/tests: Refactor test_fake_bold_font() to avoid code duplications. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 66 +++++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 53945da..5f01246 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6304,12 +6304,14 @@ static void test_GetCharWidth32(void) static void test_fake_bold_font(void) { HDC hdc; - HFONT hfont, hfont_old; LOGFONTA lf; BOOL ret; - TEXTMETRICA tm[2]; - ABC abc[2]; - INT w[2]; + struct glyph_data { + TEXTMETRICA tm; + ABC abc; + INT w; + } data[2]; + int i; if (!pGetCharWidth32A || !pGetCharABCWidthsA) { win_skip("GetCharWidth32A/GetCharABCWidthA is not available on this platform\n"); @@ -6319,44 +6321,44 @@ static void test_fake_bold_font(void) /* Test outline font */ memset(&lf, 0, sizeof(lf)); strcpy(lf.lfFaceName, "Wingdings"); - lf.lfWeight = FW_NORMAL; lf.lfCharSet = SYMBOL_CHARSET; - hfont = CreateFontIndirectA(&lf); hdc = GetDC(NULL); - hfont_old = SelectObject(hdc, hfont); - /* base metrics */ - ret = GetTextMetricsA(hdc, &tm[0]); - ok(ret, "got %d\n", ret); - ret = pGetCharABCWidthsA(hdc, 0x76, 0x76, &abc[0]); - ok(ret, "got %d\n", ret); + for (i = 0; i <= 1; i++) + { + HFONT hfont, hfont_old; - lf.lfWeight = FW_BOLD; - hfont = CreateFontIndirectA(&lf); - DeleteObject(SelectObject(hdc, hfont)); + lf.lfWeight = i ? FW_BOLD : FW_NORMAL; + hfont = CreateFontIndirectA(&lf); + hfont_old = SelectObject(hdc, hfont); - /* bold metrics */ - ret = GetTextMetricsA(hdc, &tm[1]); - ok(ret, "got %d\n", ret); - ret = pGetCharABCWidthsA(hdc, 0x76, 0x76, &abc[1]); - ok(ret, "got %d\n", ret); + ret = GetTextMetricsA(hdc, &data[i].tm); + ok(ret, "got %d\n", ret); + ret = pGetCharABCWidthsA(hdc, 0x76, 0x76, &data[i].abc); + ok(ret, "got %d\n", ret); + data[i].w = data[i].abc.abcA + data[i].abc.abcB + data[i].abc.abcC; - DeleteObject(SelectObject(hdc, hfont_old)); + SelectObject(hdc, hfont_old); + DeleteObject(hfont); + } ReleaseDC(NULL, hdc); /* compare results (outline) */ - ok(tm[0].tmHeight == tm[1].tmHeight, "expected %d, got %d\n", tm[0].tmHeight, tm[1].tmHeight); - ok(tm[0].tmAscent == tm[1].tmAscent, "expected %d, got %d\n", tm[0].tmAscent, tm[1].tmAscent); - ok(tm[0].tmDescent == tm[1].tmDescent, "expected %d, got %d\n", tm[0].tmDescent, tm[1].tmDescent); - ok((tm[0].tmAveCharWidth + 1) == tm[1].tmAveCharWidth, - "expected %d, got %d\n", tm[0].tmAveCharWidth + 1, tm[1].tmAveCharWidth); - ok((tm[0].tmMaxCharWidth + 1) == tm[1].tmMaxCharWidth, - "expected %d, got %d\n", tm[0].tmMaxCharWidth + 1, tm[1].tmMaxCharWidth); - ok(tm[0].tmOverhang == tm[1].tmOverhang, "expected %d, got %d\n", tm[0].tmOverhang, tm[1].tmOverhang); - w[0] = abc[0].abcA + abc[0].abcB + abc[0].abcC; - w[1] = abc[1].abcA + abc[1].abcB + abc[1].abcC; - ok((w[0] + 1) == w[1], "expected %d, got %d\n", w[0] + 1, w[1]); + ok(data[0].tm.tmHeight == data[1].tm.tmHeight, + "expected %d, got %d\n", data[0].tm.tmHeight, data[1].tm.tmHeight); + ok(data[0].tm.tmAscent == data[1].tm.tmAscent, + "expected %d, got %d\n", data[0].tm.tmAscent, data[1].tm.tmAscent); + ok(data[0].tm.tmDescent == data[1].tm.tmDescent, + "expected %d, got %d\n", data[0].tm.tmDescent, data[1].tm.tmDescent); + ok(data[0].tm.tmAveCharWidth + 1 == data[1].tm.tmAveCharWidth, + "expected %d, got %d\n", data[0].tm.tmAveCharWidth + 1, data[1].tm.tmAveCharWidth); + ok(data[0].tm.tmMaxCharWidth + 1 == data[1].tm.tmMaxCharWidth, + "expected %d, got %d\n", data[0].tm.tmMaxCharWidth + 1, data[1].tm.tmMaxCharWidth); + ok(data[0].tm.tmOverhang == data[1].tm.tmOverhang, + "expected %d, got %d\n", data[0].tm.tmOverhang, data[1].tm.tmOverhang); + ok(data[0].w + 1 == data[1].w, + "expected %d, got %d\n", data[0].w + 1, data[1].w); }

1 0

Józef Kucia : wined3d: Implement SM4 sample_l instruction.
by Alexandre Julliard Jan. 5, 2016

Jan. 5, 2016

Module: wine Branch: master Commit: 16d0d1bbed0845ef5b2b052458183d52da250986 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d0d1bbed0845ef5b2b05245… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 4 13:03:37 2016 +0100 wined3d: Implement SM4 sample_l instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 366c6ec..818d558 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4244,6 +4244,23 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) shader_glsl_release_sample_function(ins->ctx, &sample_function); } +static void shader_glsl_sample_lod(const struct wined3d_shader_instruction *ins) +{ + struct glsl_src_param coord_param, lod_param; + struct glsl_sample_function sample_function; + unsigned int sampler_idx; + + shader_glsl_get_sample_function(ins->ctx, ins->src[1].reg.idx[0].offset, + WINED3D_GLSL_SAMPLE_LOD, &sample_function); + shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); + shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &lod_param); + sampler_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, + ins->src[1].reg.idx[0].offset, ins->src[2].reg.idx[0].offset); + shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, + NULL, NULL, lod_param.param_str, "%s", coord_param.param_str); + shader_glsl_release_sample_function(ins->ctx, &sample_function); +} + static void shader_glsl_texcoord(const struct wined3d_shader_instruction *ins) { /* FIXME: Make this work for more than just 2D textures */ @@ -7895,7 +7912,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_RSQ */ shader_glsl_scalar_op, /* WINED3DSIH_SAMPLE */ shader_glsl_sample, /* WINED3DSIH_SAMPLE_GRAD */ NULL, - /* WINED3DSIH_SAMPLE_LOD */ NULL, + /* WINED3DSIH_SAMPLE_LOD */ shader_glsl_sample_lod, /* WINED3DSIH_SETP */ NULL, /* WINED3DSIH_SGE */ shader_glsl_compare, /* WINED3DSIH_SGN */ shader_glsl_sgn,

1 0

Józef Kucia : wined3d: Implement SM4 imax instruction in GLSL backend.
by Alexandre Julliard Jan. 5, 2016

Jan. 5, 2016

Module: wine Branch: master Commit: 299ae202606d2f35a569e9b60fa20be2e2019be9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=299ae202606d2f35a569e9b60… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 4 13:03:40 2016 +0100 wined3d: Implement SM4 imax instruction in GLSL backend. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 818d558..c9b4c81 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3191,6 +3191,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) /* TODO: Possibly make this a table for faster lookups */ switch (ins->handler_idx) { + case WINED3DSIH_IMAX: instruction = "max"; break; case WINED3DSIH_MIN: instruction = "min"; break; case WINED3DSIH_MAX: instruction = "max"; break; case WINED3DSIH_ABS: instruction = "abs"; break; @@ -7874,7 +7875,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IF */ shader_glsl_if, /* WINED3DSIH_IFC */ shader_glsl_ifc, /* WINED3DSIH_IGE */ shader_glsl_relop, - /* WINED3DSIH_IMAX */ NULL, + /* WINED3DSIH_IMAX */ shader_glsl_map2gl, /* WINED3DSIH_IMIN */ NULL, /* WINED3DSIH_IMUL */ shader_glsl_imul, /* WINED3DSIH_ISHL */ shader_glsl_binop,

1 0

Józef Kucia : wined3d: Reorder WINED3DSIH values alphabetically in shader_glsl_map2gl().
by Alexandre Julliard Jan. 5, 2016

Jan. 5, 2016

Module: wine Branch: master Commit: 4c3586ca7a4d84d331afa5397c26bf263582daef URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c3586ca7a4d84d331afa5397… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 4 13:03:42 2016 +0100 wined3d: Reorder WINED3DSIH values alphabetically in shader_glsl_map2gl(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9c65ae4..e2d16b5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3191,14 +3191,14 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) /* TODO: Possibly make this a table for faster lookups */ switch (ins->handler_idx) { - case WINED3DSIH_IMAX: instruction = "max"; break; - case WINED3DSIH_IMIN: instruction = "min"; break; - case WINED3DSIH_MIN: instruction = "min"; break; - case WINED3DSIH_MAX: instruction = "max"; break; case WINED3DSIH_ABS: instruction = "abs"; break; - case WINED3DSIH_FRC: instruction = "fract"; break; case WINED3DSIH_DSX: instruction = "dFdx"; break; case WINED3DSIH_DSY: instruction = "ycorrection.y * dFdy"; break; + case WINED3DSIH_FRC: instruction = "fract"; break; + case WINED3DSIH_IMAX: instruction = "max"; break; + case WINED3DSIH_IMIN: instruction = "min"; break; + case WINED3DSIH_MAX: instruction = "max"; break; + case WINED3DSIH_MIN: instruction = "min"; break; case WINED3DSIH_ROUND_NI: instruction = "floor"; break; case WINED3DSIH_SQRT: instruction = "sqrt"; break; default: instruction = "";

1 0

Alistair Leslie-Hughes : d3dx9: Add D3DXConvertMeshSubsetToSingleStrip stub.
by Alexandre Julliard Jan. 5, 2016

Jan. 5, 2016

Module: wine Branch: master Commit: af4ece26d22245f278d40f450cbb9c3384e82dc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af4ece26d22245f278d40f450… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Dec 23 17:46:56 2015 +1100 d3dx9: Add D3DXConvertMeshSubsetToSingleStrip stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index f79b6fa..5eda041 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -28,7 +28,7 @@ @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) -@ stub D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) +@ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) @ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) @ stub D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 606a088..f7bd1a3 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -7549,3 +7549,12 @@ HRESULT WINAPI D3DXTessellateNPatches(ID3DXMesh *mesh, const DWORD *adjacency_in return E_NOTIMPL; } + +HRESULT WINAPI D3DXConvertMeshSubsetToSingleStrip(struct ID3DXBaseMesh *mesh_in, DWORD attribute_id, + DWORD ib_flags, struct IDirect3DIndexBuffer9 **index_buffer, DWORD *index_count) +{ + FIXME("mesh_in %p, attribute_id %u, ib_flags %u, index_buffer %p, index_count %p stub.\n", + mesh_in, attribute_id, ib_flags, index_buffer, index_count); + + return E_NOTIMPL; +}

1 0

Józef Kucia : wined3d: Implement SM4 imin instruction in GLSL backend.
by Alexandre Julliard Jan. 5, 2016

Jan. 5, 2016

Module: wine Branch: master Commit: ade436ccec6168b8c1f442562d286cb39606b8cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ade436ccec6168b8c1f442562… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 4 13:03:41 2016 +0100 wined3d: Implement SM4 imin instruction in GLSL backend. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c9b4c81..9c65ae4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3192,6 +3192,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) switch (ins->handler_idx) { case WINED3DSIH_IMAX: instruction = "max"; break; + case WINED3DSIH_IMIN: instruction = "min"; break; case WINED3DSIH_MIN: instruction = "min"; break; case WINED3DSIH_MAX: instruction = "max"; break; case WINED3DSIH_ABS: instruction = "abs"; break; @@ -7876,7 +7877,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IFC */ shader_glsl_ifc, /* WINED3DSIH_IGE */ shader_glsl_relop, /* WINED3DSIH_IMAX */ shader_glsl_map2gl, - /* WINED3DSIH_IMIN */ NULL, + /* WINED3DSIH_IMIN */ shader_glsl_map2gl, /* WINED3DSIH_IMUL */ shader_glsl_imul, /* WINED3DSIH_ISHL */ shader_glsl_binop, /* WINED3DSIH_ITOF */ shader_glsl_to_float,

1 0

Akihiro Sagawa : gdi32: Fixup the internal ntmFlags for bitmap fonts.
by Alexandre Julliard Jan. 5, 2016

Jan. 5, 2016

Module: wine Branch: master Commit: 79ab7456ed72119d4b793ce4fbde714ed8b56872 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ab7456ed72119d4b793ce4f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Dec 31 13:33:15 2015 +0900 gdi32: Fixup the internal ntmFlags for bitmap fonts. The value is used not for APIs, but for our fake-bold implementation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 693a54d..f7cd0ee 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1942,9 +1942,17 @@ static inline DWORD get_ntm_flags( FT_Face ft_face ) { DWORD flags = 0; FT_ULong table_size = 0; + FT_WinFNT_HeaderRec winfnt_header; if (ft_face->style_flags & FT_STYLE_FLAG_ITALIC) flags |= NTM_ITALIC; if (ft_face->style_flags & FT_STYLE_FLAG_BOLD) flags |= NTM_BOLD; + + /* fixup the flag for our fake-bold implementation. */ + if (!FT_IS_SCALABLE( ft_face ) && + !pFT_Get_WinFNT_Header( ft_face, &winfnt_header ) && + winfnt_header.weight > FW_NORMAL ) + flags |= NTM_BOLD; + if (flags == 0) flags = NTM_REGULAR; if (!pFT_Load_Sfnt_Table( ft_face, FT_MAKE_TAG( 'C','F','F',' ' ), 0, NULL, &table_size ))

1 0

Akihiro Sagawa : gdi32/tests: Add font advance tests for synthetic bold face with scaling.
by Alexandre Julliard Jan. 5, 2016

Jan. 5, 2016

Module: wine Branch: master Commit: 37fdc50097e6a01a32694654603649154590de1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=37fdc50097e6a01a326946546… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Dec 31 13:33:13 2015 +0900 gdi32/tests: Add font advance tests for synthetic bold face with scaling. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 5f01246..417b722 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6303,6 +6303,7 @@ static void test_GetCharWidth32(void) static void test_fake_bold_font(void) { + static const MAT2 x2_mat = { {0,2}, {0,0}, {0,0}, {0,2} }; HDC hdc; LOGFONTA lf; BOOL ret; @@ -6310,8 +6311,10 @@ static void test_fake_bold_font(void) TEXTMETRICA tm; ABC abc; INT w; + GLYPHMETRICS gm; } data[2]; int i; + DWORD r; if (!pGetCharWidth32A || !pGetCharABCWidthsA) { win_skip("GetCharWidth32A/GetCharABCWidthA is not available on this platform\n"); @@ -6338,6 +6341,8 @@ static void test_fake_bold_font(void) ret = pGetCharABCWidthsA(hdc, 0x76, 0x76, &data[i].abc); ok(ret, "got %d\n", ret); data[i].w = data[i].abc.abcA + data[i].abc.abcB + data[i].abc.abcC; + r = GetGlyphOutlineA(hdc, 0x76, GGO_METRICS, &data[i].gm, 0, NULL, &x2_mat); + ok(r != GDI_ERROR, "got %d\n", ret); SelectObject(hdc, hfont_old); DeleteObject(hfont); @@ -6360,6 +6365,10 @@ static void test_fake_bold_font(void) ok(data[0].w + 1 == data[1].w, "expected %d, got %d\n", data[0].w + 1, data[1].w); + todo_wine ok(data[0].gm.gmCellIncX + 1 == data[1].gm.gmCellIncX, + "expected %d, got %d\n", data[0].gm.gmCellIncX + 1, data[1].gm.gmCellIncX); + ok(data[0].gm.gmCellIncY == data[1].gm.gmCellIncY, + "expected %d, got %d\n", data[0].gm.gmCellIncY, data[1].gm.gmCellIncY); } static void test_bitmap_font_glyph_index(void)

1 0