November 2019 - Wine-commits

Alexandre Julliard : kernel32: Move initialization of the WoW64 environment to ntdll.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: e5354008f46bc0e345c06ac06a7a7780faa9398b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5354008f46bc0e345c06ac0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 5 11:34:55 2019 +0100 kernel32: Move initialization of the WoW64 environment to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 172 ------------------------------------------------ dlls/ntdll/env.c | 159 ++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 147 insertions(+), 184 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e5354008f46bc0e345c0…

1 0

Alexandre Julliard : ntdll: Directly allocate the final process parameters structure.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 3dadd980bfbb2fb05a1a695decd06a429ddda97c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dadd980bfbb2fb05a1a695d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 5 12:39:23 2019 +0100 ntdll: Directly allocate the final process parameters structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 71 +++++++++++++++---------------------------------- dlls/ntdll/loader.c | 1 - dlls/ntdll/ntdll_misc.h | 1 - 3 files changed, 21 insertions(+), 52 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 7a6c8c4dae..87ab9bef62 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -1357,19 +1357,31 @@ void init_user_process_params( SIZE_T data_size ) if (!data_size) { - if (RtlCreateProcessParametersEx( &params, &null_str, &null_str, &empty_str, &null_str, NULL, - &null_str, &null_str, &null_str, &null_str, + RTL_USER_PROCESS_PARAMETERS initial_params = {0}; + WCHAR *env, curdir_buffer[MAX_PATH]; + + NtCurrentTeb()->Peb->ProcessParameters = &initial_params; + initial_params.Environment = build_initial_environment( __wine_get_main_environment() ); + curdir.Buffer = curdir_buffer; + curdir.MaximumLength = sizeof(curdir_buffer); + get_current_directory( &curdir ); + initial_params.CurrentDirectory.DosPath = curdir; + get_image_path( __wine_main_argv[0], &initial_params.ImagePathName ); + set_library_wargv( __wine_main_argv, &initial_params.ImagePathName ); + build_command_line( __wine_main_wargv, &cmdline ); + LdrGetDllPath( initial_params.ImagePathName.Buffer, 0, &load_path, &dummy ); + RtlInitUnicodeString( &dllpath, load_path ); + + env = initial_params.Environment; + initial_params.Environment = NULL; /* avoid copying it */ + if (RtlCreateProcessParametersEx( &params, &initial_params.ImagePathName, &dllpath, &curdir, + &cmdline, NULL, &initial_params.ImagePathName, NULL, NULL, NULL, PROCESS_PARAMS_FLAG_NORMALIZED )) return; + params->Environment = env; NtCurrentTeb()->Peb->ProcessParameters = params; - params->Environment = build_initial_environment( __wine_get_main_environment() ); - get_current_directory( &params->CurrentDirectory.DosPath ); - get_image_path( __wine_main_argv[0], &params->ImagePathName ); - set_library_wargv( __wine_main_argv, &params->ImagePathName ); - build_command_line( __wine_main_wargv, &params->CommandLine ); - LdrGetDllPath( params->ImagePathName.Buffer, 0, &load_path, &dummy ); - RtlCreateUnicodeString( &params->DllPath, load_path ); + RtlFreeUnicodeString( &cmdline ); RtlReleasePath( load_path ); if (isatty(0) || isatty(1) || isatty(2)) @@ -1455,44 +1467,3 @@ done: } set_wow64_environment( &params->Environment ); } - - -/*********************************************************************** - * update_user_process_params - * - * Rebuild the RTL_USER_PROCESS_PARAMETERS structure once we have initialized all the fields. - */ -void update_user_process_params( const UNICODE_STRING *image ) -{ - RTL_USER_PROCESS_PARAMETERS *params, *cur_params = NtCurrentTeb()->Peb->ProcessParameters; - UNICODE_STRING title = cur_params->WindowTitle; - WCHAR *env = cur_params->Environment; - - cur_params->Environment = NULL; /* avoid copying it */ - if (!title.Buffer) title = *image; - if (RtlCreateProcessParametersEx( &params, image, &cur_params->DllPath, NULL, - &cur_params->CommandLine, NULL, &title, &cur_params->Desktop, - &cur_params->ShellInfo, &cur_params->RuntimeInfo, - PROCESS_PARAMS_FLAG_NORMALIZED )) - return; - - params->DebugFlags = cur_params->DebugFlags; - params->ConsoleHandle = cur_params->ConsoleHandle; - params->ConsoleFlags = cur_params->ConsoleFlags; - params->hStdInput = cur_params->hStdInput; - params->hStdOutput = cur_params->hStdOutput; - params->hStdError = cur_params->hStdError; - params->dwX = cur_params->dwX; - params->dwY = cur_params->dwY; - params->dwXSize = cur_params->dwXSize; - params->dwYSize = cur_params->dwYSize; - params->dwXCountChars = cur_params->dwXCountChars; - params->dwYCountChars = cur_params->dwYCountChars; - params->dwFillAttribute = cur_params->dwFillAttribute; - params->dwFlags = cur_params->dwFlags; - params->wShowWindow = cur_params->wShowWindow; - params->Environment = env; - - RtlFreeHeap( GetProcessHeap(), 0, cur_params ); - NtCurrentTeb()->Peb->ProcessParameters = params; -} diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 55b341ff3a..cc7bf6900b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4268,7 +4268,6 @@ void __wine_process_init(void) } NtCurrentTeb()->Peb->LoaderLock = &loader_section; - update_user_process_params( &wm->ldr.FullDllName ); version_init( wm->ldr.FullDllName.Buffer ); virtual_set_large_address_space(); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index c3f7eca61e..e2280dea84 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -86,7 +86,6 @@ extern void virtual_init_threading(void) DECLSPEC_HIDDEN; extern void fill_cpu_info(void) DECLSPEC_HIDDEN; extern void heap_set_debug_flags( HANDLE handle ) DECLSPEC_HIDDEN; extern void init_user_process_params( SIZE_T data_size ) DECLSPEC_HIDDEN; -extern void update_user_process_params( const UNICODE_STRING *image ) DECLSPEC_HIDDEN; /* server support */ extern timeout_t server_start_time DECLSPEC_HIDDEN;

1 0

Andrew Eikum : user32/tests: Move rawinput tests into input.c.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 4a58d67106b63772322a682cf1022b1a290acdca URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a58d67106b63772322a682c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 30 14:26:20 2019 -0500 user32/tests: Move rawinput tests into input.c. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/Makefile.in | 1 - dlls/user32/tests/input.c | 71 +++++++++++++++++++++++++++++ dlls/user32/tests/rawinput.c | 101 ------------------------------------------ 3 files changed, 71 insertions(+), 102 deletions(-) diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index 26bc3b2bc6..7149dc824e 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -17,7 +17,6 @@ C_SRCS = \ menu.c \ monitor.c \ msg.c \ - rawinput.c \ resource.c \ scroll.c \ static.c \ diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index c5cf9556ed..5723af3fd2 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1,6 +1,7 @@ /* Test Key event to Key message translation * * Copyright 2003 Rein Klazes + * Copyright 2019 Remi Bernon for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1712,6 +1713,75 @@ static void test_GetRawInputData(void) ok(ret == ~0U, "Expect ret %u, got %u\n", ~0U, ret); } +static void test_RegisterRawInputDevices(void) +{ + HWND hwnd; + RAWINPUTDEVICE raw_devices[1]; + BOOL res; + + raw_devices[0].usUsagePage = 0x01; + raw_devices[0].usUsage = 0x05; + + hwnd = CreateWindowExA(WS_EX_TOPMOST, "static", "dinput", WS_POPUP | WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindowExA failed\n"); + + + res = RegisterRawInputDevices(NULL, 0, 0); + ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); + + + raw_devices[0].dwFlags = 0; + raw_devices[0].hwndTarget = 0; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), 0); + ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(res == TRUE, "RegisterRawInputDevices failed\n"); + ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + + /* RIDEV_REMOVE requires hwndTarget == NULL */ + raw_devices[0].dwFlags = RIDEV_REMOVE; + raw_devices[0].hwndTarget = hwnd; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + raw_devices[0].hwndTarget = 0; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(res == TRUE, "RegisterRawInputDevices failed\n"); + ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + + /* RIDEV_INPUTSINK requires hwndTarget != NULL */ + raw_devices[0].dwFlags = RIDEV_INPUTSINK; + raw_devices[0].hwndTarget = 0; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + todo_wine + ok(res == FALSE, "RegisterRawInputDevices failed\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + raw_devices[0].hwndTarget = hwnd; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(res == TRUE, "RegisterRawInputDevices succeeded\n"); + ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + DestroyWindow(hwnd); +} + static void test_key_map(void) { HKL kl = GetKeyboardLayout(0); @@ -2902,6 +2972,7 @@ START_TEST(input) test_GetKeyState(); test_OemKeyScan(); test_GetRawInputData(); + test_RegisterRawInputDevices(); if(pGetMouseMovePointsEx) test_GetMouseMovePointsEx(); diff --git a/dlls/user32/tests/rawinput.c b/dlls/user32/tests/rawinput.c deleted file mode 100644 index f4c8eb6738..0000000000 --- a/dlls/user32/tests/rawinput.c +++ /dev/null @@ -1,101 +0,0 @@ -/* Unit test suite for rawinput. - * - * Copyright 2019 Remi Bernon for CodeWeavers - * - * 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 <stdarg.h> -#include <stdio.h> - -#define STRICT -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - -#include "wine/test.h" - -static void test_RegisterRawInputDevices(void) -{ - HWND hwnd; - RAWINPUTDEVICE raw_devices[1]; - BOOL res; - - raw_devices[0].usUsagePage = 0x01; - raw_devices[0].usUsage = 0x05; - - hwnd = CreateWindowExA(WS_EX_TOPMOST, "static", "dinput", WS_POPUP | WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, NULL, NULL); - ok(hwnd != NULL, "CreateWindowExA failed\n"); - - - res = RegisterRawInputDevices(NULL, 0, 0); - ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); - - - raw_devices[0].dwFlags = 0; - raw_devices[0].hwndTarget = 0; - - SetLastError(0xdeadbeef); - res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), 0); - ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); - - SetLastError(0xdeadbeef); - res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); - ok(res == TRUE, "RegisterRawInputDevices failed\n"); - ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); - - - /* RIDEV_REMOVE requires hwndTarget == NULL */ - raw_devices[0].dwFlags = RIDEV_REMOVE; - raw_devices[0].hwndTarget = hwnd; - - SetLastError(0xdeadbeef); - res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); - ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); - - raw_devices[0].hwndTarget = 0; - - SetLastError(0xdeadbeef); - res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); - ok(res == TRUE, "RegisterRawInputDevices failed\n"); - ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); - - - /* RIDEV_INPUTSINK requires hwndTarget != NULL */ - raw_devices[0].dwFlags = RIDEV_INPUTSINK; - raw_devices[0].hwndTarget = 0; - - SetLastError(0xdeadbeef); - res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); - todo_wine - ok(res == FALSE, "RegisterRawInputDevices failed\n"); - todo_wine - ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); - - raw_devices[0].hwndTarget = hwnd; - - SetLastError(0xdeadbeef); - res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); - ok(res == TRUE, "RegisterRawInputDevices succeeded\n"); - ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); - - DestroyWindow(hwnd); -} - -START_TEST(rawinput) -{ - test_RegisterRawInputDevices(); -}

1 0

Andrew Eikum : user32: Clean up GetRawInputDeviceInfo.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 0b7f4b40cf2f19f80765f798bfdb4733c8952c26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b7f4b40cf2f19f80765f798… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 30 14:26:28 2019 -0500 user32: Clean up GetRawInputDeviceInfo. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 89 ++++++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 43 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 94cf7a9a5d..770ec91096 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -404,80 +404,83 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT static const WCHAR mouse_name[] = {'\\','\\','?','\\','W','I','N','E','_','M','O','U','S','E',0}; static const RID_DEVICE_INFO_KEYBOARD keyboard_info = {0, 0, 1, 12, 3, 101}; static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; - struct hid_device *hid_device; - const WCHAR *name = NULL; - RID_DEVICE_INFO *info; - UINT s; + + RID_DEVICE_INFO info; + struct hid_device *hid_device = device; + const void *to_copy; + UINT to_copy_bytes, avail_bytes; TRACE("device %p, command %#x, data %p, data_size %p.\n", device, command, data, data_size); if (!data_size) return ~0U; + /* each case below must set: + * *data_size: length (meaning defined by command) of data we want to copy + * avail_bytes: number of bytes available in user buffer + * to_copy_bytes: number of bytes we want to copy into user buffer + * to_copy: pointer to data we want to copy into user buffer + */ switch (command) { case RIDI_DEVICENAME: + /* for RIDI_DEVICENAME, data_size is in characters, not bytes */ + avail_bytes = *data_size * sizeof(WCHAR); if (device == WINE_MOUSE_HANDLE) { - s = ARRAY_SIZE(mouse_name); - name = mouse_name; + *data_size = ARRAY_SIZE(mouse_name); + to_copy = mouse_name; } else if (device == WINE_KEYBOARD_HANDLE) { - s = ARRAY_SIZE(keyboard_name); - name = keyboard_name; + *data_size = ARRAY_SIZE(keyboard_name); + to_copy = keyboard_name; } else { - hid_device = device; - s = strlenW(hid_device->path) + 1; - name = hid_device->path; + *data_size = strlenW(hid_device->path) + 1; + to_copy = hid_device->path; } + to_copy_bytes = *data_size * sizeof(WCHAR); break; + case RIDI_DEVICEINFO: - s = sizeof(*info); + avail_bytes = *data_size; + info.cbSize = sizeof(info); + if (device == WINE_MOUSE_HANDLE) + { + info.dwType = RIM_TYPEMOUSE; + info.u.mouse = mouse_info; + } + else if (device == WINE_KEYBOARD_HANDLE) + { + info.dwType = RIM_TYPEKEYBOARD; + info.u.keyboard = keyboard_info; + } + else + { + info.dwType = RIM_TYPEHID; + info.u.hid = hid_device->info; + } + to_copy_bytes = sizeof(info); + *data_size = to_copy_bytes; + to_copy = &info; break; + default: + FIXME("command %#x not supported\n", command); return ~0U; } if (!data) - { - *data_size = s; return 0; - } - if (*data_size < s) - { - *data_size = s; + if (avail_bytes < to_copy_bytes) return ~0U; - } - if (command == RIDI_DEVICENAME) - { - memcpy(data, name, s * sizeof(WCHAR)); - return s; - } + memcpy(data, to_copy, to_copy_bytes); - info = data; - info->cbSize = sizeof(*info); - if (device == WINE_MOUSE_HANDLE) - { - info->dwType = RIM_TYPEMOUSE; - info->u.mouse = mouse_info; - } - else if (device == WINE_KEYBOARD_HANDLE) - { - info->dwType = RIM_TYPEKEYBOARD; - info->u.keyboard = keyboard_info; - } - else - { - hid_device = device; - info->dwType = RIM_TYPEHID; - info->u.hid = hid_device->info; - } - return s; + return *data_size; } /***********************************************************************

1 0

Andrew Eikum : user32: Support RIDI_PREPARSEDDATA in GetRawInputDeviceInfo.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 6d7828e8df68178ca662bc618f7598254afcfbe1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d7828e8df68178ca662bc61… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 30 14:26:37 2019 -0500 user32: Support RIDI_PREPARSEDDATA in GetRawInputDeviceInfo. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 18 ++++++++++++++++++ dlls/user32/tests/Makefile.in | 2 +- dlls/user32/tests/input.c | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 770ec91096..85ff0c5e80 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -33,6 +33,7 @@ #include "ddk/hidsdi.h" #include "wine/debug.h" #include "wine/server.h" +#include "wine/hid.h" #include "user_private.h" @@ -467,6 +468,23 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT to_copy = &info; break; + case RIDI_PREPARSEDDATA: + avail_bytes = *data_size; + if (device == WINE_MOUSE_HANDLE || + device == WINE_KEYBOARD_HANDLE) + { + to_copy_bytes = 0; + *data_size = 0; + to_copy = NULL; + } + else + { + to_copy_bytes = ((WINE_HIDP_PREPARSED_DATA*)hid_device->data)->dwSize; + *data_size = to_copy_bytes; + to_copy = hid_device->data; + } + break; + default: FIXME("command %#x not supported\n", command); return ~0U; diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index 7149dc824e..dd101d69f3 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = user32.dll -IMPORTS = user32 gdi32 advapi32 +IMPORTS = user32 gdi32 advapi32 hid C_SRCS = \ broadcast.c \ diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 5723af3fd2..1e6be311ee 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -55,6 +55,7 @@ #include "winbase.h" #include "winuser.h" #include "winnls.h" +#include "ddk/hidsdi.h" #include "wine/test.h" @@ -1605,6 +1606,7 @@ static void test_GetRawInputDeviceList(void) RAWINPUTDEVICELIST devices[32]; UINT ret, oret, devcount, odevcount, i; DWORD err; + BOOLEAN br; SetLastError(0xdeadbeef); ret = pGetRawInputDeviceList(NULL, NULL, 0); @@ -1642,6 +1644,7 @@ static void test_GetRawInputDeviceList(void) UINT sz, len; RID_DEVICE_INFO info; HANDLE file; + char *ppd; /* get required buffer size */ name[0] = '\0'; @@ -1688,6 +1691,44 @@ static void test_GetRawInputDeviceList(void) file = CreateFileW(name, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); todo_wine_if(info.dwType != RIM_TYPEHID) ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u\n", wine_dbgstr_w(name), GetLastError()); + + sz = 0; + ret = pGetRawInputDeviceInfoW(devices[i].hDevice, RIDI_PREPARSEDDATA, NULL, &sz); + ok(ret == 0, "GetRawInputDeviceInfo gave wrong return: %u\n", ret); + ok((info.dwType == RIM_TYPEHID && sz != 0) || + (info.dwType != RIM_TYPEHID && sz == 0), + "Got wrong PPD size for type 0x%x: %u\n", info.dwType, sz); + + ppd = HeapAlloc(GetProcessHeap(), 0, sz); + ret = pGetRawInputDeviceInfoW(devices[i].hDevice, RIDI_PREPARSEDDATA, ppd, &sz); + ok(ret == sz, "GetRawInputDeviceInfo gave wrong return: %u, should be %u\n", ret, sz); + + if (file != INVALID_HANDLE_VALUE && ret == sz) + { + PHIDP_PREPARSED_DATA preparsed; + + if (info.dwType == RIM_TYPEHID) + { + br = HidD_GetPreparsedData(file, &preparsed); + ok(br == TRUE, "HidD_GetPreparsedData failed\n"); + + if (br) + ok(!memcmp(preparsed, ppd, sz), "Expected to get same preparsed data\n"); + } + else + { + /* succeeds on hardware, fails in some VMs */ + br = HidD_GetPreparsedData(file, &preparsed); + todo_wine + ok(br == TRUE || broken(br == FALSE), "HidD_GetPreparsedData failed\n"); + } + + if (br) + HidD_FreePreparsedData(preparsed); + } + + HeapFree(GetProcessHeap(), 0, ppd); + CloseHandle(file); }

1 0

Biswapriyo Nath : include/netfw: Add INetFwRule2 and INetFwRule3 interfaces.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 718d9cb9d47aab08c0cd251f6d303f2b50befd54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=718d9cb9d47aab08c0cd251f… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sun Nov 3 00:39:37 2019 +0530 include/netfw: Add INetFwRule2 and INetFwRule3 interfaces. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/netfw.idl | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/include/netfw.idl b/include/netfw.idl index 7c5d3d40bb..013f2bfb0f 100644 --- a/include/netfw.idl +++ b/include/netfw.idl @@ -431,6 +431,59 @@ interface INetFwRule : IDispatch HRESULT Action( [in] NET_FW_ACTION action ); } +[ + local, + object, + uuid(9C27C8DA-189B-4DDE-89F7-8B39A316782C), + dual +] +interface INetFwRule2 : INetFwRule +{ + [id(19), propget] + HRESULT EdgeTraversalOptions( [out, retval] long* lOptions ); + [id(19), propput] + HRESULT EdgeTraversalOptions( [in] long lOptions ); +} + +[ + local, + object, + uuid(B21563FF-D696-4222-AB46-4E89B73AB34A), + dual +] +interface INetFwRule3 : INetFwRule2 +{ + [id(20), propget] + HRESULT LocalAppPackageId( [out, retval] BSTR* wszPackageId ); + [id(20), propput] + HRESULT LocalAppPackageId( [in] BSTR wszPackageId ); + + [id(21), propget] + HRESULT LocalUserOwner( [out, retval] BSTR* wszUserOwner ); + [id(21), propput] + HRESULT LocalUserOwner( [in] BSTR wszUserOwner ); + + [id(22), propget] + HRESULT LocalUserAuthorizedList( [out, retval] BSTR* wszUserAuthList ); + [id(22), propput] + HRESULT LocalUserAuthorizedList( [in] BSTR wszUserAuthList ); + + [id(23), propget] + HRESULT RemoteUserAuthorizedList( [out, retval] BSTR* wszUserAuthList ); + [id(23), propput] + HRESULT RemoteUserAuthorizedList( [in] BSTR wszUserAuthList ); + + [id(24), propget] + HRESULT RemoteMachineAuthorizedList( [out, retval] BSTR* wszUserAuthList ); + [id(24), propput] + HRESULT RemoteMachineAuthorizedList( [in] BSTR wszUserAuthList ); + + [id(25), propget] + HRESULT SecureFlags( [out, retval] long* lOptions ); + [id(25), propput] + HRESULT SecureFlags( [in] long lOptions ); +} + [ local, object, @@ -703,10 +756,15 @@ library NetFwPublicTypeLib interface INetFwServices; interface INetFwAuthorizedApplication; interface INetFwAuthorizedApplications; + interface INetFwServiceRestriction; + interface INetFwRule; + interface INetFwRules; interface INetFwProfile; interface INetFwPolicy; interface INetFwPolicy2; interface INetFwMgr; + interface INetFwProduct; + interface INetFwProducts; [ uuid(0CA545C6-37AD-4A6C-BF92-9F7610067EF5)

1 0

Jeff Smith : msrle32: Return expected flags from GetInfo.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: a9928379b1159ea82f8087418461147dcfd7dcb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9928379b1159ea82f808741… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sat Nov 2 16:43:05 2019 -0500 msrle32: Return expected flags from GetInfo. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msrle32/msrle32.c | 2 +- dlls/msrle32/tests/msrle.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 5b17b25a0b..b68a50514f 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1179,7 +1179,7 @@ static LRESULT GetInfo(const CodecInfo *pi, ICINFO *icinfo, DWORD dwSize) icinfo->dwSize = sizeof(ICINFO); icinfo->fccType = ICTYPE_VIDEO; icinfo->fccHandler = (pi != NULL ? pi->fccHandler : FOURCC_MRLE); - icinfo->dwFlags = VIDCF_QUALITY | VIDCF_TEMPORAL | VIDCF_CRUNCH | VIDCF_FASTTEMPORALC; + icinfo->dwFlags = VIDCF_QUALITY | VIDCF_TEMPORAL | VIDCF_CRUNCH; icinfo->dwVersion = ICVERSION; icinfo->dwVersionICM = ICVERSION; diff --git a/dlls/msrle32/tests/msrle.c b/dlls/msrle32/tests/msrle.c index 4a442a0b90..84c5c21510 100644 --- a/dlls/msrle32/tests/msrle.c +++ b/dlls/msrle32/tests/msrle.c @@ -65,7 +65,7 @@ static void test_encode(void) ok(res == sizeof(info), "res = %ld\n", res); ok(info.dwSize == sizeof(info), "dwSize = %d\n", info.dwSize); ok(info.fccHandler == FCC('M','R','L','E'), "fccHandler = %x\n", info.fccHandler); - todo_wine ok(info.dwFlags == (VIDCF_QUALITY|VIDCF_CRUNCH|VIDCF_TEMPORAL), "dwFlags = %x\n", info.dwFlags); + ok(info.dwFlags == (VIDCF_QUALITY|VIDCF_CRUNCH|VIDCF_TEMPORAL), "dwFlags = %x\n", info.dwFlags); ok(info.dwVersionICM == ICVERSION, "dwVersionICM = %d\n", info.dwVersionICM); quality = 0xdeadbeef;

1 0

Jacek Caban : vbscript: Support assigning to object default value.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 8f1e633874bbf1512436f4bbb50812d214259d51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f1e633874bbf1512436f4bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 4 17:36:58 2019 +0100 vbscript: Support assigning to object default value. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 5 ++++ dlls/vbscript/tests/run.c | 64 +++++++++++++++++++++++++++++++++-------------- 2 files changed, 50 insertions(+), 19 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 7339f42aba..191622e8e7 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -779,6 +779,11 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, WORD flags, DISPPARAMS * if(arg_cnt(dp)) { SAFEARRAY *array; + if(V_VT(v) == VT_DISPATCH) { + hres = disp_propput(ctx->script, V_DISPATCH(v), DISPID_VALUE, flags, dp); + break; + } + if(!(V_VT(v) & VT_ARRAY)) { FIXME("array assign on type %d\n", V_VT(v)); return E_FAIL; diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 208d647d46..d3d41a80d2 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -100,6 +100,7 @@ DEFINE_EXPECT(testobj_propget_i); DEFINE_EXPECT(testobj_propput_d); DEFINE_EXPECT(testobj_propput_i); DEFINE_EXPECT(testobj_value_i); +DEFINE_EXPECT(testobj_valueput_i); DEFINE_EXPECT(global_propargput_d); DEFINE_EXPECT(global_propargput_i); DEFINE_EXPECT(global_propargput1_d); @@ -872,29 +873,49 @@ static HRESULT WINAPI testObj_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { switch(id) { - case DISPID_VALUE: { - VARIANT *arg; - int i; + case DISPID_VALUE: + if(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD)) { + VARIANT *arg; + int i; - CHECK_EXPECT(testobj_value_i); + CHECK_EXPECT(testobj_value_i); - ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); - ok(pdp != NULL, "pdp == NULL\n"); - ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); - ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); - ok(pvarRes != NULL, "pvarRes == NULL\n"); - ok(pei != NULL, "pei == NULL\n"); + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + for(i=0; i<pdp->cArgs; i++) { + arg = pdp->rgvarg+pdp->cArgs-i-1; + ok(V_VT(arg) == VT_I2, "V_VT(arg) = %d\n", V_VT(arg)); + ok(V_I2(arg) == i+1, "V_I2(arg) = %d\n", V_I2(arg)); + } - for(i=0; i<pdp->cArgs; i++) { - arg = pdp->rgvarg+pdp->cArgs-i-1; - ok(V_VT(arg) == VT_I2, "V_VT(arg) = %d\n", V_VT(arg)); - ok(V_I2(arg) == i+1, "V_I2(arg) = %d\n", V_I2(arg)); + V_VT(pvarRes) = VT_I2; + V_I2(pvarRes) = pdp->cArgs; + return S_OK; } + if(wFlags == DISPATCH_PROPERTYPUT) { + CHECK_EXPECT(testobj_valueput_i); - V_VT(pvarRes) = VT_I2; - V_I2(pvarRes) = pdp->cArgs; - return S_OK; - } + ok(pdp->cArgs == 3, "cArgs = %d\n", pdp->cArgs); + ok(pdp->cNamedArgs == 1, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pdp->rgdispidNamedArgs[0] == DISPID_PROPERTYPUT, "pdp->rgdispidNamedArgs[0] = %d\n", pdp->rgdispidNamedArgs[0]); + ok(!pvarRes, "pvarRes != NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_I2, "V_VT(args[0]) = %d\n", V_VT(pdp->rgvarg)); + ok(V_I2(pdp->rgvarg) == 0, "V_I2(args[0]) = %d\n", V_I2(pdp->rgvarg)); + ok(V_VT(pdp->rgvarg+1) == VT_I2, "V_VT(args[1]) = %d\n", V_VT(pdp->rgvarg+1)); + ok(V_I2(pdp->rgvarg+1) == 2, "V_I2(args[1]) = %d\n", V_I2(pdp->rgvarg+1)); + ok(V_VT(pdp->rgvarg+2) == VT_I2, "V_VT(args[2]) = %d\n", V_VT(pdp->rgvarg+2)); + ok(V_I2(pdp->rgvarg+2) == 1, "V_I2(args[2]) = %d\n", V_I2(pdp->rgvarg+2)); + + return S_OK; + } + ok(0, "wFlags = %x\n", wFlags); + break; case DISPID_TESTOBJ_PROPGET: CHECK_EXPECT(testobj_propget_i); @@ -1419,7 +1440,6 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, case DISPID_GLOBAL_COUNTER: ok(pdp != NULL, "pdp == NULL\n"); - todo_wine ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); ok(!pdp->cArgs, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); @@ -2881,6 +2901,12 @@ static void run_tests(void) CHECK_CALLED(testobj_propput_d); CHECK_CALLED(testobj_propput_i); + SET_EXPECT(testobj_valueput_i); + parse_script_a("dim x\n" + "set x = testObj\n" + "x(counter(), counter()) = counter\n"); + CHECK_CALLED(testobj_valueput_i); + parse_htmlscript_a(""); parse_htmlscript_a("\n");

1 0

Jacek Caban : vbscript: Store global functions in an array.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: ea7a3953fcc495aba23c7c638effed6085bb0c76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea7a3953fcc495aba23c7c63… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 4 17:37:24 2019 +0100 vbscript: Store global functions in an array. Based on patch by Gabriel Ivăncescu. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 31 +++++++++++++++++++++---------- dlls/vbscript/interp.c | 4 ++-- dlls/vbscript/vbdisp.c | 5 +++-- dlls/vbscript/vbscript.c | 5 +++++ dlls/vbscript/vbscript.h | 5 ++++- 5 files changed, 35 insertions(+), 15 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 90b0cf5342..dae8a97c83 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1802,15 +1802,15 @@ static BOOL lookup_script_identifier(script_ctx_t *script, const WCHAR *identifi { class_desc_t *class; dynamic_var_t *var; - function_t *func; + unsigned i; for(var = script->global_vars; var; var = var->next) { if(!wcsicmp(var->name, identifier)) return TRUE; } - for(func = script->global_funcs; func; func = func->next) { - if(!wcsicmp(func->name, identifier)) + for(i = 0; i < script->global_funcs_cnt; i++) { + if(!wcsicmp(script->global_funcs[i]->name, identifier)) return TRUE; } @@ -1914,11 +1914,12 @@ static void release_compiler(compile_ctx_t *ctx) HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *delimiter, DWORD flags, vbscode_t **ret) { - function_t *new_func; + function_t *new_func, *func_iter; function_decl_t *func_decl; class_decl_t *class_decl; compile_ctx_t ctx; vbscode_t *code; + size_t cnt; HRESULT hres; if (!src) src = L""; @@ -1982,12 +1983,22 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli script->global_vars = ctx.global_vars; } - if(ctx.funcs) { - for(new_func = ctx.funcs; new_func->next; new_func = new_func->next); - - new_func->next = script->global_funcs; - script->global_funcs = ctx.funcs; - } + cnt = script->global_funcs_cnt; + for(func_iter = ctx.funcs; func_iter; func_iter = func_iter->next) + cnt++; + if(cnt > script->global_funcs_size) { + function_t **new_funcs; + if(script->global_funcs) + new_funcs = heap_realloc(script->global_funcs, cnt * sizeof(*new_funcs)); + else + new_funcs = heap_alloc(cnt * sizeof(*new_funcs)); + if(!new_funcs) + return compile_error(script, E_OUTOFMEMORY); + script->global_funcs = new_funcs; + script->global_funcs_size = cnt; + } + for(func_iter = ctx.funcs; func_iter; func_iter = func_iter->next) + script->global_funcs[script->global_funcs_cnt++] = func_iter; if(ctx.classes) { class_desc_t *class = ctx.classes; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 191622e8e7..4800ae7ce6 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -98,7 +98,6 @@ static BOOL lookup_dynamic_vars(dynamic_var_t *var, const WCHAR *name, ref_t *re static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_t invoke_type, ref_t *ref) { named_item_t *item; - function_t *func; IDispatch *disp; unsigned i; DISPID id; @@ -164,7 +163,8 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ if(ctx->func->type != FUNC_GLOBAL && lookup_dynamic_vars(ctx->script->global_vars, name, ref)) return S_OK; - for(func = ctx->script->global_funcs; func; func = func->next) { + for(i = 0; i < ctx->script->global_funcs_cnt; i++) { + function_t *func = ctx->script->global_funcs[i]; if(!wcsicmp(func->name, name)) { ref->type = REF_FUNC; ref->u.f = func; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 25a80fc89d..a5ae40d098 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -677,7 +677,7 @@ static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DW ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); dynamic_var_t *var; ident_map_t *ident; - function_t *func; + unsigned i; TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); @@ -704,7 +704,8 @@ static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DW } } - for(func = This->ctx->global_funcs; func; func = func->next) { + for(i = 0; i < This->ctx->global_funcs_cnt; i++) { + function_t *func = This->ctx->global_funcs[i]; if(!wcsicmp(func->name, bstrName)) { ident = add_ident(This, func->name); if(!ident) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 56c53b4015..59ec577846 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -138,6 +138,11 @@ static void release_script(script_ctx_t *ctx) release_dynamic_vars(ctx->global_vars); ctx->global_vars = NULL; + heap_free(ctx->global_funcs); + ctx->global_funcs = NULL; + ctx->global_funcs_cnt = 0; + ctx->global_funcs_size = 0; + while(!list_empty(&ctx->named_items)) { named_item_t *iter = LIST_ENTRY(list_head(&ctx->named_items), named_item_t, entry); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 2d9647eb2e..8543813c49 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -187,8 +187,11 @@ struct _script_ctx_t { EXCEPINFO ei; + function_t **global_funcs; + size_t global_funcs_cnt; + size_t global_funcs_size; + dynamic_var_t *global_vars; - function_t *global_funcs; class_desc_t *classes; class_desc_t *procs;

1 0

Jacek Caban : vbscript: Replace existing function for duplicated functions.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 52bbac0a3661d1437b22cce40d4a7980c3efeaef URL: https://source.winehq.org/git/wine.git/?a=commit;h=52bbac0a3661d1437b22cce4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 4 17:37:42 2019 +0100 vbscript: Replace existing function for duplicated functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 24 +++++++++++++----------- dlls/vbscript/tests/lang.vbs | 15 +++++++++++++++ dlls/vbscript/tests/run.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 11 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index dae8a97c83..6b0e113bef 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1571,7 +1571,7 @@ static HRESULT create_function(compile_ctx_t *ctx, function_decl_t *decl, functi function_t *func; HRESULT hres; - if(lookup_dim_decls(ctx, decl->name) || lookup_funcs_name(ctx, decl->name) || lookup_const_decls(ctx, decl->name, FALSE)) { + if(lookup_dim_decls(ctx, decl->name) || lookup_const_decls(ctx, decl->name, FALSE)) { FIXME("%s: redefinition\n", debugstr_w(decl->name)); return E_FAIL; } @@ -1826,7 +1826,6 @@ static HRESULT check_script_collisions(compile_ctx_t *ctx, script_ctx_t *script) { class_desc_t *class; dynamic_var_t *var; - function_t *func; for(var = ctx->global_vars; var; var = var->next) { if(lookup_script_identifier(script, var->name)) { @@ -1835,13 +1834,6 @@ static HRESULT check_script_collisions(compile_ctx_t *ctx, script_ctx_t *script) } } - for(func = ctx->funcs; func; func = func->next) { - if(lookup_script_identifier(script, func->name)) { - FIXME("%s: redefined\n", debugstr_w(func->name)); - return E_FAIL; - } - } - for(class = ctx->classes; class; class = class->next) { if(lookup_script_identifier(script, class->name)) { FIXME("%s: redefined\n", debugstr_w(class->name)); @@ -1997,8 +1989,18 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli script->global_funcs = new_funcs; script->global_funcs_size = cnt; } - for(func_iter = ctx.funcs; func_iter; func_iter = func_iter->next) - script->global_funcs[script->global_funcs_cnt++] = func_iter; + for(func_iter = ctx.funcs; func_iter; func_iter = func_iter->next) { + unsigned i; + for(i = 0; i < script->global_funcs_cnt; i++) { + if(!wcsicmp(script->global_funcs[i]->name, func_iter->name)) { + /* global function already exists, replace it */ + script->global_funcs[i] = func_iter; + break; + } + } + if(i == script->global_funcs_cnt) + script->global_funcs[script->global_funcs_cnt++] = func_iter; + } if(ctx.classes) { class_desc_t *class = ctx.classes; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 4623a08e2b..8a6f0ecd45 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -886,6 +886,21 @@ Public Function TestSepFunc(ByVal a) : : End Function Call ok(TestSepFunc(1) = 1, "Function did not return 1") +ok duplicatedfunc() = 2, "duplicatedfunc = " & duplicatedfunc() + +function duplicatedfunc + ok false, "duplicatedfunc called" +end function + +sub duplicatedfunc + ok false, "duplicatedfunc called" +end sub + +function duplicatedfunc + duplicatedfunc = 2 +end function + +ok duplicatedfunc() = 2, "duplicatedfunc = " & duplicatedfunc() ' Stop has an effect only in debugging mode Stop diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index d3d41a80d2..9ed1096a4d 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2688,6 +2688,47 @@ static void test_isexpression(void) close_script(engine); } +static void test_multiple_parse(void) +{ + IActiveScriptParse *parser; + IActiveScript *script; + HRESULT hres; + + script = create_and_init_script(SCRIPTITEM_GLOBALMEMBERS, TRUE); + + hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParseProcedure2 iface: %08x\n", hres); + + hres = IActiveScriptParse_ParseScriptText(parser, + L"function duplicatedfunc\n" + L" ok false, \"duplicatedfunc called\"\n" + L"end function\n", + NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + + hres = IActiveScriptParse_ParseScriptText(parser, + L"sub duplicatedfunc\n" + L" ok false, \"duplicatedfunc called\"\n" + L"end sub\n", + NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + + hres = IActiveScriptParse_ParseScriptText(parser, + L"function duplicatedfunc\n" + L" duplicatedfunc = 2\n" + L"end function\n", + NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + + hres = IActiveScriptParse_ParseScriptText(parser, + L"ok duplicatedfunc() = 2, \"duplicatedfunc = \" & duplicatedfunc()\n", + NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + + IActiveScriptParse_Release(parser); + close_script(script); +} + static BSTR get_script_from_file(const char *filename) { DWORD size, len; @@ -3037,6 +3078,7 @@ static void run_tests(void) test_parse_errors(); test_parse_context(); test_callbacks(); + test_multiple_parse(); } static BOOL check_vbscript(void)

1 0