August 2019 - Wine-devel - list.winehq.org

[PATCH] wuauserv: Add dummy service.
by Alistair Leslie-Hughes 23 Aug '19

23 Aug '19

From: Michael Müller <michael(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37781 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure.ac | 1 + loader/wine.inf.in | 11 ++++ programs/wuauserv/Makefile.in | 6 ++ programs/wuauserv/main.c | 104 ++++++++++++++++++++++++++++++++++ 4 files changed, 122 insertions(+) create mode 100644 programs/wuauserv/Makefile.in create mode 100644 programs/wuauserv/main.c diff --git a/configure.ac b/configure.ac index 755865ddf8..f0383d98c0 100644 --- a/configure.ac +++ b/configure.ac @@ -3943,6 +3943,7 @@ WINE_CONFIG_MAKEFILE(programs/wordpad) WINE_CONFIG_MAKEFILE(programs/write) WINE_CONFIG_MAKEFILE(programs/wscript) WINE_CONFIG_MAKEFILE(programs/wscript/tests) +WINE_CONFIG_MAKEFILE(programs/wuauserv) WINE_CONFIG_MAKEFILE(programs/wusa) WINE_CONFIG_MAKEFILE(programs/xcopy) WINE_CONFIG_MAKEFILE(programs/xcopy/tests) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index e8354664b6..3ddda8d5aa 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -133,6 +133,7 @@ AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService AddService=WineBus,0,WineBusService AddService=Winmgmt,0,WinmgmtService +AddService=wuauserv,0,wuauService [DefaultInstall.NT.Services] AddService=BITS,0,BITSService @@ -150,6 +151,7 @@ AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService AddService=WineBus,0,WineBusService AddService=Winmgmt,0,WinmgmtService +AddService=wuauserv,0,wuauService [DefaultInstall.ntamd64.Services] AddService=BITS,0,BITSService @@ -167,6 +169,7 @@ AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService AddService=WineBus,0,WineBusService AddService=Winmgmt,0,WinmgmtService +AddService=wuauserv,0,wuauService [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" @@ -3582,6 +3585,14 @@ ErrorControl=1 HKR,Parameters,"ServiceDll",,"%11%\schedsvc.dll" HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"Schedule" +[wuauService] +Description="wuauserv" +DisplayName="Automatic Updates" +ServiceBinary="%11%\wuauserv.exe" +ServiceType=32 +StartType=3 +ErrorControl=1 + [Services] HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16 diff --git a/programs/wuauserv/Makefile.in b/programs/wuauserv/Makefile.in new file mode 100644 index 0000000000..ff9939bb64 --- /dev/null +++ b/programs/wuauserv/Makefile.in @@ -0,0 +1,6 @@ +MODULE = wuauserv.exe +APPMODE = -mconsole -mno-cygwin +IMPORTS = advapi32 + +C_SRCS = \ + main.c diff --git a/programs/wuauserv/main.c b/programs/wuauserv/main.c new file mode 100644 index 0000000000..31df299e90 --- /dev/null +++ b/programs/wuauserv/main.c @@ -0,0 +1,104 @@ +/* + * Copyright 2007 Jacek Caban for CodeWeavers + * Copyright 2016 Michael Müller + * + * 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 WIN32_LEAN_AND_MEAN + +#include <windows.h> +#include <winsvc.h> + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wuauserv); + +static WCHAR wuauservW[] = {'w','u','a','u','s','e','r','v',0}; + +static SERVICE_STATUS_HANDLE service_handle; +static HANDLE stop_event; + +static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context ) +{ + SERVICE_STATUS status; + + status.dwServiceType = SERVICE_WIN32; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 0; + + switch(ctrl) + { + case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: + WINE_TRACE( "shutting down\n" ); + status.dwCurrentState = SERVICE_STOP_PENDING; + status.dwControlsAccepted = 0; + SetServiceStatus( service_handle, &status ); + SetEvent( stop_event ); + return NO_ERROR; + default: + WINE_FIXME( "got service ctrl %x\n", ctrl ); + status.dwCurrentState = SERVICE_RUNNING; + SetServiceStatus( service_handle, &status ); + return NO_ERROR; + } +} + +static void WINAPI serv_main(DWORD argc, LPWSTR *argv) +{ + SERVICE_STATUS status; + + WINE_TRACE( "starting service\n" ); + + stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ); + + service_handle = RegisterServiceCtrlHandlerExW( wuauservW, service_handler, NULL ); + if (!service_handle) + return; + + status.dwServiceType = SERVICE_WIN32; + status.dwCurrentState = SERVICE_RUNNING; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 10000; + SetServiceStatus( service_handle, &status ); + + WaitForSingleObject( stop_event, INFINITE ); + + status.dwCurrentState = SERVICE_STOPPED; + status.dwControlsAccepted = 0; + SetServiceStatus( service_handle, &status ); + WINE_TRACE( "service stopped\n" ); +} + +int main(int argc, char **argv) +{ + static const SERVICE_TABLE_ENTRYW servtbl[] = + { + {wuauservW, serv_main}, + {NULL, NULL} + }; + + WINE_TRACE( "(%d %p)\n", argc, argv ); + + StartServiceCtrlDispatcherW( servtbl ); + return 0; +} -- 2.17.1

1 0

[PATCH 1/2] setupapi/tests: Add some tests for SPFILENOTIFY_STARTCOPY.
by Zebediah Figura 23 Aug '19

23 Aug '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/tests/install.c | 96 +++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index d761f89103..87615e75e7 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -1945,6 +1945,101 @@ static void test_close_queue(void) SetupTermDefaultQueueCallback(context); } +static unsigned int got_start_copy, start_copy_ret; + +static UINT WINAPI start_copy_cb(void *context, UINT message, UINT_PTR param1, UINT_PTR param2) +{ + if (winetest_debug > 1) trace("%p, %#x, %#lx, %#lx\n", context, message, param1, param2); + + if (message == SPFILENOTIFY_STARTCOPY) + { + const FILEPATHS_A *paths = (const FILEPATHS_A *)param1; + + ++got_start_copy; + + if (strstr(paths->Source, "two.txt")) + { + SetLastError(0xdeadf00d); + return start_copy_ret; + } + } + + return SetupDefaultQueueCallbackA(context, message, param1, param2); +} + +static void test_start_copy(void) +{ + HSPFILEQ queue; + void *context; + BOOL ret; + + ret = CreateDirectoryA("src", NULL); + ok(ret, "Failed to create test directory, error %u.\n", GetLastError()); + create_file("src/one.txt"); + create_file("src/two.txt"); + create_file("src/three.txt"); + + start_copy_ret = FILEOP_DOIT; + got_start_copy = 0; + queue = SetupOpenFileQueue(); + ok(queue != INVALID_HANDLE_VALUE, "Failed to open queue, error %#x.\n", GetLastError()); + ret = SetupQueueCopyA(queue, "src", NULL, "one.txt", NULL, NULL, "dst", NULL, 0); + ok(ret, "Failed to queue copy, error %#x.\n", GetLastError()); + ret = SetupQueueCopyA(queue, "src", NULL, "two.txt", NULL, NULL, "dst", NULL, 0); + ok(ret, "Failed to queue copy, error %#x.\n", GetLastError()); + ret = SetupQueueCopyA(queue, "src", NULL, "three.txt", NULL, NULL, "dst", NULL, 0); + ok(ret, "Failed to queue copy, error %#x.\n", GetLastError()); + run_queue(queue, start_copy_cb); + ok(got_start_copy == 3, "Got %u callbacks.\n", got_start_copy); + ok(delete_file("dst/one.txt"), "Destination file should exist.\n"); + ok(delete_file("dst/two.txt"), "Destination file should exist.\n"); + ok(delete_file("dst/three.txt"), "Destination file should exist.\n"); + + start_copy_ret = FILEOP_SKIP; + got_start_copy = 0; + queue = SetupOpenFileQueue(); + ok(queue != INVALID_HANDLE_VALUE, "Failed to open queue, error %#x.\n", GetLastError()); + ret = SetupQueueCopyA(queue, "src", NULL, "one.txt", NULL, NULL, "dst", NULL, 0); + ok(ret, "Failed to queue copy, error %#x.\n", GetLastError()); + ret = SetupQueueCopyA(queue, "src", NULL, "two.txt", NULL, NULL, "dst", NULL, 0); + ok(ret, "Failed to queue copy, error %#x.\n", GetLastError()); + ret = SetupQueueCopyA(queue, "src", NULL, "three.txt", NULL, NULL, "dst", NULL, 0); + ok(ret, "Failed to queue copy, error %#x.\n", GetLastError()); + run_queue(queue, start_copy_cb); + todo_wine ok(got_start_copy == 3, "Got %u callbacks.\n", got_start_copy); + ok(delete_file("dst/one.txt"), "Destination file should exist.\n"); + ok(!file_exists("dst/two.txt"), "Destination file should not exist.\n"); + todo_wine ok(delete_file("dst/three.txt"), "Destination file should exist.\n"); + + start_copy_ret = FILEOP_ABORT; + got_start_copy = 0; + queue = SetupOpenFileQueue(); + ok(queue != INVALID_HANDLE_VALUE, "Failed to open queue, error %#x.\n", GetLastError()); + ret = SetupQueueCopyA(queue, "src", NULL, "one.txt", NULL, NULL, "dst", NULL, 0); + ok(ret, "Failed to queue copy, error %#x.\n", GetLastError()); + ret = SetupQueueCopyA(queue, "src", NULL, "two.txt", NULL, NULL, "dst", NULL, 0); + ok(ret, "Failed to queue copy, error %#x.\n", GetLastError()); + ret = SetupQueueCopyA(queue, "src", NULL, "three.txt", NULL, NULL, "dst", NULL, 0); + ok(ret, "Failed to queue copy, error %#x.\n", GetLastError()); + context = SetupInitDefaultQueueCallbackEx(NULL, INVALID_HANDLE_VALUE, 0, 0, 0); + SetLastError(0xdeadbeef); + ret = SetupCommitFileQueueA(NULL, queue, start_copy_cb, context); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == 0xdeadf00d, "Got unexpected error %u.\n", GetLastError()); + SetupTermDefaultQueueCallback(context); + SetupCloseFileQueue(queue); + ok(got_start_copy == 2, "Got %u callbacks.\n", got_start_copy); + ok(delete_file("dst/one.txt"), "Destination file should exist.\n"); + ok(!file_exists("dst/two.txt"), "Destination file should not exist.\n"); + ok(!file_exists("dst/three.txt"), "Destination file should not exist.\n"); + + delete_file("src/one.txt"); + delete_file("src/two.txt"); + delete_file("src/three.txt"); + delete_file("src/"); + delete_file("dst/"); +} + START_TEST(install) { char temp_path[MAX_PATH], prev_path[MAX_PATH]; @@ -1973,6 +2068,7 @@ START_TEST(install) test_need_media(); test_close_queue(); test_install_file(); + test_start_copy(); UnhookWindowsHookEx(hhook); -- 2.22.0

1 1

[PATCH 1/5] http.sys: Allow associating a URL with the request queue.
by Zebediah Figura 22 Aug '19

22 Aug '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/http.sys/http.c | 112 +++++++++++++++++++++++++++++++++++++++++-- include/wine/http.h | 35 ++++++++++++++ 2 files changed, 144 insertions(+), 3 deletions(-) create mode 100644 include/wine/http.h diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 3a8aa3953d..e57cce9e3c 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -18,12 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - #include "ntstatus.h" #define WIN32_NO_STATUS +#include "wine/http.h" #include "winternl.h" -#include "winioctl.h" #include "ddk/wdm.h" #include "wine/debug.h" #include "wine/heap.h" @@ -46,10 +44,116 @@ DECLARE_CRITICAL_SECTION(http_cs); struct request_queue { struct list entry; + HTTP_URL_CONTEXT context; + char *url; }; static struct list request_queues = LIST_INIT(request_queues); + +static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) +{ + const struct http_add_url_params *params = irp->AssociatedIrp.SystemBuffer; + unsigned short port; + char *url, *endptr; + int count = 0; + const char *p; + + TRACE("host %s, context %s.\n", debugstr_a(params->url), wine_dbgstr_longlong(params->context)); + + if (!strncmp(params->url, "https://", 8)) + { + FIXME("HTTPS is not implemented.\n"); + return STATUS_NOT_IMPLEMENTED; + } + else if (strncmp(params->url, "http://", 7) || !strchr(params->url + 7, ':') + || params->url[strlen(params->url) - 1] != '/') + return STATUS_INVALID_PARAMETER; + if (!(port = strtol(strchr(params->url + 7, ':') + 1, &endptr, 10)) || *endptr != '/') + return STATUS_INVALID_PARAMETER; + + if (!(url = heap_alloc(strlen(params->url)))) + return STATUS_NO_MEMORY; + strcpy(url, params->url); + + for (p = url; *p; ++p) + if (*p == '/') ++count; + if (count > 3) + FIXME("Binding to relative URIs is not implemented; binding to all URIs instead.\n"); + + EnterCriticalSection(&http_cs); + + if (queue->url && !strcmp(queue->url, url)) + { + LeaveCriticalSection(&http_cs); + heap_free(url); + return STATUS_OBJECT_NAME_COLLISION; + } + else if (queue->url) + { + FIXME("Binding to multiple URLs is not implemented.\n"); + LeaveCriticalSection(&http_cs); + heap_free(url); + return STATUS_NOT_IMPLEMENTED; + } + + queue->url = url; + queue->context = params->context; + + LeaveCriticalSection(&http_cs); + + return STATUS_SUCCESS; +} + +static NTSTATUS http_remove_url(struct request_queue *queue, IRP *irp) +{ + const char *url = irp->AssociatedIrp.SystemBuffer; + + TRACE("host %s.\n", debugstr_a(url)); + + EnterCriticalSection(&http_cs); + + if (!queue->url || strcmp(url, queue->url)) + { + LeaveCriticalSection(&http_cs); + return STATUS_OBJECT_NAME_NOT_FOUND; + } + heap_free(queue->url); + queue->url = NULL; + + LeaveCriticalSection(&http_cs); + return STATUS_SUCCESS; +} + +static NTSTATUS WINAPI dispatch_ioctl(DEVICE_OBJECT *device, IRP *irp) +{ + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + struct request_queue *queue = stack->FileObject->FsContext; + NTSTATUS ret; + + switch (stack->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_HTTP_ADD_URL: + ret = http_add_url(queue, irp); + break; + case IOCTL_HTTP_REMOVE_URL: + ret = http_remove_url(queue, irp); + break; + default: + FIXME("Unhandled ioctl %#x.\n", stack->Parameters.DeviceIoControl.IoControlCode); + ret = STATUS_NOT_IMPLEMENTED; + } + + if (ret != STATUS_PENDING) + { + irp->IoStatus.Status = ret; + IoCompleteRequest(irp, IO_NO_INCREMENT); + } + else + IoMarkIrpPending(irp); + return ret; +} + static NTSTATUS WINAPI dispatch_create(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); @@ -76,6 +180,7 @@ static void close_queue(struct request_queue *queue) list_remove(&queue->entry); LeaveCriticalSection(&http_cs); + heap_free(queue->url); heap_free(queue); } @@ -130,6 +235,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) driver->MajorFunction[IRP_MJ_CREATE] = dispatch_create; driver->MajorFunction[IRP_MJ_CLOSE] = dispatch_close; + driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = dispatch_ioctl; driver->DriverUnload = unload; return STATUS_SUCCESS; diff --git a/include/wine/http.h b/include/wine/http.h new file mode 100644 index 0000000000..354c289387 --- /dev/null +++ b/include/wine/http.h @@ -0,0 +1,35 @@ +/* + * Copyright 2019 Zebediah Figura + * + * 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 + */ + +#ifndef __WINE_WINE_HTTP_H +#define __WINE_WINE_HTTP_H + +#include <windef.h> +#include <http.h> +#include <winioctl.h> + +#define IOCTL_HTTP_ADD_URL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x800, METHOD_BUFFERED, 0) +#define IOCTL_HTTP_REMOVE_URL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x801, METHOD_BUFFERED, 0) + +struct http_add_url_params +{ + HTTP_URL_CONTEXT context; + char url[1]; +}; + +#endif -- 2.22.0

1 4

[PATCH] winex11.drv: Also send input events when the keymap state has changed
by Rémi Bernon 22 Aug '19

22 Aug '19

When pressing Alt-Tab for example, the application receives the KeyPress event for Alt key before losing focus, but when focusing it back it never receives the corresponding KeyRelease event and this can lead to incorrect key state for applications listening on WM_SYSKEYUP/DOWN messages, or for applications that use dinput keyboard device which is implemented with the corresponding low-level keyboard hooks messages. When focus is gained back the application receives a KeymapNotify to indicate the full keyboard state, and this can be used to make up for the missing KeyRelease events. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winex11.drv/keyboard.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 131c5f5442f..166b5446aab 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1209,14 +1209,20 @@ BOOL X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) int i, j; BYTE keystate[256]; WORD vkey; + WORD scan; + DWORD flags; BOOL changed = FALSE; struct { WORD vkey; + WORD scan; WORD pressed; } keys[256]; if (!get_async_key_state( keystate )) return FALSE; + /* from KeymapNotify documentation this should always be true */ + if (!hwnd) hwnd = GetForegroundWindow(); + memset(keys, 0, sizeof(keys)); EnterCriticalSection( &kbd_section ); @@ -1229,11 +1235,13 @@ BOOL X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) for (j = 0; j < 8; j++) { vkey = keyc2vkey[(i * 8) + j]; + scan = keyc2scan[(i * 8) + j] & 0xff; /* If multiple keys map to the same vkey, we want to report it as * pressed iff any of them are pressed. */ if (!keys[vkey & 0xff].vkey) keys[vkey & 0xff].vkey = vkey; if (event->xkeymap.key_vector[i] & (1<<j)) keys[vkey & 0xff].pressed = TRUE; + keys[vkey & 0xff].scan = scan; } } @@ -1244,6 +1252,14 @@ BOOL X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) TRACE( "Adjusting state for vkey %#.2x. State before %#.2x\n", keys[vkey].vkey, keystate[vkey]); + flags = 0; + if (!keys[vkey].pressed) + flags |= KEYEVENTF_KEYUP; + if (keys[vkey].vkey & 0x100) + flags |= KEYEVENTF_EXTENDEDKEY; + + X11DRV_send_keyboard_input( hwnd, vkey, keys[vkey].scan, flags, GetTickCount() ); + update_key_state( keystate, vkey, keys[vkey].pressed ); changed = TRUE; } -- 2.20.1

2 3

[PATCH 5/5] vbscript: Support unary + expressions.
by Jacek Caban 22 Aug '19

22 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/parser.y | 1 + dlls/vbscript/tests/lang.vbs | 8 ++++++++ 2 files changed, 9 insertions(+)

1 0

[PATCH 4/5] vbscript: Rename OP_long expression to OP_int.
by Jacek Caban 22 Aug '19

22 Aug '19

1 0

[PATCH 3/5] vbscript: Handle long/short distinction in interpreter.
by Jacek Caban 22 Aug '19

22 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 4 +--- dlls/vbscript/interp.c | 21 +++++++-------------- dlls/vbscript/lex.c | 7 +++---- dlls/vbscript/parse.h | 1 - dlls/vbscript/parser.y | 8 +++----- dlls/vbscript/vbscript.h | 1 - 6 files changed, 14 insertions(+), 28 deletions(-)

1 0

[PATCH 2/5] vbscript: Support arrays in VarType.
by Jacek Caban 22 Aug '19

22 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/global.c | 7 +++++-- dlls/vbscript/tests/api.vbs | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[PATCH 1/5] vbscript/tests: Fix tests on some Vista versions.
by Jacek Caban 22 Aug '19

22 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/tests/api.vbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[v2 PATCH] mscoree: Add a test to show that first non-default domain is not made current automatically.
by Nikolay Sivov 22 Aug '19

22 Aug '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mscoree/corruntimehost.c | 10 ++++++++-- dlls/mscoree/tests/mscoree.c | 18 +++++++++++++++++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 2ccc7bc4f5..c638c56ab5 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -793,8 +793,14 @@ static HRESULT WINAPI corruntimehost_CurrentDomain( ICorRuntimeHost* iface, IUnknown **appDomain) { - FIXME("stub %p\n", iface); - return E_NOTIMPL; + RuntimeHost *This = impl_from_ICorRuntimeHost(iface); + + TRACE("(%p, %p)\n", iface, appDomain); + + if (!is_mono_started) + return E_FAIL; + + return RuntimeHost_GetIUnknownForDomain(This, mono_domain_get(), appDomain); } static const struct ICorRuntimeHostVtbl corruntimehost_vtbl = diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index bb2a17046b..82dbb3066b 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -540,7 +540,7 @@ static void test_createdomain(void) ICLRRuntimeInfo *runtimeinfo; ICorRuntimeHost *runtimehost; IUnknown *domain, *defaultdomain_unk, *defaultdomain, *newdomain_unk, *newdomain, *domainsetup, - *newdomain2_unk, *newdomain2; + *newdomain2_unk, *newdomain2, *current_domain; HRESULT hr; if (!pCLRCreateInstance) @@ -559,12 +559,20 @@ static void test_createdomain(void) (void **)&runtimehost); ok(SUCCEEDED(hr), "ICLRRuntimeInfo::GetInterface failed, hr=%#.8x\n", hr); + hr = ICorRuntimeHost_CurrentDomain(runtimehost, &current_domain); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + hr = ICorRuntimeHost_Start(runtimehost); ok(SUCCEEDED(hr), "ICorRuntimeHost::Start failed, hr=%#.8x\n", hr); hr = ICorRuntimeHost_GetDefaultDomain(runtimehost, &domain); ok(SUCCEEDED(hr), "ICorRuntimeHost::GetDefaultDomain failed, hr=%#.8x\n", hr); + hr = ICorRuntimeHost_CurrentDomain(runtimehost, &current_domain); + ok(SUCCEEDED(hr), "Failed to get current domain, hr %#x.\n", hr); + ok(current_domain == domain, "Unexpected domain %p, %p.\n", current_domain, domain); + IUnknown_Release(current_domain); + hr = IUnknown_QueryInterface(domain, &IID_IUnknown, (void **)&defaultdomain_unk); ok(SUCCEEDED(hr), "COM object doesn't support IUnknown?!\n"); @@ -584,6 +592,14 @@ static void test_createdomain(void) IUnknown_Release(domain); + hr = ICorRuntimeHost_GetDefaultDomain(runtimehost, &domain); + ok(SUCCEEDED(hr), "ICorRuntimeHost::GetDefaultDomain failed, hr=%#.8x\n", hr); + hr = ICorRuntimeHost_CurrentDomain(runtimehost, &current_domain); + ok(SUCCEEDED(hr), "Failed to get current domain, hr %#x.\n", hr); + ok(current_domain == domain, "Unexpected domain %p, %p.\n", current_domain, domain); + IUnknown_Release(current_domain); + IUnknown_Release(domain); + ok(defaultdomain_unk != newdomain_unk, "New and default domain objects are the same\n"); hr = ICorRuntimeHost_CreateDomainSetup(runtimehost, &domainsetup); -- 2.23.0.rc1

2 1