August 2014 - Wine-Commits - list.winehq.org

Sebastian Lackner : kernel32/tests: Add better handling for test failure in test_readfileex_pending.
by Alexandre Julliard Aug. 21, 2014

Aug. 21, 2014

Module: wine Branch: master Commit: 3e23aa57691df99ecb222c7abd4edc0ca2ffc289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e23aa57691df99ecb222c7ab… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 30 18:00:19 2014 +0200 kernel32/tests: Add better handling for test failure in test_readfileex_pending. --- dlls/kernel32/tests/pipe.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 457e62b..1cdc2ee 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1845,6 +1845,14 @@ static void test_readfileex_pending(void) wait = WaitForSingleObjectEx(event, 0, TRUE); ok(wait == WAIT_IO_COMPLETION || wait == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", wait); + if (wait == WAIT_TIMEOUT) + { + ret = ReadFile(client, read_buf, sizeof(read_buf), &num_bytes, NULL); + ok(ret == TRUE, "ReadFile failed\n"); + ok(completion_called == 0, "completion routine called during ReadFile\n"); + wait = WaitForSingleObjectEx(event, 0, TRUE); + ok(wait == WAIT_IO_COMPLETION || wait == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", wait); + } ok(completion_called == 1, "completion routine not called\n"); ok(completion_errorcode == 0, "completion called with error %x\n", completion_errorcode);

1 0

Sebastian Lackner : kernel32/tests: Always allow only one correct test result, add todo_wine where necessary.
by Alexandre Julliard Aug. 21, 2014

Aug. 21, 2014

Module: wine Branch: master Commit: 8f9df3afde238397ebe29bbe6441f804f19cb2ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f9df3afde238397ebe29bbe6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 30 18:00:19 2014 +0200 kernel32/tests: Always allow only one correct test result, add todo_wine where necessary. --- dlls/kernel32/tests/pipe.c | 45 ++++++++++----------------------------------- 1 file changed, 10 insertions(+), 35 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 1cdc2ee..bdac564 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -153,20 +153,13 @@ static void test_CreateNamedPipe(int pipemode) ok(written == sizeof(obuf2), "write file len 3b\n"); ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek3\n"); if (pipemode == PIPE_TYPE_BYTE) { - if (readden != sizeof(obuf)) /* Linux only returns the first message */ - ok(readden == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes\n", readden); - else - todo_wine ok(readden == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes\n", readden); + todo_wine ok(readden == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes\n", readden); } else { - if (readden != sizeof(obuf) + sizeof(obuf2)) /* MacOS returns both messages */ - ok(readden == sizeof(obuf), "peek3 got %d bytes\n", readden); - else - todo_wine ok(readden == sizeof(obuf), "peek3 got %d bytes\n", readden); + ok(readden == sizeof(obuf), "peek3 got %d bytes\n", readden); } - if (avail != sizeof(obuf)) /* older Linux kernels only return the first write here */ - ok(avail == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes available\n", avail); + ok(avail == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes available\n", avail); pbuf = ibuf; ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "pipe content 3a check\n"); if (pipemode == PIPE_TYPE_BYTE && readden >= sizeof(obuf)+sizeof(obuf2)) { @@ -188,21 +181,13 @@ static void test_CreateNamedPipe(int pipemode) ok(written == sizeof(obuf2), "write file len 4b\n"); ok(PeekNamedPipe(hnp, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek4\n"); if (pipemode == PIPE_TYPE_BYTE) { - if (readden != sizeof(obuf)) /* Linux only returns the first message */ - /* should return all 23 bytes */ - ok(readden == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes\n", readden); - else - todo_wine ok(readden == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes\n", readden); + todo_wine ok(readden == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes\n", readden); } else { - if (readden != sizeof(obuf) + sizeof(obuf2)) /* MacOS returns both messages */ - ok(readden == sizeof(obuf), "peek4 got %d bytes\n", readden); - else - todo_wine ok(readden == sizeof(obuf), "peek4 got %d bytes\n", readden); + ok(readden == sizeof(obuf), "peek4 got %d bytes\n", readden); } - if (avail != sizeof(obuf)) /* older Linux kernels only return the first write here */ - ok(avail == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes available\n", avail); + ok(avail == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes available\n", avail); pbuf = ibuf; ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "pipe content 4a check\n"); if (pipemode == PIPE_TYPE_BYTE && readden >= sizeof(obuf)+sizeof(obuf2)) { @@ -241,14 +226,8 @@ static void test_CreateNamedPipe(int pipemode) ok(WriteFile(hnp, obuf2, sizeof(obuf2), &written, NULL), " WriteFile5b\n"); ok(written == sizeof(obuf2), "write file len 3b\n"); ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek5\n"); - if (readden != sizeof(obuf) + sizeof(obuf2)) /* MacOS returns both writes */ - ok(readden == sizeof(obuf), "peek5 got %d bytes\n", readden); - else - todo_wine ok(readden == sizeof(obuf), "peek5 got %d bytes\n", readden); - if (avail != sizeof(obuf)) /* older Linux kernels only return the first write here */ - ok(avail == sizeof(obuf) + sizeof(obuf2), "peek5 got %d bytes available\n", avail); - else - todo_wine ok(avail == sizeof(obuf) + sizeof(obuf2), "peek5 got %d bytes available\n", avail); + ok(readden == sizeof(obuf), "peek5 got %d bytes\n", readden); + ok(avail == sizeof(obuf) + sizeof(obuf2), "peek5 got %d bytes available\n", avail); pbuf = ibuf; ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "content 5a check\n"); ok(ReadFile(hFile, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); @@ -277,12 +256,8 @@ static void test_CreateNamedPipe(int pipemode) ok(WriteFile(hFile, obuf2, sizeof(obuf2), &written, NULL), " WriteFile6b\n"); ok(written == sizeof(obuf2), "write file len 6b\n"); ok(PeekNamedPipe(hnp, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek6\n"); - if (readden != sizeof(obuf) + sizeof(obuf2)) /* MacOS returns both writes */ - ok(readden == sizeof(obuf), "peek6 got %d bytes\n", readden); - else - todo_wine ok(readden == sizeof(obuf), "peek6 got %d bytes\n", readden); - if (avail != sizeof(obuf)) /* older Linux kernels only return the first write here */ - ok(avail == sizeof(obuf) + sizeof(obuf2), "peek6b got %d bytes available\n", avail); + ok(readden == sizeof(obuf), "peek6 got %d bytes\n", readden); + ok(avail == sizeof(obuf) + sizeof(obuf2), "peek6b got %d bytes available\n", avail); pbuf = ibuf; ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "content 6a check\n"); ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n");

1 0

Gerald Pfeifer : ws2_32: Define fill_control_message only when it' s really used.
by Alexandre Julliard Aug. 21, 2014

Aug. 21, 2014

Module: wine Branch: master Commit: 7432a8588c321145f6b4341aff93d38a38b2851d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7432a8588c321145f6b4341af… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Aug 17 00:28:05 2014 +0200 ws2_32: Define fill_control_message only when it's really used. --- dlls/ws2_32/socket.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5900c8f..d5e9fd1 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -569,6 +569,7 @@ static const int ws_eai_map[][2] = static const char magic_loopback_addr[] = {127, 12, 34, 56}; #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS +#ifdef IP_PKTINFO static inline WSACMSGHDR *fill_control_message(int level, int type, WSACMSGHDR *current, ULONG *maxsize, void *data, int len) { ULONG msgsize = sizeof(WSACMSGHDR) + WSA_CMSG_ALIGN(len); @@ -586,6 +587,7 @@ static inline WSACMSGHDR *fill_control_message(int level, int type, WSACMSGHDR * /* Return the pointer to where next entry should go */ return (WSACMSGHDR *) (ptr + WSA_CMSG_ALIGN(len)); } +#endif /* IP_PKTINFO */ static inline int convert_control_headers(struct msghdr *hdr, WSABUF *control) {

1 0

Gerald Pfeifer : winex11.drv: Remove colour_is_brighter.
by Alexandre Julliard Aug. 21, 2014

Aug. 21, 2014

Module: wine Branch: master Commit: fe79e62a9f38316af8a78af3eb42a782ffb8eda2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe79e62a9f38316af8a78af3e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Aug 20 17:23:03 2014 +0200 winex11.drv: Remove colour_is_brighter. --- dlls/winex11.drv/palette.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index cd90885..cf049c5 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -782,12 +782,6 @@ static int X11DRV_SysPaletteLookupPixel( COLORREF col, BOOL skipReserved ) } -static inline BOOL colour_is_brighter(RGBQUAD c1, RGBQUAD c2) -{ - return (c1.rgbRed * c1.rgbRed + c1.rgbGreen * c1.rgbGreen + c1.rgbBlue * c1.rgbBlue) > - (c2.rgbRed * c2.rgbRed + c2.rgbGreen * c2.rgbGreen + c2.rgbBlue * c2.rgbBlue); -} - /*********************************************************************** * X11DRV_PALETTE_GetColor *

1 0

Jactry Zeng : riched20: Pass count of character into ME_WordBreakProc() instead of count of byte.
by Alexandre Julliard Aug. 21, 2014

Aug. 21, 2014

Module: wine Branch: master Commit: 063b3bc9dbe359611bbe4bc39245649a9576ef8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=063b3bc9dbe359611bbe4bc39… Author: Jactry Zeng <wine(a)jactry.com> Date: Wed Aug 20 16:11:52 2014 +0800 riched20: Pass count of character into ME_WordBreakProc() instead of count of byte. --- dlls/riched20/string.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index 12e4ad7..44726b3 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -125,8 +125,7 @@ ME_WordBreakProc(LPWSTR s, INT start, INT len, INT code) /* FIXME: Native also knows about punctuation */ TRACE("s==%s, start==%d, len==%d, code==%d\n", debugstr_wn(s, len), start, len, code); - /* convert number of bytes to number of characters. */ - len /= sizeof(WCHAR); + switch (code) { case WB_ISDELIMITER: @@ -154,7 +153,7 @@ int ME_CallWordBreakProc(ME_TextEditor *editor, WCHAR *str, INT len, INT start, INT code) { if (!editor->pfnWordBreak) { - return ME_WordBreakProc(str, start, len * sizeof(WCHAR), code); + return ME_WordBreakProc(str, start, len, code); } else if (!editor->bEmulateVersion10) { /* MSDN lied about the third parameter for EditWordBreakProc being the number * of characters, it is actually the number of bytes of the string. */

1 0

Zhenbo Li : mshtml: Added IHTMLStyle::listStyle property implementation.
by Alexandre Julliard Aug. 21, 2014

Aug. 21, 2014

Module: wine Branch: master Commit: bde260411c6710c03f6527220b363cd9a467d6e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bde260411c6710c03f6527220… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Wed Aug 20 21:35:43 2014 +0800 mshtml: Added IHTMLStyle::listStyle property implementation. --- dlls/mshtml/htmlstyle.c | 15 +++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 9c9c96e..aa19da7 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -128,6 +128,8 @@ static const WCHAR attrLetterSpacing[] = {'l','e','t','t','e','r','-','s','p','a','c','i','n','g',0}; static const WCHAR attrLineHeight[] = {'l','i','n','e','-','h','e','i','g','h','t',0}; +static const WCHAR attrListStyle[] = + {'l','i','s','t','-','s','t','y','l','e',0}; static const WCHAR attrListStyleType[] = {'l','i','s','t','-','s','t','y','l','e','-','t','y','p','e',0}; static const WCHAR attrListStylePosition[] = @@ -252,6 +254,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrLeft, DISPID_IHTMLSTYLE_LEFT}, {attrLetterSpacing, DISPID_IHTMLSTYLE_LETTERSPACING}, {attrLineHeight, DISPID_IHTMLSTYLE_LINEHEIGHT}, + {attrListStyle, DISPID_IHTMLSTYLE_LISTSTYLE}, {attrListStylePosition, DISPID_IHTMLSTYLE_LISTSTYLEPOSITION}, {attrListStyleType, DISPID_IHTMLSTYLE_LISTSTYLETYPE}, {attrMargin, DISPID_IHTMLSTYLE_MARGIN}, @@ -2241,15 +2244,19 @@ static HRESULT WINAPI HTMLStyle_get_listStyleImage(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_listStyle(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_style_attr(This, STYLEID_LIST_STYLE, v, 0); } static HRESULT WINAPI HTMLStyle_get_listStyle(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_style_attr(This, STYLEID_LIST_STYLE, p); } static HRESULT WINAPI HTMLStyle_put_whiteSpace(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 9b44a30..3c6bb6c 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -79,6 +79,7 @@ typedef enum { STYLEID_LEFT, STYLEID_LETTER_SPACING, STYLEID_LINE_HEIGHT, + STYLEID_LIST_STYLE, STYLEID_LISTSTYLEPOSITION, STYLEID_LISTSTYLETYPE, STYLEID_MARGIN, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 94226e1..5297246 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -59,6 +59,22 @@ static BSTR a2bstr(const char *str) return ret; } +static const WCHAR *strstr_wa(const WCHAR *str, const char *suba) +{ + BSTR sub; + const WCHAR *ret = NULL; + sub = a2bstr(suba); + while (*str) + { + const WCHAR *p1 = str, *p2 = sub; + while (*p1 && *p2 && *p1 == *p2) { p1++; p2++; } + if (!*p2) {ret = str; break;} + str++; + } + SysFreeString(sub); + return ret; +} + #define test_var_bstr(a,b) _test_var_bstr(__LINE__,a,b) static void _test_var_bstr(unsigned line, const VARIANT *v, const char *expect) { @@ -2194,6 +2210,24 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(str, "inside"), "listStyleType = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + str = a2bstr("decimal-leading-zero none inside"); + hres = IHTMLStyle_put_listStyle(style, str); + ok(hres == S_OK || broken(hres == E_INVALIDARG), /* win 2000 */ + "put_listStyle(%s) failed: %08x\n", wine_dbgstr_w(str), hres); + SysFreeString(str); + + if (hres != E_INVALIDARG) { + hres = IHTMLStyle_get_listStyle(style, &str); + ok(hres == S_OK, "get_listStyle failed: %08x\n", hres); + ok(strstr_wa(str, "decimal-leading-zero") == str && + strstr_wa(str, "none") != NULL && + strstr_wa(str, "inside") != NULL, + "listStyle = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } else { + win_skip("IHTMLStyle_put_listStyle already failed\n"); + } + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Henri Verbeet : wined3d: Use rendertarget views for color output instead of surfaces.
by Alexandre Julliard Aug. 21, 2014

Aug. 21, 2014

Module: wine Branch: master Commit: b005ad6f905dc0051b17ea45b3690e0662e48481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b005ad6f905dc0051b17ea45b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 21 09:55:55 2014 +0200 wined3d: Use rendertarget views for color output instead of surfaces. --- dlls/d3d10core/d3d10core_private.h | 2 + dlls/d3d10core/view.c | 3 +- dlls/d3d8/d3d8_private.h | 4 ++ dlls/d3d8/device.c | 26 ++++---- dlls/d3d8/surface.c | 47 ++++++++++++++ dlls/d3d8/texture.c | 25 ++++++++ dlls/d3d9/d3d9_private.h | 4 ++ dlls/d3d9/device.c | 12 ++-- dlls/d3d9/surface.c | 47 ++++++++++++++ dlls/d3d9/texture.c | 25 ++++++++ dlls/ddraw/ddraw.c | 20 +++--- dlls/ddraw/ddraw_private.h | 2 + dlls/ddraw/device.c | 10 +-- dlls/ddraw/surface.c | 68 +++++++++++++++++--- dlls/wined3d/arb_program_shader.c | 4 +- dlls/wined3d/context.c | 47 ++++++++------ dlls/wined3d/cs.c | 28 ++++----- dlls/wined3d/device.c | 123 ++++++++++++++++++++++--------------- dlls/wined3d/drawprim.c | 4 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 4 +- dlls/wined3d/state.c | 35 +++++------ dlls/wined3d/surface.c | 34 ++++++---- dlls/wined3d/texture.c | 4 +- dlls/wined3d/utils.c | 4 +- dlls/wined3d/view.c | 50 ++++++++++++++- dlls/wined3d/wined3d.spec | 9 ++- dlls/wined3d/wined3d_private.h | 33 ++++++++-- include/wine/wined3d.h | 15 +++-- 29 files changed, 512 insertions(+), 179 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b005ad6f905dc0051b17e…

1 0

Henri Verbeet : wined3d: Introduce struct wined3d_rendertarget_view_desc.
by Alexandre Julliard Aug. 21, 2014

Aug. 21, 2014

Module: wine Branch: master Commit: fb7135efd134cc45d4fff683afece7e1116c713b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb7135efd134cc45d4fff683a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 21 09:55:53 2014 +0200 wined3d: Introduce struct wined3d_rendertarget_view_desc. --- dlls/d3d10core/view.c | 68 ++++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/view.c | 42 ++++++++++++++++++++------ dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 8 +++++ include/wine/wined3d.h | 23 ++++++++++++-- 5 files changed, 129 insertions(+), 14 deletions(-) diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index e7aac3b..7394466 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -654,9 +654,73 @@ static const struct ID3D10RenderTargetViewVtbl d3d10_rendertarget_view_vtbl = d3d10_rendertarget_view_GetDesc, }; +static void wined3d_rendertarget_view_desc_from_d3d10core(struct wined3d_rendertarget_view_desc *wined3d_desc, + const D3D10_RENDER_TARGET_VIEW_DESC *desc) +{ + wined3d_desc->format_id = wined3dformat_from_dxgi_format(desc->Format); + + switch (desc->ViewDimension) + { + case D3D10_RTV_DIMENSION_BUFFER: + wined3d_desc->u.buffer.start_idx = desc->u.Buffer.ElementOffset; + wined3d_desc->u.buffer.count = desc->u.Buffer.ElementWidth; + break; + + case D3D10_RTV_DIMENSION_TEXTURE1D: + wined3d_desc->u.texture.level_idx = desc->u.Texture1D.MipSlice; + wined3d_desc->u.texture.layer_idx = 0; + wined3d_desc->u.texture.layer_count = 1; + break; + + case D3D10_RTV_DIMENSION_TEXTURE1DARRAY: + wined3d_desc->u.texture.level_idx = desc->u.Texture1DArray.MipSlice; + wined3d_desc->u.texture.layer_idx = desc->u.Texture1DArray.FirstArraySlice; + wined3d_desc->u.texture.layer_count = desc->u.Texture1DArray.ArraySize; + break; + + case D3D10_RTV_DIMENSION_TEXTURE2D: + wined3d_desc->u.texture.level_idx = desc->u.Texture2D.MipSlice; + wined3d_desc->u.texture.layer_idx = 0; + wined3d_desc->u.texture.layer_count = 1; + break; + + case D3D10_RTV_DIMENSION_TEXTURE2DARRAY: + wined3d_desc->u.texture.level_idx = desc->u.Texture2DArray.MipSlice; + wined3d_desc->u.texture.layer_idx = desc->u.Texture2DArray.FirstArraySlice; + wined3d_desc->u.texture.layer_count = desc->u.Texture2DArray.ArraySize; + break; + + case D3D10_RTV_DIMENSION_TEXTURE2DMS: + wined3d_desc->u.texture.level_idx = 0; + wined3d_desc->u.texture.layer_idx = 0; + wined3d_desc->u.texture.layer_count = 1; + break; + + case D3D10_RTV_DIMENSION_TEXTURE2DMSARRAY: + wined3d_desc->u.texture.level_idx = 0; + wined3d_desc->u.texture.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; + wined3d_desc->u.texture.layer_count = desc->u.Texture2DMSArray.ArraySize; + break; + + case D3D10_RTV_DIMENSION_TEXTURE3D: + wined3d_desc->u.texture.level_idx = desc->u.Texture3D.MipSlice; + wined3d_desc->u.texture.layer_idx = desc->u.Texture3D.FirstWSlice; + wined3d_desc->u.texture.layer_count = desc->u.Texture3D.WSize; + break; + + default: + FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); + wined3d_desc->u.texture.level_idx = 0; + wined3d_desc->u.texture.layer_idx = 0; + wined3d_desc->u.texture.layer_count = 1; + break; + } +} + HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, struct d3d10_device *device, ID3D10Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc) { + struct wined3d_rendertarget_view_desc wined3d_desc; struct wined3d_resource *wined3d_resource; HRESULT hr; @@ -680,8 +744,8 @@ HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, struc return E_FAIL; } - hr = wined3d_rendertarget_view_create(wined3d_resource, view, &view->wined3d_view); - if (FAILED(hr)) + wined3d_rendertarget_view_desc_from_d3d10core(&wined3d_desc, &view->desc); + if (FAILED(hr = wined3d_rendertarget_view_create(&wined3d_desc, wined3d_resource, view, &view->wined3d_view))) { WARN("Failed to create a wined3d rendertarget view, hr %#x.\n", hr); return hr; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index bfec1ef..7d9e742 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -63,30 +63,54 @@ struct wined3d_resource * CDECL wined3d_rendertarget_view_get_resource(const str } static void wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *view, - struct wined3d_resource *resource, void *parent) + const struct wined3d_rendertarget_view_desc *desc, struct wined3d_resource *resource, void *parent) { + const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; + view->refcount = 1; view->resource = resource; wined3d_resource_incref(resource); view->parent = parent; + + view->format = wined3d_get_format(gl_info, desc->format_id); + if (resource->type == WINED3D_RTYPE_BUFFER) + { + view->sub_resource_idx = 0; + view->buffer_offset = desc->u.buffer.start_idx; + view->width = desc->u.buffer.count; + view->height = 1; + view->depth = 1; + } + else + { + struct wined3d_texture *texture = wined3d_texture_from_resource(resource); + struct wined3d_resource *sub_resource; + + view->sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx; + sub_resource = wined3d_texture_get_sub_resource(texture, view->sub_resource_idx); + + view->buffer_offset = 0; + view->width = sub_resource->width; + view->height = sub_resource->height; + view->depth = desc->u.texture.layer_count; + } } -HRESULT CDECL wined3d_rendertarget_view_create(struct wined3d_resource *resource, - void *parent, struct wined3d_rendertarget_view **rendertarget_view) +HRESULT CDECL wined3d_rendertarget_view_create(const struct wined3d_rendertarget_view_desc *desc, + struct wined3d_resource *resource, void *parent, struct wined3d_rendertarget_view **view) { struct wined3d_rendertarget_view *object; - TRACE("resource %p, parent %p, rendertarget_view %p.\n", - resource, parent, rendertarget_view); + TRACE("desc %p, resource %p, parent %p, view %p.\n", + desc, resource, parent, view); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - wined3d_rendertarget_view_init(object, resource, parent); + wined3d_rendertarget_view_init(object, desc, resource, parent); TRACE("Created render target view %p.\n", object); - *rendertarget_view = object; + *view = object; return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e3baac2..722ad18 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -177,7 +177,7 @@ @ cdecl wined3d_resource_set_parent(ptr ptr) @ cdecl wined3d_resource_set_priority(ptr long) -@ cdecl wined3d_rendertarget_view_create(ptr ptr ptr) +@ cdecl wined3d_rendertarget_view_create(ptr ptr ptr ptr) @ cdecl wined3d_rendertarget_view_decref(ptr) @ cdecl wined3d_rendertarget_view_get_parent(ptr) @ cdecl wined3d_rendertarget_view_get_resource(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 16ae4c3..81cbb29 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2617,6 +2617,14 @@ struct wined3d_rendertarget_view struct wined3d_resource *resource; void *parent; + + const struct wined3d_format *format; + unsigned int sub_resource_idx; + unsigned int buffer_offset; + + unsigned int width; + unsigned int height; + unsigned int depth; }; struct wined3d_swapchain_ops diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2aacecb..216e8ab 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1934,6 +1934,25 @@ struct wined3d_buffer_desc UINT misc_flags; }; +struct wined3d_rendertarget_view_desc +{ + enum wined3d_format_id format_id; + union + { + struct + { + unsigned int start_idx; + unsigned int count; + } buffer; + struct + { + unsigned int level_idx; + unsigned int layer_idx; + unsigned int layer_count; + } texture; + } u; +}; + struct wined3d_shader_signature_element { const char *semantic_name; @@ -2357,8 +2376,8 @@ DWORD __cdecl wined3d_resource_get_priority(const struct wined3d_resource *resou void __cdecl wined3d_resource_set_parent(struct wined3d_resource *resource, void *parent); DWORD __cdecl wined3d_resource_set_priority(struct wined3d_resource *resource, DWORD priority); -HRESULT __cdecl wined3d_rendertarget_view_create(struct wined3d_resource *resource, - void *parent, struct wined3d_rendertarget_view **rendertarget_view); +HRESULT __cdecl wined3d_rendertarget_view_create(const struct wined3d_rendertarget_view_desc *desc, + struct wined3d_resource *resource, void *parent, struct wined3d_rendertarget_view **view); ULONG __cdecl wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *view); void * __cdecl wined3d_rendertarget_view_get_parent(const struct wined3d_rendertarget_view *view); struct wined3d_resource * __cdecl wined3d_rendertarget_view_get_resource(const struct wined3d_rendertarget_view *view);

1 0

Gerald Pfeifer : winex11.drv: Remove wxr_color_shifts.
by Alexandre Julliard Aug. 21, 2014

Aug. 21, 2014

Module: wine Branch: master Commit: b0e508a9d3475a0231267b33d7206629dadb9fe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0e508a9d3475a0231267b33d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Aug 20 17:16:34 2014 +0200 winex11.drv: Remove wxr_color_shifts. --- dlls/winex11.drv/xrender.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index ca2d3da..d2a1c45 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -102,23 +102,6 @@ static const WineXRenderFormatTemplate wxr_formats_template[WXR_NB_FORMATS] = /* WXR_FORMAT_B8G8R8X8 */ { 32, 0, 0, 8, 0xff, 16, 0xff, 24, 0xff }, }; -static const ColorShifts wxr_color_shifts[WXR_NB_FORMATS] = -{ - /* format phys red phys green phys blue log red log green log blue */ -/* WXR_FORMAT_MONO */ { { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 } }, -/* WXR_FORMAT_GRAY */ { { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 } }, -/* WXR_FORMAT_X1R5G5B5 */ { {10,5,31}, { 5,5,31}, { 0,5,31}, {10,5,31}, { 5,5,31}, { 0,5,31} }, -/* WXR_FORMAT_X1B5G5R5 */ { { 0,5,31}, { 5,5,31}, {10,5,31}, { 0,5,31}, { 5,5,31}, {10,5,31} }, -/* WXR_FORMAT_R5G6B5 */ { {11,5,31}, { 5,6,63}, { 0,5,31}, {11,5,31}, { 5,6,63}, { 0,5,31} }, -/* WXR_FORMAT_B5G6R5 */ { { 0,5,31}, { 5,6,63}, {11,5,31}, { 0,5,31}, { 5,6,63}, {11,5,31} }, -/* WXR_FORMAT_R8G8B8 */ { {16,8,255}, { 8,8,255}, { 0,8,255}, {16,8,255}, { 8,8,255}, { 0,8,255} }, -/* WXR_FORMAT_B8G8R8 */ { { 0,8,255}, { 8,8,255}, {16,8,255}, { 0,8,255}, { 8,8,255}, {16,8,255} }, -/* WXR_FORMAT_A8R8G8B8 */ { {16,8,255}, { 8,8,255}, { 0,8,255}, {16,8,255}, { 8,8,255}, { 0,8,255} }, -/* WXR_FORMAT_B8G8R8A8 */ { { 8,8,255}, {16,8,255}, {24,8,255}, { 8,8,255}, {16,8,255}, {24,8,255} }, -/* WXR_FORMAT_X8R8G8B8 */ { {16,8,255}, { 8,8,255}, { 0,8,255}, {16,8,255}, { 8,8,255}, { 0,8,255} }, -/* WXR_FORMAT_B8G8R8X8 */ { { 8,8,255}, {16,8,255}, {24,8,255}, { 8,8,255}, {16,8,255}, {24,8,255} }, -}; - static enum wxr_format default_format = WXR_INVALID_FORMAT; static XRenderPictFormat *pict_formats[WXR_NB_FORMATS + 1 /* invalid format */];

1 0

Gerald Pfeifer : uninstaller: Remove BackSlashW.
by Alexandre Julliard Aug. 21, 2014

Aug. 21, 2014

Module: wine Branch: master Commit: 1f140313348e1227afc70057f5a9e7f9ca810b5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f140313348e1227afc70057f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Aug 20 17:20:37 2014 +0200 uninstaller: Remove BackSlashW. --- programs/uninstaller/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 0a60c93..6b16e5d 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -49,7 +49,6 @@ static int FetchUninstallInformation(void); static void UninstallProgram(void); static int cmp_by_name(const void *a, const void *b); -static const WCHAR BackSlashW[] = { '\\', 0 }; static const WCHAR DisplayNameW[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; static const WCHAR PathUninstallW[] = { 'S','o','f','t','w','a','r','e','\\',

1 0