October 2019 - Wine-Commits

Louis Lenders : uianimation: Add IUIAnimationManager stubbed interface.
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: d76d65d5b41ea37e96035f60c774a01461890bb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d76d65d5b41ea37e96035f60… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Oct 23 23:26:53 2019 +0000 uianimation: Add IUIAnimationManager stubbed interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uianimation/Makefile.in | 1 + dlls/uianimation/main.c | 316 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 315 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d76d65d5b41ea37e9603…

1 0

Alistair Leslie-Hughes : uianimation/tests: Add initial tests.
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: 37e4ff85d4d5a3a6f8b9ee661fe063222a5a0710 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37e4ff85d4d5a3a6f8b9ee66… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 24 00:27:08 2019 +0000 uianimation/tests: Add initial tests. Added win_skip for WinXP failure. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/uianimation/tests/Makefile.in | 5 +++ dlls/uianimation/tests/uianimation.c | 62 ++++++++++++++++++++++++++++++++++++ 4 files changed, 69 insertions(+) diff --git a/configure b/configure index f44d4d5b6f..f395fe6ef4 100755 --- a/configure +++ b/configure @@ -20860,6 +20860,7 @@ wine_fn_config_makefile dlls/tzres enable_tzres wine_fn_config_makefile dlls/ucrtbase enable_ucrtbase wine_fn_config_makefile dlls/ucrtbase/tests enable_tests wine_fn_config_makefile dlls/uianimation enable_uianimation +wine_fn_config_makefile dlls/uianimation/tests enable_tests wine_fn_config_makefile dlls/uiautomationcore enable_uiautomationcore wine_fn_config_makefile dlls/uiautomationcore/tests enable_tests wine_fn_config_makefile dlls/uiribbon enable_uiribbon diff --git a/configure.ac b/configure.ac index b9339b90aa..31aac11d31 100644 --- a/configure.ac +++ b/configure.ac @@ -3713,6 +3713,7 @@ WINE_CONFIG_MAKEFILE(dlls/tzres) WINE_CONFIG_MAKEFILE(dlls/ucrtbase) WINE_CONFIG_MAKEFILE(dlls/ucrtbase/tests) WINE_CONFIG_MAKEFILE(dlls/uianimation) +WINE_CONFIG_MAKEFILE(dlls/uianimation/tests) WINE_CONFIG_MAKEFILE(dlls/uiautomationcore) WINE_CONFIG_MAKEFILE(dlls/uiautomationcore/tests) WINE_CONFIG_MAKEFILE(dlls/uiribbon) diff --git a/dlls/uianimation/tests/Makefile.in b/dlls/uianimation/tests/Makefile.in new file mode 100644 index 0000000000..ec1118c2fc --- /dev/null +++ b/dlls/uianimation/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = uianimation.dll +IMPORTS = ole32 + +C_SRCS = \ + uianimation.c diff --git a/dlls/uianimation/tests/uianimation.c b/dlls/uianimation/tests/uianimation.c new file mode 100644 index 0000000000..0cb2fbf2b8 --- /dev/null +++ b/dlls/uianimation/tests/uianimation.c @@ -0,0 +1,62 @@ +/* + * UI Animation tests + * + * Copyright 2019 Alistair Leslie-Hughes + * + * 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 + */ + +#define COBJMACROS + +#include "windows.h" +#include "initguid.h" +#include "uianimation.h" + +#include "wine/test.h" + +static void test_UIAnimationManager(void) +{ + HRESULT hr; + IUIAnimationManager *manager; + IUIAnimationVariable *variable; + + hr = CoCreateInstance( &CLSID_UIAnimationManager, NULL, CLSCTX_ALL, &IID_IUIAnimationManager, (LPVOID*)&manager); + if(FAILED(hr)) + { + win_skip("UIAnimationManager not found\n"); + return; + } + + hr = IUIAnimationManager_CreateAnimationVariable(manager, 1.0f, &variable); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + IUIAnimationVariable_Release(variable); + + IUIAnimationManager_Release(manager); +} + +START_TEST(uianimation) +{ + HRESULT hr; + + hr = CoInitialize(0); + ok(hr == S_OK, "failed to init com\n"); + if(hr != S_OK) + return; + + test_UIAnimationManager(); + + CoUninitialize(); +}

1 0

Sven Baars : ntdll/tests: Fix some test failures on Windows 10.
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: e8f4251423e9be35ae55174447732b53b6745de3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8f4251423e9be35ae551744… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Oct 26 14:56:39 2019 +0200 ntdll/tests: Fix some test failures on Windows 10. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 64c39f0940..30ed6e5ef9 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1864,8 +1864,10 @@ static void test_readvirtualmemory(void) /* illegal local address */ status = pNtReadVirtualMemory(process, teststring, (void *)0x1234, 12, &readcount); - ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status); - ok( readcount == 0, "Expected to read 0 bytes, got %ld\n",readcount); + ok( status == STATUS_ACCESS_VIOLATION || broken(status == STATUS_PARTIAL_COPY) /* Win10 */, + "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status); + if (status == STATUS_ACCESS_VIOLATION) + ok( readcount == 0, "Expected to read 0 bytes, got %ld\n",readcount); CloseHandle(process); }

1 0

Michael Müller : crypt32: Add MS root CA 2010.
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: 5b62f89baa82daecd430897de0bb5cab32c5fc5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b62f89baa82daecd430897d… Author: Michael Müller <michael(a)fds-team> Date: Sun Oct 27 11:16:45 2019 +0100 crypt32: Add MS root CA 2010. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47626 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/rootstore.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 706ec75285..f795181bcf 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -652,6 +652,103 @@ static const BYTE rootcertauthority[] = { 0x7e,0x6c,0x9e,0xdb,0x73,0x13,0x64,0x62,0x69,0xa5,0x2f,0x7d,0xca,0x96,0x6d,0x9f, 0xf8,0x04,0x4d,0x30,0x92,0x3d,0x6e,0x21,0x14,0x21,0xc9,0x3d,0xe0,0xc3,0xfd,0x8a, 0x6b,0x9d,0x4a,0xfd,0xd1,0xa1,0x9d,0x99,0x43,0x77,0x3f,0xb0,0xda }; +static const BYTE rootcertauthority2010[] = { +0x30,0x82,0x05,0xed,0x30,0x82,0x03,0xd5,0xa0,0x03,0x02,0x01,0x02,0x02,0x10,0x28, +0xcc,0x3a,0x25,0xbf,0xba,0x44,0xac,0x44,0x9a,0x9b,0x58,0x6b,0x43,0x39,0xaa,0x30, +0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x0b,0x05,0x00,0x30,0x81, +0x88,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x13, +0x30,0x11,0x06,0x03,0x55,0x04,0x08,0x13,0x0a,0x57,0x61,0x73,0x68,0x69,0x6e,0x67, +0x74,0x6f,0x6e,0x31,0x10,0x30,0x0e,0x06,0x03,0x55,0x04,0x07,0x13,0x07,0x52,0x65, +0x64,0x6d,0x6f,0x6e,0x64,0x31,0x1e,0x30,0x1c,0x06,0x03,0x55,0x04,0x0a,0x13,0x15, +0x4d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66,0x74,0x20,0x43,0x6f,0x72,0x70,0x6f,0x72, +0x61,0x74,0x69,0x6f,0x6e,0x31,0x32,0x30,0x30,0x06,0x03,0x55,0x04,0x03,0x13,0x29, +0x4d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66,0x74,0x20,0x52,0x6f,0x6f,0x74,0x20,0x43, +0x65,0x72,0x74,0x69,0x66,0x69,0x63,0x61,0x74,0x65,0x20,0x41,0x75,0x74,0x68,0x6f, +0x72,0x69,0x74,0x79,0x20,0x32,0x30,0x31,0x30,0x30,0x1e,0x17,0x0d,0x31,0x30,0x30, +0x36,0x32,0x33,0x32,0x31,0x35,0x37,0x32,0x34,0x5a,0x17,0x0d,0x33,0x35,0x30,0x36, +0x32,0x33,0x32,0x32,0x30,0x34,0x30,0x31,0x5a,0x30,0x81,0x88,0x31,0x0b,0x30,0x09, +0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x13,0x30,0x11,0x06,0x03,0x55, +0x04,0x08,0x13,0x0a,0x57,0x61,0x73,0x68,0x69,0x6e,0x67,0x74,0x6f,0x6e,0x31,0x10, +0x30,0x0e,0x06,0x03,0x55,0x04,0x07,0x13,0x07,0x52,0x65,0x64,0x6d,0x6f,0x6e,0x64, +0x31,0x1e,0x30,0x1c,0x06,0x03,0x55,0x04,0x0a,0x13,0x15,0x4d,0x69,0x63,0x72,0x6f, +0x73,0x6f,0x66,0x74,0x20,0x43,0x6f,0x72,0x70,0x6f,0x72,0x61,0x74,0x69,0x6f,0x6e, +0x31,0x32,0x30,0x30,0x06,0x03,0x55,0x04,0x03,0x13,0x29,0x4d,0x69,0x63,0x72,0x6f, +0x73,0x6f,0x66,0x74,0x20,0x52,0x6f,0x6f,0x74,0x20,0x43,0x65,0x72,0x74,0x69,0x66, +0x69,0x63,0x61,0x74,0x65,0x20,0x41,0x75,0x74,0x68,0x6f,0x72,0x69,0x74,0x79,0x20, +0x32,0x30,0x31,0x30,0x30,0x82,0x02,0x22,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86, +0xf7,0x0d,0x01,0x01,0x01,0x05,0x00,0x03,0x82,0x02,0x0f,0x00,0x30,0x82,0x02,0x0a, +0x02,0x82,0x02,0x01,0x00,0xb9,0x08,0x9e,0x28,0xe4,0xe4,0xec,0x06,0x4e,0x50,0x68, +0xb3,0x41,0xc5,0x7b,0xeb,0xae,0xb6,0x8e,0xaf,0x81,0xba,0x22,0x44,0x1f,0x65,0x34, +0x69,0x4c,0xbe,0x70,0x40,0x17,0xf2,0x16,0x7b,0xe2,0x79,0xfd,0x86,0xed,0x0d,0x39, +0xf4,0x1b,0xa8,0xad,0x92,0x90,0x1e,0xcb,0x3d,0x76,0x8f,0x5a,0xd9,0xb5,0x91,0x10, +0x2e,0x3c,0x05,0x8d,0x8a,0x6d,0x24,0x54,0xe7,0x1f,0xed,0x56,0xad,0x83,0xb4,0x50, +0x9c,0x15,0xa5,0x17,0x74,0x88,0x59,0x20,0xfc,0x08,0xc5,0x84,0x76,0xd3,0x68,0xd4, +0x6f,0x28,0x78,0xce,0x5c,0xb8,0xf3,0x50,0x90,0x44,0xff,0xe3,0x63,0x5f,0xbe,0xa1, +0x9a,0x2c,0x96,0x15,0x04,0xd6,0x07,0xfe,0x1e,0x84,0x21,0xe0,0x42,0x31,0x11,0xc4, +0x28,0x36,0x94,0xcf,0x50,0xa4,0x62,0x9e,0xc9,0xd6,0xab,0x71,0x00,0xb2,0x5b,0x0c, +0xe6,0x96,0xd4,0x0a,0x24,0x96,0xf5,0xff,0xc6,0xd5,0xb7,0x1b,0xd7,0xcb,0xb7,0x21, +0x62,0xaf,0x12,0xdc,0xa1,0x5d,0x37,0xe3,0x1a,0xfb,0x1a,0x46,0x98,0xc0,0x9b,0xc0, +0xe7,0x63,0x1f,0x2a,0x08,0x93,0x02,0x7e,0x1e,0x6a,0x8e,0xf2,0x9f,0x18,0x89,0xe4, +0x22,0x85,0xa2,0xb1,0x84,0x57,0x40,0xff,0xf5,0x0e,0xd8,0x6f,0x9c,0xed,0xe2,0x45, +0x31,0x01,0xcd,0x17,0xe9,0x7f,0xb0,0x81,0x45,0xe3,0xaa,0x21,0x40,0x26,0xa1,0x72, +0xaa,0xa7,0x4f,0x3c,0x01,0x05,0x7e,0xee,0x83,0x58,0xb1,0x5e,0x06,0x63,0x99,0x62, +0x91,0x78,0x82,0xb7,0x0d,0x93,0x0c,0x24,0x6a,0xb4,0x1b,0xdb,0x27,0xec,0x5f,0x95, +0x04,0x3f,0x93,0x4a,0x30,0xf5,0x97,0x18,0xb3,0xa7,0xf9,0x19,0xa7,0x93,0x33,0x1d, +0x01,0xc8,0xdb,0x22,0x52,0x5c,0xd7,0x25,0xc9,0x46,0xf9,0xa2,0xfb,0x87,0x59,0x43, +0xbe,0x9b,0x62,0xb1,0x8d,0x2d,0x86,0x44,0x1a,0x46,0xac,0x78,0x61,0x7e,0x30,0x09, +0xfa,0xae,0x89,0xc4,0x41,0x2a,0x22,0x66,0x03,0x91,0x39,0x45,0x9c,0xc7,0x8b,0x0c, +0xa8,0xca,0x0d,0x2f,0xfb,0x52,0xea,0x0c,0xf7,0x63,0x33,0x23,0x9d,0xfe,0xb0,0x1f, +0xad,0x67,0xd6,0xa7,0x50,0x03,0xc6,0x04,0x70,0x63,0xb5,0x2c,0xb1,0x86,0x5a,0x43, +0xb7,0xfb,0xae,0xf9,0x6e,0x29,0x6e,0x21,0x21,0x41,0x26,0x06,0x8c,0xc9,0xc3,0xee, +0xb0,0xc2,0x85,0x93,0xa1,0xb9,0x85,0xd9,0xe6,0x32,0x6c,0x4b,0x4c,0x3f,0xd6,0x5d, +0xa3,0xe5,0xb5,0x9d,0x77,0xc3,0x9c,0xc0,0x55,0xb7,0x74,0x00,0xe3,0xb8,0x38,0xab, +0x83,0x97,0x50,0xe1,0x9a,0x42,0x24,0x1d,0xc6,0xc0,0xa3,0x30,0xd1,0x1a,0x5a,0xc8, +0x52,0x34,0xf7,0x73,0xf1,0xc7,0x18,0x1f,0x33,0xad,0x7a,0xec,0xcb,0x41,0x60,0xf3, +0x23,0x94,0x20,0xc2,0x48,0x45,0xac,0x5c,0x51,0xc6,0x2e,0x80,0xc2,0xe2,0x77,0x15, +0xbd,0x85,0x87,0xed,0x36,0x9d,0x96,0x91,0xee,0x00,0xb5,0xa3,0x70,0xec,0x9f,0xe3, +0x8d,0x80,0x68,0x83,0x76,0xba,0xaf,0x5d,0x70,0x52,0x22,0x16,0xe2,0x66,0xfb,0xba, +0xb3,0xc5,0xc2,0xf7,0x3e,0x2f,0x77,0xa6,0xca,0xde,0xc1,0xa6,0xc6,0x48,0x4c,0xc3, +0x37,0x51,0x23,0xd3,0x27,0xd7,0xb8,0x4e,0x70,0x96,0xf0,0xa1,0x44,0x76,0xaf,0x78, +0xcf,0x9a,0xe1,0x66,0x13,0x02,0x03,0x01,0x00,0x01,0xa3,0x51,0x30,0x4f,0x30,0x0b, +0x06,0x03,0x55,0x1d,0x0f,0x04,0x04,0x03,0x02,0x01,0x86,0x30,0x0f,0x06,0x03,0x55, +0x1d,0x13,0x01,0x01,0xff,0x04,0x05,0x30,0x03,0x01,0x01,0xff,0x30,0x1d,0x06,0x03, +0x55,0x1d,0x0e,0x04,0x16,0x04,0x14,0xd5,0xf6,0x56,0xcb,0x8f,0xe8,0xa2,0x5c,0x62, +0x68,0xd1,0x3d,0x94,0x90,0x5b,0xd7,0xce,0x9a,0x18,0xc4,0x30,0x10,0x06,0x09,0x2b, +0x06,0x01,0x04,0x01,0x82,0x37,0x15,0x01,0x04,0x03,0x02,0x01,0x00,0x30,0x0d,0x06, +0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x0b,0x05,0x00,0x03,0x82,0x02,0x01, +0x00,0xac,0xa5,0x96,0x8c,0xbf,0xbb,0xae,0xa6,0xf6,0xd7,0x71,0x87,0x43,0x31,0x56, +0x88,0xfd,0x1c,0x32,0x71,0x5b,0x35,0xb7,0xd4,0xf0,0x91,0xf2,0xaf,0x37,0xe2,0x14, +0xf1,0xf3,0x02,0x26,0x05,0x3e,0x16,0x14,0x7f,0x14,0xba,0xb8,0x4f,0xfb,0x89,0xb2, +0xb2,0xe7,0xd4,0x09,0xcc,0x6d,0xb9,0x5b,0x3b,0x64,0x65,0x70,0x66,0xb7,0xf2,0xb1, +0x5a,0xdf,0x1a,0x02,0xf3,0xf5,0x51,0xb8,0x67,0x6d,0x79,0xf3,0xbf,0x56,0x7b,0xe4, +0x84,0xb9,0x2b,0x1e,0x9b,0x40,0x9c,0x26,0x34,0xf9,0x47,0x18,0x98,0x69,0xd8,0x1c, +0xd7,0xb6,0xd1,0xbf,0x8f,0x61,0xc2,0x67,0xc4,0xb5,0xef,0x60,0x43,0x8e,0x10,0x1b, +0x36,0x49,0xe4,0x20,0xca,0xad,0xa7,0xc1,0xb1,0x27,0x65,0x09,0xf8,0xcd,0xf5,0x5b, +0x2a,0xd0,0x84,0x33,0xf3,0xef,0x1f,0xf2,0xf5,0x9c,0x0b,0x58,0x93,0x37,0xa0,0x75, +0xa0,0xde,0x72,0xde,0x6c,0x75,0x2a,0x66,0x22,0xf5,0x8c,0x06,0x30,0x56,0x9f,0x40, +0xb9,0x30,0xaa,0x40,0x77,0x15,0x82,0xd7,0x8b,0xec,0xc0,0xd3,0xb2,0xbd,0x83,0xc5, +0x77,0x0c,0x1e,0xae,0xaf,0x19,0x53,0xa0,0x4d,0x79,0x71,0x9f,0x0f,0xaf,0x30,0xce, +0x67,0xf9,0xd6,0x2c,0xcc,0x22,0x41,0x7a,0x07,0xf2,0x97,0x42,0x18,0xce,0x59,0x79, +0x10,0x55,0xde,0x6f,0x10,0xe4,0xb8,0xda,0x83,0x66,0x40,0x16,0x09,0x68,0x23,0x5b, +0x97,0x2e,0x26,0x9a,0x02,0xbb,0x57,0x8c,0xc5,0xb8,0xba,0x69,0x62,0x32,0x80,0x89, +0x9e,0xa1,0xfd,0xc0,0x92,0x7c,0x7b,0x2b,0x33,0x19,0x84,0x2a,0x63,0xc5,0x00,0x68, +0x62,0xfa,0x9f,0x47,0x8d,0x99,0x7a,0x45,0x3a,0xa7,0xe9,0xed,0xee,0x69,0x42,0xb5, +0xf3,0x81,0x9b,0x47,0x56,0x10,0x7b,0xfc,0x70,0x36,0x84,0x18,0x73,0xea,0xef,0xf9, +0x97,0x4d,0x9e,0x33,0x23,0xdd,0x26,0x0b,0xba,0x2a,0xb7,0x3f,0x44,0xdc,0x83,0x27, +0xff,0xbd,0x61,0x59,0x2b,0x11,0xb7,0xca,0x4f,0xdb,0xc5,0x8b,0x0c,0x1c,0x31,0xae, +0x32,0xf8,0xf8,0xb9,0x42,0xf7,0x7f,0xdc,0x61,0x9a,0x76,0xb1,0x5a,0x04,0xe1,0x11, +0x3d,0x66,0x45,0xb7,0x18,0x71,0xbe,0xc9,0x24,0x85,0xd6,0xf3,0xd4,0xba,0x41,0x34, +0x5d,0x12,0x2d,0x25,0xb9,0x8d,0xa6,0x13,0x48,0x6d,0x4b,0xb0,0x07,0x7d,0x99,0x93, +0x09,0x61,0x81,0x74,0x57,0x26,0x8a,0xab,0x69,0xe3,0xe4,0xd9,0xc7,0x88,0xcc,0x24, +0xd8,0xec,0x52,0x24,0x5c,0x1e,0xbc,0x91,0x14,0xe2,0x96,0xde,0xeb,0x0a,0xda,0x9e, +0xdd,0x5f,0xb3,0x5b,0xdb,0xd4,0x82,0xec,0xc6,0x20,0x50,0x87,0x25,0x40,0x3a,0xfb, +0xc7,0xee,0xcd,0xfe,0x33,0xe5,0x6e,0xc3,0x84,0x09,0x55,0x03,0x25,0x39,0xc0,0xe9, +0x35,0x5d,0x65,0x31,0xa8,0xf6,0xbf,0xa0,0x09,0xcd,0x29,0xc7,0xb3,0x36,0x32,0x2e, +0xdc,0x95,0xf3,0x83,0xc1,0x5a,0xcf,0x8b,0x8d,0xf6,0xea,0xb3,0x21,0xf8,0xa4,0xed, +0x1e,0x31,0x0e,0xb6,0x4c,0x11,0xab,0x60,0x0b,0xa4,0x12,0x23,0x22,0x17,0xa3,0x36, +0x64,0x82,0x91,0x04,0x12,0xe0,0xab,0x6f,0x1e,0xcb,0x50,0x05,0x61,0xb4,0x40,0xff, +0x59,0x86,0x71,0xd1,0xd5,0x33,0x69,0x7c,0xa9,0x73,0x8a,0x38,0xd7,0x64,0x0c,0xf1, +0x69 }; static const BYTE rootcertauthority2011[] = { 0x30,0x82,0x05,0xed,0x30,0x82,0x03,0xd5,0xa0,0x03,0x02,0x01,0x02,0x02,0x10,0x3f, 0x8b,0xc8,0xb5,0xfc,0x9f,0xb2,0x96,0x43,0xb5,0x69,0xd6,0x6c,0x42,0xe1,0x44,0x30, @@ -757,6 +854,7 @@ static const struct CONST_BLOB { { authenticode, sizeof(authenticode) }, { rootauthority, sizeof(rootauthority) }, { rootcertauthority, sizeof(rootcertauthority) }, + { rootcertauthority2010, sizeof(rootcertauthority2010) }, { rootcertauthority2011, sizeof(rootcertauthority2011) }, };

1 0

Zebediah Figura : kernel32/tests: Fix some codepage tests under Windows 10.
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: a7269a1035f0f7915431784c90a4b205cecb88e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7269a1035f0f7915431784c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 25 21:01:24 2019 -0500 kernel32/tests: Fix some codepage tests under Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/codepage.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 38f094fcc8..8b6584415c 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -271,7 +271,8 @@ static void test_other_invalid_parameters(void) SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_UTF8, 0, w_string, w_string_len, c_string, c_string_len, c_string, NULL); - ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); + ok((len == 0 && GetLastError() == ERROR_INVALID_PARAMETER) + || broken(len == 12) /* Win10 1709+ */, "len=%d error=%x\n", len, GetLastError()); SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_SYMBOL, 0, w_string, w_string_len, c_string, c_string_len, c_string, NULL); @@ -286,7 +287,8 @@ static void test_other_invalid_parameters(void) SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_UTF8, 0, w_string, w_string_len, c_string, c_string_len, NULL, &used); - ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); + ok((len == 0 && GetLastError() == ERROR_INVALID_PARAMETER) + || broken(len == 12) /* Win10 1709+ */, "len=%d error=%x\n", len, GetLastError()); SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_SYMBOL, 0, w_string, w_string_len, c_string, c_string_len, NULL, &used); @@ -304,7 +306,9 @@ static void test_other_invalid_parameters(void) /* CP_UTF8, unrecognized flag and used not NULL => ERROR_INVALID_PARAMETER */ SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_UTF8, 0x100, w_string, w_string_len, c_string, c_string_len, NULL, &used); - ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); + ok(len == 0, "wrong ret %d\n", len); + ok(GetLastError() == ERROR_INVALID_PARAMETER + || GetLastError() == ERROR_INVALID_FLAGS /* Win10 1709+ */, "wrong error %u\n", GetLastError()); } static void test_overlapped_buffers(void)

1 0

Alistair Leslie-Hughes : uianimation: Add typelib resource.
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: 389ff7bd3628179aadafc10e4fa774122f9c50db URL: https://source.winehq.org/git/wine.git/?a=commit;h=389ff7bd3628179aadafc10e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 23 23:26:52 2019 +0000 uianimation: Add typelib resource. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uianimation/Makefile.in | 3 ++- dlls/uianimation/uianimation_typelib.idl | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/uianimation/Makefile.in b/dlls/uianimation/Makefile.in index 9abb0d6b59..fbf9037d95 100644 --- a/dlls/uianimation/Makefile.in +++ b/dlls/uianimation/Makefile.in @@ -6,4 +6,5 @@ C_SRCS = \ main.c IDL_SRCS = \ - uianimation_reg.idl + uianimation_reg.idl \ + uianimation_typelib.idl diff --git a/dlls/uianimation/uianimation_typelib.idl b/dlls/uianimation/uianimation_typelib.idl new file mode 100644 index 0000000000..ea1d283038 --- /dev/null +++ b/dlls/uianimation/uianimation_typelib.idl @@ -0,0 +1,23 @@ +/* + * UiAnimation typelib. + * + * Copyright (C) 2019 Alistair Leslie-Hughes + * + * 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 + */ + +#pragma makedep typelib + +#include "uianimation.idl"

1 0

Brendan Shanks : ntdll: Enable WoW64 filesystem redirection when loading libraries.
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: aa51aee1a92ddbdd39875af81b002654f8ad4fc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa51aee1a92ddbdd39875af8… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Oct 24 15:12:12 2019 -0700 ntdll: Enable WoW64 filesystem redirection when loading libraries. This matches the behavior seen on Windows 7/2008R2 and newer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47912 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 2 +- dlls/ntdll/loader.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index e5b8c3b28e..912e8600dd 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -3822,7 +3822,7 @@ static void test_wow64_redirection_for_dll(const char *libname) if (!GetModuleHandleA(libname)) { lib = LoadLibraryExA(libname, NULL, 0); - todo_wine ok (broken(lib == NULL) /* Vista/2008 */ || + ok (broken(lib == NULL) /* Vista/2008 */ || lib != NULL, "Loading %s should succeed with WOW64 redirection disabled\n", libname); if (lib) { diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 2bae3c7bd5..55b341ff3a 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2881,6 +2881,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, { WCHAR *ext, *dllname; NTSTATUS status; + ULONG wow64_old_value = 0; /* first append .dll if needed */ @@ -2897,6 +2898,9 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, libname = dllname; } + /* Win 7/2008R2 and up seem to re-enable WoW64 FS redirection when loading libraries */ + if (is_wow64) RtlWow64EnableFsRedirectionEx( 0, &wow64_old_value ); + nt_name->Buffer = NULL; if (!contains_path( libname )) @@ -2930,6 +2934,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, done: RtlFreeHeap( GetProcessHeap(), 0, dllname ); + if (wow64_old_value) RtlWow64EnableFsRedirectionEx( 1, &wow64_old_value ); return status; }

1 0

Jacek Caban : vbscript: Support calling VARIANT in interpreter.
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: 1ff55510d8fb112d735864db942e79a2d2ae0a57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ff55510d8fb112d735864db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 28 18:40:36 2019 +0100 vbscript: Support calling VARIANT in interpreter. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 45f15933e6..11a2a77d82 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -653,14 +653,33 @@ static HRESULT interp_icallv(exec_ctx_t *ctx) static HRESULT interp_vcall(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + const unsigned arg_cnt = ctx->instr->arg1.uint; + VARIANT res, *v; + HRESULT hres; + + TRACE("\n"); + + v = stack_pop(ctx); + hres = variant_call(ctx, v, arg_cnt, &res); + VariantClear(v); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &res); } static HRESULT interp_vcallv(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + const unsigned arg_cnt = ctx->instr->arg1.uint; + VARIANT *v; + HRESULT hres; + + TRACE("\n"); + + v = stack_pop(ctx); + hres = variant_call(ctx, v, arg_cnt, NULL); + VariantClear(v); + return hres; } static HRESULT do_mcall(exec_ctx_t *ctx, VARIANT *res)

1 0

Alexandre Julliard : ntdll: Hardcode address space limits for ARM platforms.
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: 5b1fc819081dd52225fb9df0ee07bbdc9b23ca19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b1fc819081dd52225fb9df0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 28 21:07:53 2019 +0100 ntdll: Hardcode address space limits for ARM platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/virtual.c | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 20e64c80c7..c3f7eca61e 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -34,7 +34,7 @@ #define MAX_DOS_DRIVES 26 -#if defined(__i386__) || defined(__x86_64__) +#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) static const UINT_PTR page_size = 0x1000; #else extern UINT_PTR page_size DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d15b49f6fd..68249de902 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -134,6 +134,20 @@ static void *address_space_limit = (void *)0x7fffffff0000; static void *user_space_limit = (void *)0x7fffffff0000; static void *working_set_limit = (void *)0x7fffffff0000; static void *address_space_start = (void *)0x10000; +#elif defined(__arm__) +static const UINT page_shift = 12; +static const UINT_PTR page_mask = 0xfff; +static void *address_space_limit = (void *)0xc0000000; +static void *user_space_limit = (void *)0x7fff0000; +static void *working_set_limit = (void *)0x7fff0000; +static void *address_space_start = (void *)0x10000; +#elif defined(__aarch64__) +static const UINT page_shift = 12; +static const UINT_PTR page_mask = 0xfff; +static void *address_space_limit = (void *)0xffffffff0000; +static void *user_space_limit = (void *)0x7fffffff0000; +static void *working_set_limit = (void *)0x7fffffff0000; +static void *address_space_start = (void *)0x10000; #else UINT_PTR page_size = 0; static UINT page_shift; @@ -1828,7 +1842,7 @@ void virtual_init(void) struct alloc_virtual_heap alloc_views; size_t size; -#if !defined(__i386__) && !defined(__x86_64__) +#if !defined(__i386__) && !defined(__x86_64__) && !defined(__arm__) && !defined(__aarch64__) page_size = sysconf( _SC_PAGESIZE ); page_mask = page_size - 1; /* Make sure we have a power of 2 */

1 0

Jacek Caban : vbscript/tests: Add more call tests.
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: 273a3a586915e6de6e2fcd64bec1751fdde92e8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=273a3a586915e6de6e2fcd64… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 28 18:40:47 2019 +0100 vbscript/tests: Add more call tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/lang.vbs | 76 ++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/run.c | 5 ++- 2 files changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index ef31004cc4..334de7aa0e 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1246,6 +1246,59 @@ next x=1 Call ok(forarr(x) = 2, "forarr(x) = " & forarr(x)) +sub accessArr() + ok arr(1) = 1, "arr(1) = " & arr(1) + arr(1) = 2 +end sub +arr(1) = 1 +call accessArr +ok arr(1) = 2, "arr(1) = " & arr(1) + +sub accessArr2(x,y) + ok arr2(x,y) = 1, "arr2(x,y) = " & arr2(x,y) + x = arr2(x,y) + arr2(x,y) = 2 +end sub +arr2(1,2) = 1 +call accessArr2(1, 2) +ok arr2(1,2) = 2, "arr2(1,2) = " & arr2(1,2) + +x = Array(Array(3)) +call ok(x(0)(0) = 3, "x(0)(0) = " & x(0)(0)) + +function seta0(arr) + arr(0) = 2 + seta0 = 1 +end function + +x = Array(1) +seta0 x +ok x(0) = 2, "x(0) = " & x(0) + +x = Array(1) +seta0 (x) +todo_wine_ok x(0) = 1, "x(0) = " & x(0) + +x = Array(Array(3)) +seta0 x(0) +call ok(x(0)(0) = 2, "x(0)(0) = " & x(0)(0)) + +x = Array(Array(3)) +seta0 (x(0)) +call todo_wine_ok(x(0)(0) = 3, "x(0)(0) = " & x(0)(0)) + +sub changearg(x) + x = 2 +end sub + +x = Array(1) +changearg x(0) +ok x(0) = 2, "x(0) = " & x(0) + +x = Array(1) +changearg (x(0)) +todo_wine_ok x(0) = 1, "x(0) = " & x(0) + Class ArrClass Dim classarr(3) Dim classnoarr() @@ -1478,4 +1531,27 @@ Class EndTestClassWithProperty Public default Property Get defprop defprop = x End Property End Class +class TestPropSyntax + public prop + + function getProp() + set getProp = prop + end function + + public default property get def() + def = "" + end property +end class + +set x = new TestPropSyntax +set x.prop = new TestPropSyntax +set x.prop.prop = new TestPropSyntax +x.prop.prop.prop = 2 +call ok(x.getProp().getProp.prop = 2, "x.getProp().getProp.prop = " & x.getProp().getProp.prop) +x.getprop.getprop().prop = 3 +call ok(x.getProp.prop.prop = 3, "x.getProp.prop.prop = " & x.getProp.prop.prop) + +ok getVT(x) = "VT_DISPATCH*", "getVT(x) = " & getVT(x) +todo_wine_ok getVT(x()) = "VT_BSTR", "getVT(x()) = " & getVT(x()) + reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 2d34a8c80f..2c0ccdd25b 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2467,7 +2467,10 @@ static void test_parse_errors(void) "Call ok(x, \"wrong case\")\n", /* Class...End Class (empty) */ - "Class C End Class" + "Class C End Class", + + /* invalid use of parentheses for call statement */ + "strcomp(\"x\", \"y\")" }; HRESULT hres; UINT i;

1 0