August 2016 - Wine-commits - list.winehq.org

Huw Davies : gdi32: Explicitly write out the rops for copy_rect_1().
by Alexandre Julliard 25 Aug '16

25 Aug '16

Module: wine Branch: master Commit: c429c595e82b28bae14b03e3792eadfa588249a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c429c595e82b28bae14b03e37… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 25 09:43:11 2016 +0100 gdi32: Explicitly write out the rops for copy_rect_1(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/primitives.c | 384 +++++++++++++++++++++-------------------- 1 file changed, 201 insertions(+), 183 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c429c595e82b28bae14b0…

1 0

Sebastian Lackner : ntoskrnl.exe: Implement ZwLoadDriver and ZwUnloadDriver based on services API.
by Alexandre Julliard 25 Aug '16

25 Aug '16

Module: wine Branch: master Commit: a7e9fa625327a4f50d25053e092783a7e82f8584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7e9fa625327a4f50d25053e0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 24 06:11:07 2016 +0200 ntoskrnl.exe: Implement ZwLoadDriver and ZwUnloadDriver based on services API. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/Makefile.in | 1 + dlls/ntoskrnl.exe/ntoskrnl.c | 183 ++++++++++++++++++++++++++++++++++-- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 +- 3 files changed, 180 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in index 875be8e..b459c54 100644 --- a/dlls/ntoskrnl.exe/Makefile.in +++ b/dlls/ntoskrnl.exe/Makefile.in @@ -1,5 +1,6 @@ MODULE = ntoskrnl.exe IMPORTLIB = ntoskrnl +IMPORTS = advapi32 C_SRCS = \ instr.c \ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d9ebc40..7c35d14 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3,6 +3,7 @@ * * Copyright (C) 2007 Alexandre Julliard * Copyright (C) 2010 Damjan Jovanovic + * Copyright (C) 2016 Sebastian Lackner * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,6 +31,7 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" +#include "winsvc.h" #include "winternl.h" #include "excpt.h" #include "winioctl.h" @@ -66,6 +68,13 @@ KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTable[4] = { { 0 } }; typedef void (WINAPI *PCREATE_PROCESS_NOTIFY_ROUTINE)(HANDLE,HANDLE,BOOLEAN); typedef void (WINAPI *PCREATE_THREAD_NOTIFY_ROUTINE)(HANDLE,HANDLE,BOOLEAN); +static const WCHAR servicesW[] = {'\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','y','s','t','e','m', + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', + '\\','S','e','r','v','i','c','e','s', + '\\',0}; + /* tid of the thread running client request */ static DWORD request_thread; @@ -871,12 +880,6 @@ PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device, static void build_driver_keypath( const WCHAR *name, UNICODE_STRING *keypath ) { static const WCHAR driverW[] = {'\\','D','r','i','v','e','r','\\',0}; - static const WCHAR servicesW[] = {'\\','R','e','g','i','s','t','r','y', - '\\','M','a','c','h','i','n','e', - '\\','S','y','s','t','e','m', - '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', - '\\','S','e','r','v','i','c','e','s', - '\\',0}; WCHAR *str; /* Check what prefix is present */ @@ -2641,3 +2644,171 @@ NTSTATUS WINAPI IoAttachDevice(DEVICE_OBJECT *source, UNICODE_STRING *target, DE FIXME("(%p, %s, %p): stub\n", source, debugstr_us(target), attached); return STATUS_NOT_IMPLEMENTED; } + + +static NTSTATUS open_driver( const UNICODE_STRING *service_name, SC_HANDLE *service ) +{ + QUERY_SERVICE_CONFIGW *service_config = NULL; + SC_HANDLE manager_handle; + DWORD config_size = 0; + WCHAR *name; + + if (!(name = RtlAllocateHeap( GetProcessHeap(), 0, service_name->Length + sizeof(WCHAR) ))) + return STATUS_NO_MEMORY; + + memcpy( name, service_name->Buffer, service_name->Length ); + name[ service_name->Length / sizeof(WCHAR) ] = 0; + + if (strncmpW( name, servicesW, strlenW(servicesW) )) + { + FIXME( "service name %s is not a keypath\n", debugstr_us(service_name) ); + RtlFreeHeap( GetProcessHeap(), 0, name ); + return STATUS_NOT_IMPLEMENTED; + } + + if (!(manager_handle = OpenSCManagerW( NULL, NULL, SC_MANAGER_CONNECT ))) + { + WARN( "failed to connect to service manager\n" ); + RtlFreeHeap( GetProcessHeap(), 0, name ); + return STATUS_NOT_SUPPORTED; + } + + *service = OpenServiceW( manager_handle, name + strlenW(servicesW), SERVICE_ALL_ACCESS ); + RtlFreeHeap( GetProcessHeap(), 0, name ); + CloseServiceHandle( manager_handle ); + + if (!*service) + { + WARN( "failed to open service %s\n", debugstr_us(service_name) ); + return STATUS_UNSUCCESSFUL; + } + + QueryServiceConfigW( *service, NULL, 0, &config_size ); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + WARN( "failed to query service config\n" ); + goto error; + } + + if (!(service_config = RtlAllocateHeap( GetProcessHeap(), 0, config_size ))) + goto error; + + if (!QueryServiceConfigW( *service, service_config, config_size, &config_size )) + { + WARN( "failed to query service config\n" ); + goto error; + } + + if (service_config->dwServiceType != SERVICE_KERNEL_DRIVER && + service_config->dwServiceType != SERVICE_FILE_SYSTEM_DRIVER) + { + WARN( "service %s is not a kernel driver\n", debugstr_us(service_name) ); + goto error; + } + + TRACE( "opened service for driver %s\n", debugstr_us(service_name) ); + RtlFreeHeap( GetProcessHeap(), 0, service_config ); + return STATUS_SUCCESS; + +error: + CloseServiceHandle( *service ); + RtlFreeHeap( GetProcessHeap(), 0, service_config ); + return STATUS_UNSUCCESSFUL; +} + + +/*********************************************************************** + * ZwLoadDriver (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ZwLoadDriver( const UNICODE_STRING *service_name ) +{ + SERVICE_STATUS_PROCESS service_status; + SC_HANDLE service_handle; + NTSTATUS status; + DWORD bytes; + int i; + + TRACE( "(%s)\n", debugstr_us(service_name) ); + + if ((status = open_driver( service_name, &service_handle )) != STATUS_SUCCESS) + return status; + + TRACE( "trying to start %s\n", debugstr_us(service_name) ); + + for (i = 0; i < 100; i++) /* 10 sec timeout */ + { + if (StartServiceW( service_handle, 0, NULL )) break; + if (GetLastError() == ERROR_SERVICE_ALREADY_RUNNING) break; + if (GetLastError() != ERROR_SERVICE_DATABASE_LOCKED) goto error; + Sleep(100); + } + if (i == 100) goto error; + + for (i = 0; i < 100; i++) /* 10 sec timeout */ + { + if (!QueryServiceStatusEx( service_handle, SC_STATUS_PROCESS_INFO, + (BYTE *)&service_status, sizeof(service_status), &bytes )) goto error; + if (service_status.dwCurrentState != SERVICE_START_PENDING) break; + Sleep(100); + } + + if (service_status.dwCurrentState == SERVICE_RUNNING) + { + if (service_status.dwProcessId != GetCurrentProcessId()) + FIXME( "driver %s was loaded into a different process\n", debugstr_us(service_name) ); + + status = STATUS_SUCCESS; + goto done; + } + +error: + WARN( "failed to start service %s\n", debugstr_us(service_name) ); + status = STATUS_UNSUCCESSFUL; + +done: + TRACE( "returning status %08x\n", status ); + CloseServiceHandle( service_handle ); + return status; +} + + +/*********************************************************************** + * ZwUnloadDriver (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ZwUnloadDriver( const UNICODE_STRING *service_name ) +{ + SERVICE_STATUS service_status; + SC_HANDLE service_handle; + NTSTATUS status; + int i; + + TRACE( "(%s)\n", debugstr_us(service_name) ); + + if ((status = open_driver( service_name, &service_handle )) != STATUS_SUCCESS) + return status; + + if (!ControlService( service_handle, SERVICE_CONTROL_STOP, &service_status )) + goto error; + + for (i = 0; i < 100; i++) /* 10 sec timeout */ + { + if (!QueryServiceStatus( service_handle, &service_status )) goto error; + if (service_status.dwCurrentState != SERVICE_STOP_PENDING) break; + Sleep(100); + } + + if (service_status.dwCurrentState == SERVICE_STOPPED) + { + status = STATUS_SUCCESS; + goto done; + } + +error: + WARN( "failed to stop service %s\n", debugstr_us(service_name) ); + status = STATUS_UNSUCCESSFUL; + +done: + TRACE( "returning status %08x\n", status ); + CloseServiceHandle( service_handle ); + return status; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index fd820a7..119d406 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1314,7 +1314,7 @@ @ stdcall ZwFsControlFile(long long long long long long long long long long) ntdll.ZwFsControlFile @ stdcall ZwInitiatePowerAction(long long long long) ntdll.ZwInitiatePowerAction @ stdcall ZwIsProcessInJob(long long) ntdll.ZwIsProcessInJob -@ stdcall ZwLoadDriver(ptr) ntdll.ZwLoadDriver +@ stdcall ZwLoadDriver(ptr) @ stdcall ZwLoadKey(ptr ptr) ntdll.ZwLoadKey @ stdcall ZwMakeTemporaryObject(long) ntdll.ZwMakeTemporaryObject @ stdcall ZwMapViewOfSection(long long ptr long long ptr ptr long long long) ntdll.ZwMapViewOfSection @@ -1384,7 +1384,7 @@ @ stdcall ZwTerminateJobObject(long long) ntdll.ZwTerminateJobObject @ stdcall ZwTerminateProcess(long long) ntdll.ZwTerminateProcess @ stub ZwTranslateFilePath -@ stdcall ZwUnloadDriver(ptr) ntdll.ZwUnloadDriver +@ stdcall ZwUnloadDriver(ptr) @ stdcall ZwUnloadKey(long) ntdll.ZwUnloadKey @ stdcall ZwUnmapViewOfSection(long ptr) ntdll.ZwUnmapViewOfSection @ stdcall ZwWaitForMultipleObjects(long ptr long long ptr) ntdll.ZwWaitForMultipleObjects

1 0

Sebastian Lackner : winedevice: Add support for loading/ unloading drivers asynchronously.
by Alexandre Julliard 25 Aug '16

25 Aug '16

Module: wine Branch: master Commit: 440482d2ef31333d1bc3ce15b0aad4ceec60466c URL: http://source.winehq.org/git/wine.git/?a=commit;h=440482d2ef31333d1bc3ce15b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 23 10:13:42 2016 +0200 winedevice: Add support for loading/unloading drivers asynchronously. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/device.c | 204 ++++++++++++++++++++++++++++++++----------- 1 file changed, 152 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=440482d2ef31333d1bc3c…

1 0

Michael Gilbert : ntdll: Add missing stdint.h include for kfreebsd architectures.
by Alexandre Julliard 25 Aug '16

25 Aug '16

Module: wine Branch: master Commit: 29fdc4879057b91e4c1909b376d214b51ad042f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29fdc4879057b91e4c1909b37… Author: Michael Gilbert <mgilbert(a)debian.org> Date: Tue Aug 23 15:35:35 2016 +0200 ntdll: Add missing stdint.h include for kfreebsd architectures. Signed-off-by: Jens Reyer <jre.winesim(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index a945e11..b129b87 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -53,6 +53,9 @@ # include <sys/sysmacros.h> #endif #ifdef HAVE_SYS_VNODE_H +# ifdef HAVE_STDINT_H +# include <stdint.h> /* needed for kfreebsd */ +# endif /* Work around a conflict with Solaris' system list defined in sys/list.h. */ #define list SYSLIST #define list_next SYSLIST_NEXT

1 0

Alexandre Julliard : user32/tests: Add some tests for inter-process clipboard viewer notifications.
by Alexandre Julliard 25 Aug '16

25 Aug '16

Module: wine Branch: master Commit: 57e2b75c02f905d2118c089975e35857f67b9ab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57e2b75c02f905d2118c08997… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 25 21:32:00 2016 +0900 user32/tests: Add some tests for inter-process clipboard viewer notifications. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 144 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 142 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index b6914da..d162e33 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -113,6 +113,22 @@ static void set_clipboard_data_process( int arg ) } } +static void grab_clipboard_process( int arg ) +{ + BOOL ret; + + SetLastError( 0xdeadbeef ); + ret = OpenClipboard( 0 ); + ok( ret, "OpenClipboard failed\n" ); + ret = EmptyClipboard(); + ok( ret, "EmptyClipboard failed\n" ); + if (arg) + { + HANDLE ret = SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )); + ok( ret != 0, "process %u: SetClipboardData failed err %u\n", arg, GetLastError() ); + } +} + static void run_thread( LPTHREAD_START_ROUTINE func, void *arg, int line ) { DWORD ret; @@ -733,11 +749,10 @@ static DWORD WINAPI clipboard_thread(void *param) ok( !count, "WM_DRAWCLIPBOARD received\n" ); count = SendMessageA( win, WM_USER+2, 0, 0 ); ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - - formats = CountClipboardFormats(); count = SendMessageA( win, WM_USER+3, 0, 0 ); ok( !count, "WM_DESTROYCLIPBOARD received\n" ); + formats = CountClipboardFormats(); r = OpenClipboard(0); ok(r, "OpenClipboard failed: %d\n", GetLastError()); r = EmptyClipboard(); @@ -745,11 +760,131 @@ static DWORD WINAPI clipboard_thread(void *param) r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); + count = SendMessageA( win, WM_USER+1, 0, 0 ); + ok( count, "WM_DRAWCLIPBOARD not received\n" ); + count = SendMessageA( win, WM_USER+2, 0, 0 ); + todo_wine ok( count || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); count = SendMessageA( win, WM_USER+3, 0, 0 ); ok( count, "WM_DESTROYCLIPBOARD not received\n" ); count = SendMessageA( win, WM_USER+4, 0, 0 ); ok( count == formats, "wrong format count %u on WM_DESTROYCLIPBOARD\n", count ); + r = OpenClipboard(win); + ok(r, "OpenClipboard failed: %d\n", GetLastError()); + SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_FIXED, 1 )); + if (pGetClipboardSequenceNumber) + { + seq = pGetClipboardSequenceNumber(); + ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + old_seq = seq; + } + count = SendMessageA( win, WM_USER+2, 0, 0 ); + ok( !count, "WM_CLIPBOARDUPDATE received\n" ); + count = SendMessageA( win, WM_USER+3, 0, 0 ); + ok( !count, "WM_DESTROYCLIPBOARD received\n" ); + + EnterCriticalSection(&clipboard_cs); + r = CloseClipboard(); + ok(r, "CloseClipboard failed: %d\n", GetLastError()); + LeaveCriticalSection(&clipboard_cs); + + if (pGetClipboardSequenceNumber) + { + seq = pGetClipboardSequenceNumber(); + todo_wine ok( seq == old_seq, "sequence changed\n" ); + old_seq = seq; + } + count = SendMessageA( win, WM_USER+1, 0, 0 ); + ok( count, "WM_DRAWCLIPBOARD not received\n" ); + count = SendMessageA( win, WM_USER+2, 0, 0 ); + todo_wine ok( count || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); + + run_process( "grab_clipboard 0" ); + + if (pGetClipboardSequenceNumber) + { + seq = pGetClipboardSequenceNumber(); + ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + old_seq = seq; + } + count = SendMessageA( win, WM_USER+1, 0, 0 ); + todo_wine ok( count, "WM_DRAWCLIPBOARD not received\n" ); + count = SendMessageA( win, WM_USER+2, 0, 0 ); + todo_wine ok( count || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); + + r = OpenClipboard(0); + ok(r, "OpenClipboard failed: %d\n", GetLastError()); + SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_FIXED, 1 )); + if (pGetClipboardSequenceNumber) + { + seq = pGetClipboardSequenceNumber(); + todo_wine ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + old_seq = seq; + } + count = SendMessageA( win, WM_USER+1, 0, 0 ); + ok( !count, "WM_DRAWCLIPBOARD received\n" ); + count = SendMessageA( win, WM_USER+2, 0, 0 ); + ok( !count, "WM_CLIPBOARDUPDATE received\n" ); + + EnterCriticalSection(&clipboard_cs); + r = CloseClipboard(); + ok(r, "CloseClipboard failed: %d\n", GetLastError()); + LeaveCriticalSection(&clipboard_cs); + + if (pGetClipboardSequenceNumber) + { + seq = pGetClipboardSequenceNumber(); + todo_wine ok( seq == old_seq, "sequence changed\n" ); + old_seq = seq; + } + count = SendMessageA( win, WM_USER+1, 0, 0 ); + todo_wine ok( count, "WM_DRAWCLIPBOARD not received\n" ); + count = SendMessageA( win, WM_USER+2, 0, 0 ); + todo_wine ok( count || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); + + run_process( "grab_clipboard 1" ); + + if (pGetClipboardSequenceNumber) + { + seq = pGetClipboardSequenceNumber(); + ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + old_seq = seq; + } + count = SendMessageA( win, WM_USER+1, 0, 0 ); + todo_wine ok( count, "WM_DRAWCLIPBOARD not received\n" ); + count = SendMessageA( win, WM_USER+2, 0, 0 ); + todo_wine ok( count || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); + + r = OpenClipboard(0); + ok(r, "OpenClipboard failed: %d\n", GetLastError()); + SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_FIXED, 1 )); + if (pGetClipboardSequenceNumber) + { + seq = pGetClipboardSequenceNumber(); + todo_wine ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + old_seq = seq; + } + count = SendMessageA( win, WM_USER+1, 0, 0 ); + ok( !count, "WM_DRAWCLIPBOARD received\n" ); + count = SendMessageA( win, WM_USER+2, 0, 0 ); + ok( !count, "WM_CLIPBOARDUPDATE received\n" ); + + EnterCriticalSection(&clipboard_cs); + r = CloseClipboard(); + ok(r, "CloseClipboard failed: %d\n", GetLastError()); + LeaveCriticalSection(&clipboard_cs); + + if (pGetClipboardSequenceNumber) + { + seq = pGetClipboardSequenceNumber(); + todo_wine ok( seq == old_seq, "sequence changed\n" ); + old_seq = seq; + } + count = SendMessageA( win, WM_USER+1, 0, 0 ); + todo_wine ok( count, "WM_DRAWCLIPBOARD not received\n" ); + count = SendMessageA( win, WM_USER+2, 0, 0 ); + todo_wine ok( count || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); + r = PostMessageA(win, WM_USER, 0, 0); ok(r, "PostMessage failed: %d\n", GetLastError()); return 0; @@ -1110,6 +1245,11 @@ START_TEST(clipboard) set_clipboard_data_process( atoi( argv[3] )); return; } + if (argc == 4 && !strcmp( argv[2], "grab_clipboard" )) + { + grab_clipboard_process( atoi( argv[3] )); + return; + } if (argc == 4 && !strcmp( argv[2], "handles" )) { test_handles_process( argv[3] );

1 0

Alexandre Julliard : user32: Notify the clipboard viewer on close even if we are not the owner.
by Alexandre Julliard 25 Aug '16

25 Aug '16

Module: wine Branch: master Commit: 7888382e0ad2dd49833c4eaae88aaba922a9650d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7888382e0ad2dd49833c4eaae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 25 21:55:21 2016 +0900 user32: Notify the clipboard viewer on close even if we are not the owner. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 6 +++--- dlls/user32/tests/clipboard.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 251eadb..6d62dfd 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -181,12 +181,12 @@ BOOL WINAPI CloseClipboard(void) if (!ret) return FALSE; - if (bCBHasChanged && owner) + if (bCBHasChanged) { - USER_Driver->pEndClipboardUpdate(); + if (owner) USER_Driver->pEndClipboardUpdate(); + bCBHasChanged = FALSE; if (viewer) SendNotifyMessageW(viewer, WM_DRAWCLIPBOARD, (WPARAM) GetClipboardOwner(), 0); } - bCBHasChanged = FALSE; return TRUE; } diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index d162e33..f01af3d 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -838,7 +838,7 @@ static DWORD WINAPI clipboard_thread(void *param) old_seq = seq; } count = SendMessageA( win, WM_USER+1, 0, 0 ); - todo_wine ok( count, "WM_DRAWCLIPBOARD not received\n" ); + ok( count, "WM_DRAWCLIPBOARD not received\n" ); count = SendMessageA( win, WM_USER+2, 0, 0 ); todo_wine ok( count || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); @@ -881,7 +881,7 @@ static DWORD WINAPI clipboard_thread(void *param) old_seq = seq; } count = SendMessageA( win, WM_USER+1, 0, 0 ); - todo_wine ok( count, "WM_DRAWCLIPBOARD not received\n" ); + ok( count, "WM_DRAWCLIPBOARD not received\n" ); count = SendMessageA( win, WM_USER+2, 0, 0 ); todo_wine ok( count || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" );

1 0

Bernhard Übelacker : mlang/tests: Test IMultiLanguage_GetCharsetInfo with malformed charsets.
by Alexandre Julliard 25 Aug '16

25 Aug '16

Module: wine Branch: master Commit: 6f3b45d2fb560e5853e26a5ec8b610fcf251285f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f3b45d2fb560e5853e26a5ec… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Tue Aug 23 21:14:49 2016 +0200 mlang/tests: Test IMultiLanguage_GetCharsetInfo with malformed charsets. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/tests/mlang.c | 44 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 14da21e..cef2966 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -696,15 +696,49 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) IEnumCodePage_Release(iEnumCP); } -static void test_GetCharsetInfo_alias(IMultiLanguage *ml) +static void test_GetCharsetInfo_other(IMultiLanguage *ml) { WCHAR asciiW[] = {'a','s','c','i','i',0}; + WCHAR iso88591_1W[] = {'I','S','O','-','8','8','5','9','-','1',0}; + WCHAR iso88591_1retW[] = {'i','s','o','-','8','8','5','9','-','1',0}; + WCHAR iso88591_2W[] = {'I','S','O','8','8','5','9','-','1',0}; + WCHAR iso88591_2retW[] = {'i','s','o','8','8','5','9','-','1',0}; + WCHAR iso88591_3W[] = {'I','S','O','8','8','5','9','1',0}; + WCHAR iso88591_4W[] = {'I','S','O','-','8','8','5','9','1',0}; + WCHAR iso88591_5W[] = {'I','S','O','8','8','-','5','9','1',0}; + WCHAR iso88591_6W[] = {'-','I','S','O','8','8','5','9','1',0}; + WCHAR iso88591_7W[] = {' ','I','S','O','-','8','8','5','9','-','1',0}; + struct other { + int todo; + HRESULT hr; + WCHAR* charset; + WCHAR* ret_charset; + } other[] = { + { 0, S_OK, asciiW, asciiW }, + { 0, S_OK, iso88591_1W, iso88591_1retW }, + { 1, S_OK, iso88591_2W, iso88591_2retW }, + { 0, E_FAIL, iso88591_3W, 0 }, + { 0, E_FAIL, iso88591_4W, 0 }, + { 0, E_FAIL, iso88591_5W, 0 }, + { 0, E_FAIL, iso88591_6W, 0 }, + { 0, E_FAIL, iso88591_7W, 0 }, + }; MIMECSETINFO info; HRESULT hr; + int i; - hr = IMultiLanguage_GetCharsetInfo(ml, asciiW, &info); - ok(hr == S_OK, "got %08x\n", hr); - ok(!lstrcmpW(info.wszCharset, asciiW), "got %s\n", wine_dbgstr_w(info.wszCharset)); + for (i = 0; i < sizeof(other)/sizeof(*other); i++) + { + hr = IMultiLanguage_GetCharsetInfo(ml, other[i].charset, &info); + + todo_wine_if(other[i].todo) + ok(hr == other[i].hr, "#%d: got %08x, expected %08x\n", i, hr, other[i].hr); + + if (hr == S_OK) + todo_wine_if(other[i].todo) + ok(!lstrcmpW(info.wszCharset, other[i].ret_charset), "#%d: got %s, expected %s\n", + i, wine_dbgstr_w(info.wszCharset), wine_dbgstr_w(other[i].ret_charset)); + } } static void scriptinfo_cmp(SCRIPTINFO *sinfo1, SCRIPTINFO *sinfo2) @@ -2206,7 +2240,7 @@ START_TEST(mlang) test_GetNumberOfCodePageInfo((IMultiLanguage2 *)iML); test_IMLangConvertCharset(iML); - test_GetCharsetInfo_alias(iML); + test_GetCharsetInfo_other(iML); IMultiLanguage_Release(iML);

1 0

Akihiro Sagawa : winex11: Return more reliable value from X11DRV_MsgWaitForMultipleObjects.
by Alexandre Julliard 25 Aug '16

25 Aug '16

Module: wine Branch: master Commit: ce7a98e95cd0226248675c5ed712c9acad30c4be URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce7a98e95cd0226248675c5ed… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Aug 23 22:13:26 2016 +0900 winex11: Return more reliable value from X11DRV_MsgWaitForMultipleObjects. After processing several X events, X11DRV_MsgWaitForMultipleObjects always tells us that a new message is available. This is not true for some cases. For instance, when we call DestroyWindow, the X queues DestroyEvent. Then, X11DRV_MsgWaitForMultipleObjects handles the event only; none is posted or sent as hwnd for destroyed window is unavailable. However, the function states "new message is available" by returning count - 1 value. This is an issue for CoWaitForMultipleHandles because it expects a new message in the queue and consumes the message. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 6 ++- dlls/winex11.drv/event.c | 115 ++++++++++++++++++++++++------------------- dlls/winex11.drv/keyboard.c | 19 ++++--- dlls/winex11.drv/mouse.c | 43 +++++++++------- dlls/winex11.drv/window.c | 5 +- dlls/winex11.drv/wintab.c | 18 ++++--- dlls/winex11.drv/x11drv.h | 24 ++++----- 7 files changed, 130 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce7a98e95cd0226248675…

1 0

Huw Davies : uxtheme: Use 'ptr' instead of 'wstr' for [out] pointers.
by Alexandre Julliard 25 Aug '16

25 Aug '16

Module: wine Branch: master Commit: 839995d5e9afcbcdcd084eac3a8e6e48a2173eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=839995d5e9afcbcdcd084eac3… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 25 14:52:33 2016 +0100 uxtheme: Use 'ptr' instead of 'wstr' for [out] pointers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/uxtheme.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uxtheme/uxtheme.spec b/dlls/uxtheme/uxtheme.spec index d4ea07a..7d2a7d7 100644 --- a/dlls/uxtheme/uxtheme.spec +++ b/dlls/uxtheme/uxtheme.spec @@ -67,7 +67,7 @@ @ stdcall GetBufferedPaintDC(ptr) @ stdcall GetBufferedPaintTargetDC(ptr) @ stdcall GetBufferedPaintTargetRect(ptr ptr) -@ stdcall GetCurrentThemeName(wstr long wstr long wstr long) +@ stdcall GetCurrentThemeName(ptr long ptr long ptr long) @ stdcall GetThemeAppProperties() @ stdcall GetThemeBackgroundContentRect(ptr ptr long long ptr ptr) @ stdcall GetThemeBackgroundExtent(ptr ptr long long ptr ptr)

1 0

Huw Davies : ucrtbase: Add __stdio_common_vswscanf().
by Alexandre Julliard 25 Aug '16

25 Aug '16

Module: wine Branch: master Commit: f22769f81a2384219c6cb0f6b9f6daf4ac3c8857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f22769f81a2384219c6cb0f6b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 24 12:58:31 2016 +0100 ucrtbase: Add __stdio_common_vswscanf(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/scanf.c | 22 +++++++++++++++++++++- dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 0dc03b8..af723f7 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -18,7 +18,7 @@ @ cdecl __stdio_common_vswprintf(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf @ cdecl __stdio_common_vswprintf_p(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf_p @ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf_s -@ stub __stdio_common_vswscanf +@ cdecl __stdio_common_vswscanf(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswscanf @ cdecl _chsize(long long) ucrtbase._chsize @ cdecl _chsize_s(long int64) ucrtbase._chsize_s @ cdecl _close(long) ucrtbase._close diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 579dec5..093424a 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -66,7 +66,7 @@ static int wchar2digit(MSVCRT_wchar_t c, int base) { #undef SECURE #include "scanf.h" -/* vfscanf_l */ +/* vfscanf_s_l */ #define SECURE 1 #include "scanf.h" @@ -683,6 +683,26 @@ int CDECL MSVCRT__stdio_common_vsscanf(unsigned __int64 options, } /********************************************************************* + * __stdio_common_vswscanf (MSVCRT.@) + */ +int CDECL MSVCRT__stdio_common_vswscanf(unsigned __int64 options, + const MSVCRT_wchar_t *input, MSVCRT_size_t length, + const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, + __ms_va_list valist) +{ + /* LEGACY_WIDE_SPECIFIERS only has got an effect on the wide + * scanf. LEGACY_MSVCRT_COMPATIBILITY affects parsing of nan/inf, + * but parsing of those isn't implemented at all yet. */ + if (options & ~UCRTBASE_SCANF_MASK) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + if (options & UCRTBASE_SCANF_SECURECRT) + return MSVCRT_vsnwscanf_s_l(input, length, format, locale, valist); + else + return MSVCRT_vsnwscanf_l(input, length, format, locale, valist); +} + +/********************************************************************* * __stdio_common_vfwscanf (MSVCRT.@) */ int CDECL MSVCRT__stdio_common_vfwscanf(unsigned __int64 options, diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index d20ef71..6ec16d9 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -163,7 +163,7 @@ @ cdecl __stdio_common_vswprintf(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf @ cdecl __stdio_common_vswprintf_p(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_p @ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_s -@ stub __stdio_common_vswscanf +@ cdecl __stdio_common_vswscanf(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswscanf @ stub __strncnt @ cdecl __sys_errlist() @ cdecl __sys_nerr()

1 0