December 2016 - Wine-Commits

Nikolay Sivov : xmllite: Add maintainer entry.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 831c202c38e97730c5446b95c8a542714febd99b URL: http://source.winehq.org/git/wine.git/?a=commit;h=831c202c38e97730c5446b95c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:34 2016 +0300 xmllite: Add maintainer entry. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 + dlls/xmllite/reader.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 55a7834..cec6cdb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -265,6 +265,7 @@ F: dlls/winex11.drv/ XML parsing M: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/msxml*/ +F: dlls/xmllite/ THE REST M: Alexandre Julliard <julliard(a)winehq.org> diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 2dadfa2..0fedd91 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1,7 +1,7 @@ /* * IXmlReader implementation * - * Copyright 2010, 2012-2013 Nikolay Sivov + * Copyright 2010, 2012-2013, 2016 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

Nikolay Sivov : xmllite: Improve GetValue() for namespace definition nodes.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 20c575e81fdf2038a37eae2ac9bdb809a2542de8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20c575e81fdf2038a37eae2ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:30 2016 +0300 xmllite: Improve GetValue() for namespace definition nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 24a061c..47649f5 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -3002,6 +3002,18 @@ static HRESULT WINAPI xmlreader_GetPrefix(IXmlReader* iface, LPCWSTR *prefix, UI return S_OK; } +static BOOL is_namespace_definition(xmlreader *reader) +{ + const strval *local = &reader->strvalues[StringValue_LocalName]; + const strval *prefix = &reader->strvalues[StringValue_Prefix]; + + if (reader_get_nodetype(reader) != XmlNodeType_Attribute) + return FALSE; + + return ((strval_eq(reader, prefix, &strval_empty) && strval_eq(reader, local, &strval_xmlns)) || + strval_eq(reader, prefix, &strval_xmlns)); +} + static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, UINT *len) { xmlreader *reader = impl_from_IXmlReader(iface); @@ -3032,6 +3044,18 @@ static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, val->str = ptr; } + /* For namespace definition attributes return values from namespace list */ + if (is_namespace_definition(reader)) { + const strval *local = &reader->strvalues[StringValue_LocalName]; + struct ns *ns; + + ns = reader_lookup_ns(reader, local); + if (!ns) + ns = reader_lookup_nsdef(reader); + + val = &ns->uri; + } + *value = val->str; if (len) *len = val->len; return S_OK;

1 0

Józef Kucia : wined3d: Do not try to create texture views for depth slices.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: b76f39936f8ae3da33c29424477ca0ba817822c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b76f39936f8ae3da33c294244… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:44 2016 +0100 wined3d: Do not try to create texture views for depth slices. 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/view.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 237122d..27ee9d2 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -65,6 +65,7 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target const struct wined3d_format *view_format) { const struct wined3d_gl_info *gl_info; + unsigned int layer_idx, layer_count; struct wined3d_context *context; struct gl_texture *gl_texture; @@ -83,10 +84,19 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target wined3d_texture_prepare_texture(texture, context, FALSE); gl_texture = wined3d_texture_get_gl_texture(texture, FALSE); + layer_idx = desc->u.texture.layer_idx; + layer_count = desc->u.texture.layer_count; + if (view_target == GL_TEXTURE_3D && (layer_idx || layer_count != 1)) + { + FIXME("Depth slice (%u-%u) not supported.\n", layer_idx, layer_count); + layer_idx = 0; + layer_count = 1; + } + gl_info->gl_ops.gl.p_glGenTextures(1, &view->name); GL_EXTCALL(glTextureView(view->name, view->target, gl_texture->name, view_format->glInternal, desc->u.texture.level_idx, desc->u.texture.level_count, - desc->u.texture.layer_idx, desc->u.texture.layer_count)); + layer_idx, layer_count)); checkGLcall("Create texture view"); if (is_stencil_view_format(view_format))

1 0

Józef Kucia : wined3d: Generate declaration for typed buffer UAVs.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: bdccf5e1e0930e8354426af5cd36cb5a716d68d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdccf5e1e0930e8354426af5c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:38 2016 +0100 wined3d: Generate declaration for typed buffer UAVs. 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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 627832c..a800939 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2123,6 +2123,10 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont switch (reg_maps->uav_resource_info[i].type) { + case WINED3D_SHADER_RESOURCE_BUFFER: + image_type = "imageBuffer"; + break; + case WINED3D_SHADER_RESOURCE_TEXTURE_2D: image_type = "image2D"; break;

1 0

Józef Kucia : wined3d: Allow creating raw shader resource views.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: c5719b4fc4bb6a2b3e0985eb2c153d3dddf67388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5719b4fc4bb6a2b3e0985eb2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:37 2016 +0100 wined3d: Allow creating raw shader resource views. 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/view.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index ef602de..adbd159 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -375,7 +375,8 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ const struct wined3d_format *view_format; view_format = wined3d_get_format(gl_info, desc->format_id); - if (wined3d_format_is_typeless(view_format)) + if (wined3d_format_is_typeless(view_format) + && !(view_format->id == WINED3DFMT_R32_TYPELESS && (desc->flags & WINED3D_VIEW_BUFFER_RAW))) { WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(view_format->id)); return E_INVALIDARG;

1 0

Lauri Kenttä : user32/tests: Add tests for LockWindowUpdate.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 26be29138f71fe6a937ef35b0d77be7630d2f0b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26be29138f71fe6a937ef35b0… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Dec 8 20:49:18 2016 +0200 user32/tests: Add tests for LockWindowUpdate. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 428a88f..375d387 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9325,6 +9325,76 @@ todo_wine ok(ret, "got %d\n", ret); } +static void test_LockWindowUpdate(HWND parent) +{ + typedef struct + { + HWND hwnd_lock, hwnd_draw; + BOOL allow_drawing; + BOOL expect_valid; + } TEST; + + int i; + HWND child = CreateWindowA("static", 0, WS_CHILD | WS_VISIBLE, 0, 0, 20, 20, parent, 0, 0, 0); + + TEST tests[] = { + {child, child, 0, 0}, + {child, child, 1, 1}, + {child, parent, 0, 1}, + {child, parent, 1, 1}, + {parent, child, 0, 0}, + {parent, child, 1, 1}, + {parent, parent, 0, 0}, + {parent, parent, 1, 1} + }; + + if (!child) + { + skip("CreateWindow failed, skipping LockWindowUpdate tests\n"); + return; + } + + ShowWindow(parent, SW_SHOW); + UpdateWindow(parent); + flush_events(TRUE); + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + { + HDC hdc; + POINT p = {10, 10}; + BOOL ret; + const DWORD dc_flags = DCX_USESTYLE | (tests[i].allow_drawing ? DCX_LOCKWINDOWUPDATE : 0); + const COLORREF c1 = 0x111100, c2 = 0x222200; + + trace("hwnd_lock = %s, hwnd_draw = %s, allow_drawing = %d\n", + tests[i].hwnd_lock == parent ? "parent" : "child", + tests[i].hwnd_draw == parent ? "parent" : "child", + tests[i].allow_drawing); + + hdc = GetDCEx(tests[i].hwnd_draw, 0, dc_flags); + +#define TEST_PIXEL(c_valid, c_invalid) \ + do { \ + COLORREF c = GetPixel(hdc, p.x, p.y); \ + COLORREF e = tests[i].expect_valid ? (c_valid) : (c_invalid); \ + todo_wine_if(!tests[i].expect_valid) \ + ok(c == e, "GetPixel: got %08x, expected %08x\n", c, e); \ + } while (0) + + SetPixel(hdc, p.x, p.y, c1); + ret = LockWindowUpdate(tests[i].hwnd_lock); + ok(ret, "LockWindowUpdate failed\n"); + TEST_PIXEL(c1, CLR_INVALID); + SetPixel(hdc, p.x, p.y, c2); + TEST_PIXEL(c2, CLR_INVALID); + LockWindowUpdate(0); + TEST_PIXEL(c2, c1); + ReleaseDC(tests[i].hwnd_draw, hdc); +#undef TEST_PIXEL + } + DestroyWindow(child); +} + START_TEST(win) { char **argv; @@ -9470,6 +9540,7 @@ START_TEST(win) test_activateapp(hwndMain); test_winproc_handles(argv[0]); test_deferwindowpos(); + test_LockWindowUpdate(hwndMain); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook);

1 0

Bruno Jesus : xinput9_1_0: Prefer builtin DLL.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: c0f77b4a4a2a389f54c3572156883eec6d6314d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0f77b4a4a2a389f54c357215… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Dec 9 06:49:06 2016 -0200 xinput9_1_0: Prefer builtin DLL. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput9_1_0/Makefile.in | 3 --- dlls/xinput9_1_0/xinput9_1_0_main.c | 37 ------------------------------------- 2 files changed, 40 deletions(-) diff --git a/dlls/xinput9_1_0/Makefile.in b/dlls/xinput9_1_0/Makefile.in index df8a574..0c4b7e7 100644 --- a/dlls/xinput9_1_0/Makefile.in +++ b/dlls/xinput9_1_0/Makefile.in @@ -1,6 +1,3 @@ MODULE = xinput9_1_0.dll -C_SRCS = \ - xinput9_1_0_main.c - RC_SRCS = version.rc diff --git a/dlls/xinput9_1_0/xinput9_1_0_main.c b/dlls/xinput9_1_0/xinput9_1_0_main.c deleted file mode 100644 index 2de4317..0000000 --- a/dlls/xinput9_1_0/xinput9_1_0_main.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * The Wine project - Xinput Joystick Library - * Copyright 2008 Andrew Fenn - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -}

1 0

Bruno Jesus : xinput1_2: Prefer builtin DLL.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 07258c7d4b5143b0a33db933d71882bfbcfc3e55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07258c7d4b5143b0a33db933d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Dec 9 06:49:04 2016 -0200 xinput1_2: Prefer builtin DLL. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_2/Makefile.in | 3 --- dlls/xinput1_2/xinput1_2_main.c | 37 ------------------------------------- 2 files changed, 40 deletions(-) diff --git a/dlls/xinput1_2/Makefile.in b/dlls/xinput1_2/Makefile.in index 3eaec14..16fed94 100644 --- a/dlls/xinput1_2/Makefile.in +++ b/dlls/xinput1_2/Makefile.in @@ -1,6 +1,3 @@ MODULE = xinput1_2.dll -C_SRCS = \ - xinput1_2_main.c - RC_SRCS = version.rc diff --git a/dlls/xinput1_2/xinput1_2_main.c b/dlls/xinput1_2/xinput1_2_main.c deleted file mode 100644 index 2de4317..0000000 --- a/dlls/xinput1_2/xinput1_2_main.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * The Wine project - Xinput Joystick Library - * Copyright 2008 Andrew Fenn - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -}

1 0

Nikolay Sivov : ws2_32: Fix build failure on Mac.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 24dbd9de9374e26721ddfb0e2cfedb504189e1d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24dbd9de9374e26721ddfb0e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 08:11:49 2016 +0300 ws2_32: Fix build failure on Mac. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3cdeade..6bf3c9d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1230,7 +1230,7 @@ static BOOL get_dont_fragment(SOCKET s, int level, BOOL *out) static int once; if (!once++) FIXME("IP_DONTFRAGMENT for IPv6 not supported in this platform\n"); - return TRUE /* fake success */ + return TRUE; /* fake success */ #endif }

1 0

Huw Davies : windowscodecs: Fix typo in 2 bpp conversion.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: a531ade2fdaa21571b0adeb01c9b17b67ed92850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a531ade2fdaa21571b0adeb01… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 9 14:38:04 2016 +0000 windowscodecs: Fix typo in 2 bpp conversion. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/converter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index e5bce44..e5d61e1 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -257,7 +257,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe *dstpixel++ = colors[srcval>>6]; if (x+1 < prc->Width) *dstpixel++ = colors[srcval>>4&0x3]; if (x+2 < prc->Width) *dstpixel++ = colors[srcval>>2&0x3]; - if (x+1 < prc->Width) *dstpixel++ = colors[srcval&0x3]; + if (x+3 < prc->Width) *dstpixel++ = colors[srcval&0x3]; } srcrow += srcstride; dstrow += cbStride;

1 0