December 2016 - Wine-commits

Alexandre Julliard : Release 2.0-rc1.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: 4c7f3f8af856888f5ab020b2a32d0b01db0c82f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c7f3f8af856888f5ab020b2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 20:35:07 2016 +0100 Release 2.0-rc1. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 578 +++++++++++++++++++++++++++++++++++--------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 340 insertions(+), 262 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c7f3f8af856888f5ab02…

1 0

Tag wine-2.0-rc1 : Alexandre Julliard : Release 2.0-rc1
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: refs/tags/wine-2.0-rc1 Tag: bdcc805088ebcf676e16c83fb163c2dd80936ce5 URL: http://source.winehq.org/git/wine.git/?a=tag;h=bdcc805088ebcf676e16c83fb163… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 20:35:07 2016 +0100 Release 2.0-rc1

1 0

Nikolay Sivov : ws2_32: Fix build failure on Mac.
by Alexandre Julliard 09 Dec '16

09 Dec '16

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

Bruno Jesus : xinput1_3/tests: Improve vibration tests.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: 4989d8727f91c6b730c8be94fc5341d198c179cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4989d8727f91c6b730c8be94f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Dec 9 05:26:08 2016 -0200 xinput1_3/tests: Improve vibration tests. Specially the part to disable the vibration after the test. Manually tested on Windows 8. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index eb0bab3..0deab26 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -54,22 +54,35 @@ static void test_set_state(void) { ZeroMemory(&vibrator, sizeof(XINPUT_VIBRATION)); + vibrator.wLeftMotorSpeed = 32767; + vibrator.wRightMotorSpeed = 32767; + result = pXInputSetState(controllerNum, &vibrator); + if (result == ERROR_DEVICE_NOT_CONNECTED) continue; + + Sleep(250); vibrator.wLeftMotorSpeed = 0; vibrator.wRightMotorSpeed = 0; result = pXInputSetState(controllerNum, &vibrator); - ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputSetState failed with (%d)\n", result); + ok(result == ERROR_SUCCESS, "XInputSetState failed with (%d)\n", result); /* Disabling XInput here, queueing a vibration and then re-enabling XInput * is used to prove that vibrations are auto enabled when resuming XInput. - * If XInputEnable is removed the vibration will never play. */ + * If XInputEnable(1) is removed below the vibration will never play. */ if (pXInputEnable) pXInputEnable(0); + Sleep(250); vibrator.wLeftMotorSpeed = 65535; vibrator.wRightMotorSpeed = 65535; result = pXInputSetState(controllerNum, &vibrator); - ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputSetState failed with (%d)\n", result); + ok(result == ERROR_SUCCESS, "XInputSetState failed with (%d)\n", result); if (pXInputEnable) pXInputEnable(1); + Sleep(250); + + vibrator.wLeftMotorSpeed = 0; + vibrator.wRightMotorSpeed = 0; + result = pXInputSetState(controllerNum, &vibrator); + ok(result == ERROR_SUCCESS, "XInputSetState failed with (%d)\n", result); } result = pXInputSetState(XUSER_MAX_COUNT+1, &vibrator);

1 0

Bruno Jesus : xinput1_1: Prefer builtin DLL.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: d923087c2dc7ee4cac280ed39414ab3c8581cd51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d923087c2dc7ee4cac280ed39… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Dec 9 06:49:03 2016 -0200 xinput1_1: Prefer builtin DLL. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_1/Makefile.in | 3 --- dlls/xinput1_1/xinput1_1_main.c | 37 ------------------------------------- 2 files changed, 40 deletions(-) diff --git a/dlls/xinput1_1/Makefile.in b/dlls/xinput1_1/Makefile.in index 364c9db..fc341d1 100644 --- a/dlls/xinput1_1/Makefile.in +++ b/dlls/xinput1_1/Makefile.in @@ -1,6 +1,3 @@ MODULE = xinput1_1.dll -C_SRCS = \ - xinput1_1_main.c - RC_SRCS = version.rc diff --git a/dlls/xinput1_1/xinput1_1_main.c b/dlls/xinput1_1/xinput1_1_main.c deleted file mode 100644 index 2de4317..0000000 --- a/dlls/xinput1_1/xinput1_1_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 09 Dec '16

09 Dec '16

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

Bruno Jesus : xinput1_4: Prefer builtin DLL.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: 2d7e13503cafa3356a66a582cbdb478a0146aeba URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d7e13503cafa3356a66a582c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Dec 9 06:49:05 2016 -0200 xinput1_4: Prefer builtin DLL. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_4/Makefile.in | 3 --- dlls/xinput1_4/xinput1_4_main.c | 37 ------------------------------------- 2 files changed, 40 deletions(-) diff --git a/dlls/xinput1_4/Makefile.in b/dlls/xinput1_4/Makefile.in index 43d1812..f881d19 100644 --- a/dlls/xinput1_4/Makefile.in +++ b/dlls/xinput1_4/Makefile.in @@ -1,6 +1,3 @@ MODULE = xinput1_4.dll -C_SRCS = \ - xinput1_4_main.c - RC_SRCS = version.rc diff --git a/dlls/xinput1_4/xinput1_4_main.c b/dlls/xinput1_4/xinput1_4_main.c deleted file mode 100644 index f91a3c5..0000000 --- a/dlls/xinput1_4/xinput1_4_main.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * The Wine project - Xinput Joystick Library - * Copyright 2013 André Hentschel - * - * 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 : xinput9_1_0: Prefer builtin DLL.
by Alexandre Julliard 09 Dec '16

09 Dec '16

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

Lauri Kenttä : user32/tests: Add tests for LockWindowUpdate.
by Alexandre Julliard 09 Dec '16

09 Dec '16

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

Józef Kucia : wined3d: Allow creating raw unordered access views.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: 9d5eb9a2409514ec3aae0401d851e4d6324d1503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d5eb9a2409514ec3aae0401d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:36 2016 +0100 wined3d: Allow creating raw unordered access 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 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 50c43f4..ef602de 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -566,13 +566,18 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces 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; } - if (resource->type != WINED3D_RTYPE_BUFFER) + if (resource->type == WINED3D_RTYPE_BUFFER) + { + FIXME("Buffer unordered access views not supported.\n"); + } + else { struct wined3d_texture *texture = texture_from_resource(resource); unsigned int depth_or_layer_count;

1 0