October 2018 - Wine-commits

Alexandre Julliard : explorer: Move the check for the magic root desktop to the X11 driver.
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: wine Branch: master Commit: 9f8049105db6a91527bd57c1e16db9c161bf4d3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f8049105db6a91527bd57c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 31 16:26:38 2018 +0100 explorer: Move the check for the magic root desktop to the X11 driver. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 11 ++++++++++- programs/explorer/desktop.c | 4 +--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 559efe2..d478cbd 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -173,12 +173,21 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) */ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) { + static const WCHAR rootW[] = {'r','o','o','t',0}; XSetWindowAttributes win_attr; Window win; Display *display = thread_init_display(); RECT rect; + WCHAR name[MAX_PATH]; - TRACE( "%u x %u\n", width, height ); + if (!GetUserObjectInformationW( GetThreadDesktop( GetCurrentThreadId() ), + UOI_NAME, name, sizeof(name), NULL )) + name[0] = 0; + + TRACE( "%s %ux%u\n", debugstr_w(name), width, height ); + + /* magic: desktop "root" means use the root window */ + if (!lstrcmpiW( name, rootW )) return FALSE; /* Create window */ win_attr.event_mask = ExposureMask | KeyPressMask | KeyReleaseMask | EnterWindowMask | diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index ff58204..d802bc3 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -670,12 +670,10 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR /* create the desktop and the associated driver window, and make it the current desktop */ static BOOL create_desktop( HMODULE driver, const WCHAR *name, unsigned int width, unsigned int height ) { - static const WCHAR rootW[] = {'r','o','o','t',0}; BOOL ret = FALSE; BOOL (CDECL *create_desktop_func)(unsigned int, unsigned int); - /* magic: desktop "root" means use the root window */ - if (driver && strcmpiW( name, rootW )) + if (driver) { create_desktop_func = (void *)GetProcAddress( driver, "wine_create_desktop" ); if (create_desktop_func) ret = create_desktop_func( width, height );

1 0

Jacek Caban : ntdll/tests: Add more I/O blocking and completion tests.
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: wine Branch: master Commit: 36693cfb5fc893a86501d0bb99fde06c50728113 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36693cfb5fc893a86501d0bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 31 16:44:49 2018 +0100 ntdll/tests: Add more I/O blocking and completion tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 319 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 318 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=36693cfb5fc893a86501…

1 0

Jacek Caban : server: Introduce is_fd_overlapped() helper.
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: wine Branch: master Commit: f7f9bf982335053bc7f6f1aaa5b556ea52c5a77d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7f9bf982335053bc7f6f1aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 31 16:44:56 2018 +0100 server: Introduce is_fd_overlapped() helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 10 ++++++++-- server/file.c | 7 +------ server/file.h | 1 + 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/server/fd.c b/server/fd.c index 1459ad1..eba3256 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1930,6 +1930,12 @@ unsigned int get_fd_options( struct fd *fd ) return fd->options; } +/* check if fd is in overlapped mode */ +int is_fd_overlapped( struct fd *fd ) +{ + return !(fd->options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); +} + /* retrieve the unix fd for an object */ int get_unix_fd( struct fd *fd ) { @@ -2611,7 +2617,7 @@ DECL_HANDLER(set_completion_info) if (fd) { - if (!(fd->options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && !fd->completion) + if (is_fd_overlapped( fd ) && !fd->completion) { fd->completion = get_completion_obj( current->process, req->chandle, IO_COMPLETION_MODIFY_STATE ); fd->comp_key = req->ckey; @@ -2639,7 +2645,7 @@ DECL_HANDLER(set_fd_completion_mode) struct fd *fd = get_handle_fd_obj( current->process, req->handle, 0 ); if (fd) { - if (!(fd->options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) + if (is_fd_overlapped( fd )) { /* removing COMPLETION_SKIP_ON_SUCCESS is not allowed */ fd->comp_flags |= req->flags & ( FILE_SKIP_COMPLETION_PORT_ON_SUCCESS diff --git a/server/file.c b/server/file.c index 37f7afe..8d39f30 100644 --- a/server/file.c +++ b/server/file.c @@ -114,11 +114,6 @@ static const struct fd_ops file_fd_ops = default_fd_reselect_async /* reselect_async */ }; -static inline int is_overlapped( const struct file *file ) -{ - return !(get_fd_options( file->fd ) & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); -} - /* create a file from a file descriptor */ /* if the function fails the fd is closed */ struct file *create_file_for_fd( int fd, unsigned int access, unsigned int sharing ) @@ -761,7 +756,7 @@ DECL_HANDLER(lock_file) if ((file = get_file_obj( current->process, req->handle, 0 ))) { reply->handle = lock_fd( file->fd, req->offset, req->count, req->shared, req->wait ); - reply->overlapped = is_overlapped( file ); + reply->overlapped = is_fd_overlapped( file->fd ); release_object( file ); } } diff --git a/server/file.h b/server/file.h index 84cbc29..a9581a7 100644 --- a/server/file.h +++ b/server/file.h @@ -88,6 +88,7 @@ extern struct fd *get_fd_object_for_mapping( struct fd *fd, unsigned int access, extern void *get_fd_user( struct fd *fd ); extern void set_fd_user( struct fd *fd, const struct fd_ops *ops, struct object *user ); extern unsigned int get_fd_options( struct fd *fd ); +extern int is_fd_overlapped( struct fd *fd ); extern int get_unix_fd( struct fd *fd ); extern int is_same_file_fd( struct fd *fd1, struct fd *fd2 ); extern int is_fd_removable( struct fd *fd );

1 0

Jacek Caban : server: Use file mode flags in async_handoff to decide if request is blocking.
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: wine Branch: master Commit: 43cdcc079445fc75b0559f54c4b96946074484d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43cdcc079445fc75b0559f54… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 31 16:45:04 2018 +0100 server: Use file mode flags in async_handoff to decide if request is blocking. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 20 +++++++------------- server/async.c | 4 ++-- server/fd.c | 8 ++++---- server/file.h | 2 +- 4 files changed, 14 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index fe65012..08bde6d 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -412,9 +412,9 @@ static void test_alertable(void) res = listen_pipe(hPipe, hEvent, &iosb, TRUE); todo_wine ok(res == STATUS_CANCELLED, "NtFsControlFile returned %x\n", res); - todo_wine ok(userapc_called, "user apc didn't run\n"); + ok(userapc_called, "user apc didn't run\n"); ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %x\n", U(iosb).Status); - todo_wine ok(WaitForSingleObjectEx(hEvent, 0, TRUE) == WAIT_TIMEOUT, "hEvent signaled\n"); + ok(WaitForSingleObjectEx(hEvent, 0, TRUE) == WAIT_TIMEOUT, "hEvent signaled\n"); ok(!ioapc_called, "IOAPC ran\n"); /* queue an user apc from a different thread */ @@ -445,11 +445,11 @@ static void test_alertable(void) ok(hThread != INVALID_HANDLE_VALUE, "can't create thread, GetLastError: %x\n", GetLastError()); res = listen_pipe(hPipe, hEvent, &iosb, TRUE); - todo_wine ok(!res, "NtFsControlFile returned %x\n", res); + ok(!res, "NtFsControlFile returned %x\n", res); ok(open_succeeded, "couldn't open client side pipe\n"); ok(!U(iosb).Status, "Wrong iostatus %x\n", U(iosb).Status); - todo_wine ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n"); + ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n"); WaitForSingleObject(hThread, INFINITE); CloseHandle(hThread); @@ -482,11 +482,11 @@ static void test_nonalertable(void) ok(ret, "can't queue user apc, GetLastError: %x\n", GetLastError()); res = listen_pipe(hPipe, hEvent, &iosb, TRUE); - todo_wine ok(!res, "NtFsControlFile returned %x\n", res); + ok(!res, "NtFsControlFile returned %x\n", res); ok(open_succeeded, "couldn't open client side pipe\n"); - todo_wine ok(!U(iosb).Status, "Wrong iostatus %x\n", U(iosb).Status); - todo_wine ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n"); + ok(!U(iosb).Status, "Wrong iostatus %x\n", U(iosb).Status); + ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n"); ok(!ioapc_called, "IOAPC ran too early\n"); ok(!userapc_called, "user apc ran too early\n"); @@ -1348,7 +1348,6 @@ static void test_completion(void) ok(is_signaled(client), "client is not signaled\n"); - if (broken(1)) { /* blocks on wine */ /* no event, APC nor completion: only signals on handle */ memset(&io, 0xcc, sizeof(io)); status = NtReadFile(client, NULL, NULL, NULL, &io, read_buf, sizeof(read_buf), NULL, NULL); @@ -1360,7 +1359,6 @@ static void test_completion(void) ok(is_signaled(client), "client is signaled\n"); ok(io.Status == STATUS_SUCCESS, "Status = %x\n", io.Status); ok(io.Information == sizeof(buf), "Information = %lu\n", io.Information); - } /* event with no APC nor completion: signals only event */ memset(&io, 0xcc, sizeof(io)); @@ -1434,12 +1432,10 @@ static void test_completion(void) ok(!is_signaled(client), "client is signaled\n"); test_queued_completion(port, &io, STATUS_SUCCESS, sizeof(buf)); - if (broken(1)) { /* blocks on wine */ memset(&io, 0xcc, sizeof(io)); status = NtReadFile(client, NULL, NULL, NULL, &io, read_buf, sizeof(read_buf), NULL, NULL); ok(status == STATUS_PENDING, "status = %x\n", status); ok(!is_signaled(client), "client is signaled\n"); - } ret = WriteFile(client, buf, 1, &num_bytes, NULL); ok(ret, "WriteFile failed, error %u\n", GetLastError()); @@ -1575,9 +1571,7 @@ static void test_blocking(ULONG options) SetEvent(ctx.wait); status = NtReadFile(ctx.client, ctx.event, ioapc, &io, &io, read_buf, sizeof(read_buf), NULL, NULL); - todo_wine ok(status == STATUS_SUCCESS, "status = %x\n", status); - if (status == STATUS_PENDING) WaitForSingleObject(ctx.event, INFINITE); ok(io.Status == STATUS_SUCCESS, "Status = %x\n", io.Status); ok(io.Information == 1, "Information = %lu\n", io.Information); ok(is_signaled(ctx.event), "event is not signaled\n"); diff --git a/server/async.c b/server/async.c index f2674bb..cadeda3 100644 --- a/server/async.c +++ b/server/async.c @@ -284,7 +284,7 @@ struct async *create_request_async( struct fd *fd, unsigned int comp_flags, cons } /* return async object status and wait handle to client */ -obj_handle_t async_handoff( struct async *async, int success, data_size_t *result ) +obj_handle_t async_handoff( struct async *async, int success, data_size_t *result, int force_blocking ) { if (!success) { @@ -316,7 +316,7 @@ obj_handle_t async_handoff( struct async *async, int success, data_size_t *resul else { async->direct_result = 0; - if (!async_is_blocking( async )) + if (!force_blocking && async->fd && is_fd_overlapped( async->fd )) { close_handle( async->thread->process, async->wait_handle); async->wait_handle = 0; diff --git a/server/fd.c b/server/fd.c index eba3256..119fae6 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2438,7 +2438,7 @@ DECL_HANDLER(flush) if ((async = create_request_async( fd, fd->comp_flags, &req->async ))) { - reply->event = async_handoff( async, fd->fd_ops->flush( fd, async ), NULL ); + reply->event = async_handoff( async, fd->fd_ops->flush( fd, async ), NULL, 1 ); release_object( async ); } release_object( fd ); @@ -2537,7 +2537,7 @@ DECL_HANDLER(read) if ((async = create_request_async( fd, fd->comp_flags, &req->async ))) { - reply->wait = async_handoff( async, fd->fd_ops->read( fd, async, req->pos ), NULL ); + reply->wait = async_handoff( async, fd->fd_ops->read( fd, async, req->pos ), NULL, 0 ); reply->options = fd->options; release_object( async ); } @@ -2554,7 +2554,7 @@ DECL_HANDLER(write) if ((async = create_request_async( fd, fd->comp_flags, &req->async ))) { - reply->wait = async_handoff( async, fd->fd_ops->write( fd, async, req->pos ), &reply->size ); + reply->wait = async_handoff( async, fd->fd_ops->write( fd, async, req->pos ), &reply->size, 0 ); reply->options = fd->options; release_object( async ); } @@ -2572,7 +2572,7 @@ DECL_HANDLER(ioctl) if ((async = create_request_async( fd, fd->comp_flags, &req->async ))) { - reply->wait = async_handoff( async, fd->fd_ops->ioctl( fd, req->code, async ), NULL ); + reply->wait = async_handoff( async, fd->fd_ops->ioctl( fd, req->code, async ), NULL, 0 ); reply->options = fd->options; release_object( async ); } diff --git a/server/file.h b/server/file.h index a9581a7..6b67866 100644 --- a/server/file.h +++ b/server/file.h @@ -187,7 +187,7 @@ extern struct object *create_serial( struct fd *fd ); extern void free_async_queue( struct async_queue *queue ); extern struct async *create_async( struct fd *fd, struct thread *thread, const async_data_t *data, struct iosb *iosb ); extern struct async *create_request_async( struct fd *fd, unsigned int comp_flags, const async_data_t *data ); -extern obj_handle_t async_handoff( struct async *async, int success, data_size_t *result ); +extern obj_handle_t async_handoff( struct async *async, int success, data_size_t *result, int force_blocking ); extern void queue_async( struct async_queue *queue, struct async *async ); extern void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status ); extern void async_set_result( struct object *obj, unsigned int status, apc_param_t total );

1 0

Louis Lenders : qwave: Add new stub dll.
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: wine Branch: master Commit: 73c0ec29eb6429f023060d870f198a9395d8db23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73c0ec29eb6429f023060d87… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Oct 31 17:04:46 2018 +0100 qwave: Add new stub dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46066 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/qwave/Makefile.in | 4 ++++ dlls/qwave/main.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/qwave/qwave.spec | 14 ++++++++++++++ 5 files changed, 62 insertions(+) diff --git a/configure b/configure index 51e3d7f..60ec989 100755 --- a/configure +++ b/configure @@ -1486,6 +1486,7 @@ enable_qmgr enable_qmgrprxy enable_quartz enable_query +enable_qwave enable_rasapi32 enable_rasdlg enable_regapi @@ -19758,6 +19759,7 @@ wine_fn_config_makefile dlls/qmgrprxy enable_qmgrprxy wine_fn_config_makefile dlls/quartz enable_quartz wine_fn_config_makefile dlls/quartz/tests enable_tests wine_fn_config_makefile dlls/query enable_query +wine_fn_config_makefile dlls/qwave enable_qwave wine_fn_config_makefile dlls/rasapi16.dll16 enable_win16 wine_fn_config_makefile dlls/rasapi32 enable_rasapi32 wine_fn_config_makefile dlls/rasapi32/tests enable_tests diff --git a/configure.ac b/configure.ac index b64d99e..82a3c46 100644 --- a/configure.ac +++ b/configure.ac @@ -3611,6 +3611,7 @@ WINE_CONFIG_MAKEFILE(dlls/qmgrprxy) WINE_CONFIG_MAKEFILE(dlls/quartz) WINE_CONFIG_MAKEFILE(dlls/quartz/tests) WINE_CONFIG_MAKEFILE(dlls/query) +WINE_CONFIG_MAKEFILE(dlls/qwave) WINE_CONFIG_MAKEFILE(dlls/rasapi16.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/rasapi32) WINE_CONFIG_MAKEFILE(dlls/rasapi32/tests) diff --git a/dlls/qwave/Makefile.in b/dlls/qwave/Makefile.in new file mode 100644 index 0000000..9de8224 --- /dev/null +++ b/dlls/qwave/Makefile.in @@ -0,0 +1,4 @@ +MODULE = qwave.dll + +C_SRCS = \ + main.c diff --git a/dlls/qwave/main.c b/dlls/qwave/main.c new file mode 100644 index 0000000..ce1cfbd --- /dev/null +++ b/dlls/qwave/main.c @@ -0,0 +1,41 @@ +/* + * Copyright 2018 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qwave); + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) +{ + TRACE("(%p, %d, %p)\n", hInstDLL, reason, lpv); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + return TRUE; +} diff --git a/dlls/qwave/qwave.spec b/dlls/qwave/qwave.spec new file mode 100644 index 0000000..27b07f5 --- /dev/null +++ b/dlls/qwave/qwave.spec @@ -0,0 +1,14 @@ +@ stub QDLHPathDiagnostics +@ stub QDLHStartDiagnosingPath +@ stub QOSAddSocketToFlow +@ stub QOSCancel +@ stub QOSCloseHandle +@ stub QOSCreateHandle +@ stub QOSEnumerateFlows +@ stub QOSNotifyFlow +@ stub QOSQueryFlow +@ stub QOSRemoveSocketFromFlow +@ stub QOSSetFlow +@ stub QOSStartTrackingClient +@ stub QOSStopTrackingClient +@ stub ServiceMain

1 0

Brendan McGrath : dinput/tests: Test that the GUID is the same for Instance and Product.
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: wine Branch: master Commit: c357f3670f71f3fc40aad0d89f3c9553e653c246 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c357f3670f71f3fc40aad0d8… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Wed Oct 31 21:01:40 2018 +1100 dinput/tests: Test that the GUID is the same for Instance and Product. Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/dinput.c | 11 +++++++++++ dlls/dinput8/tests/dinput.c | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index 7e2da9f..d9d3279 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -392,6 +392,17 @@ static BOOL CALLBACK enum_devices_callback(const DIDEVICEINSTANCEA *instance, vo { struct enum_devices_test *enum_test = context; + if ((instance->dwDevType & 0xff) == DIDEVTYPE_KEYBOARD || + (instance->dwDevType & 0xff) == DIDEVTYPE_MOUSE) { + const char *device = ((instance->dwDevType & 0xff) == + DIDEVTYPE_KEYBOARD) ? "Keyboard" : "Mouse"; + todo_wine + ok(IsEqualGUID(&instance->guidInstance, &instance->guidProduct), + "%s guidInstance (%s) does not match guidProduct (%s)\n", + device, wine_dbgstr_guid(&instance->guidInstance), + wine_dbgstr_guid(&instance->guidProduct)); + } + enum_test->device_count++; return enum_test->return_value; } diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput8/tests/dinput.c index b093437..403c4a8 100644 --- a/dlls/dinput8/tests/dinput.c +++ b/dlls/dinput8/tests/dinput.c @@ -377,6 +377,17 @@ static BOOL CALLBACK enum_devices_callback(const DIDEVICEINSTANCEA *instance, vo instance->wUsagePage, instance->wUsage); + if ((instance->dwDevType & 0xff) == DI8DEVTYPE_KEYBOARD || + (instance->dwDevType & 0xff) == DI8DEVTYPE_MOUSE) { + const char *device = ((instance->dwDevType & 0xff) == + DI8DEVTYPE_KEYBOARD) ? "Keyboard" : "Mouse"; + todo_wine + ok(IsEqualGUID(&instance->guidInstance, &instance->guidProduct), + "%s guidInstance (%s) does not match guidProduct (%s)\n", + device, wine_dbgstr_guid(&instance->guidInstance), + wine_dbgstr_guid(&instance->guidProduct)); + } + enum_test->device_count++; return enum_test->return_value; }

1 0

Brendan McGrath : dinput: Use the same GUID for Instance and Product.
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: wine Branch: master Commit: 3a2834b3a42e869b7d450074c29cd7089bfef015 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a2834b3a42e869b7d450074… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Wed Oct 31 21:01:41 2018 +1100 dinput: Use the same GUID for Instance and Product. Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device_private.h | 3 --- dlls/dinput/dinput_main.c | 6 ++---- dlls/dinput/keyboard.c | 11 +++-------- dlls/dinput/mouse.c | 11 +++-------- dlls/dinput/tests/dinput.c | 1 - dlls/dinput8/tests/dinput.c | 1 - 6 files changed, 8 insertions(+), 25 deletions(-) diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 52bbec4..d9e2997 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -114,9 +114,6 @@ typedef struct LPDIRECTINPUTEFFECT ref; } effect_list_item; -extern const GUID DInput_Wine_Keyboard_GUID DECLSPEC_HIDDEN; -extern const GUID DInput_Wine_Mouse_GUID DECLSPEC_HIDDEN; - /* Various debug tools */ extern void _dump_DIPROPHEADER(LPCDIPROPHEADER diph) DECLSPEC_HIDDEN; extern void _dump_OBJECTINSTANCEA(const DIDEVICEOBJECTINSTANCEA *ddoi) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 28e192a..6ed764e 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1747,12 +1747,10 @@ static DWORD WINAPI hook_thread_proc(void *param) { if (!dev->acquired || !dev->event_proc) continue; - if (IsEqualGUID( &dev->guid, &GUID_SysKeyboard ) || - IsEqualGUID( &dev->guid, &DInput_Wine_Keyboard_GUID )) + if (IsEqualGUID( &dev->guid, &GUID_SysKeyboard )) kbd_cnt++; else - if (IsEqualGUID( &dev->guid, &GUID_SysMouse ) || - IsEqualGUID( &dev->guid, &DInput_Wine_Mouse_GUID )) + if (IsEqualGUID( &dev->guid, &GUID_SysMouse )) mice_cnt++; } LeaveCriticalSection( &dinput->crit ); diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index a64c59c..642d0c0 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -145,10 +145,6 @@ static int KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM return ret; } -const GUID DInput_Wine_Keyboard_GUID = { /* 0ab8648a-7735-11d2-8c73-71df54a96441 */ - 0x0ab8648a, 0x7735, 0x11d2, {0x8c, 0x73, 0x71, 0xdf, 0x54, 0xa9, 0x64, 0x41} -}; - static DWORD get_keyboard_subtype(void) { DWORD kbd_type, kbd_subtype, dev_subtype; @@ -179,7 +175,7 @@ static void fill_keyboard_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD ver ddi.dwSize = dwSize; ddi.guidInstance = GUID_SysKeyboard;/* DInput's GUID */ - ddi.guidProduct = DInput_Wine_Keyboard_GUID; /* Vendor's GUID */ + ddi.guidProduct = GUID_SysKeyboard; if (version >= 0x0800) ddi.dwDevType = DI8DEVTYPE_KEYBOARD | (subtype << 8); else @@ -203,7 +199,7 @@ static void fill_keyboard_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver ddi.dwSize = dwSize; ddi.guidInstance = GUID_SysKeyboard;/* DInput's GUID */ - ddi.guidProduct = DInput_Wine_Keyboard_GUID; /* Vendor's GUID */ + ddi.guidProduct = GUID_SysKeyboard; if (version >= 0x0800) ddi.dwDevType = DI8DEVTYPE_KEYBOARD | (subtype << 8); else @@ -308,8 +304,7 @@ static HRESULT keyboarddev_create_device(IDirectInputImpl *dinput, REFGUID rguid TRACE("%p %s %s %p %i\n", dinput, debugstr_guid(rguid), debugstr_guid(riid), pdev, unicode); *pdev = NULL; - if (IsEqualGUID(&GUID_SysKeyboard, rguid) || /* Generic Keyboard */ - IsEqualGUID(&DInput_Wine_Keyboard_GUID, rguid)) /* Wine Keyboard */ + if (IsEqualGUID(&GUID_SysKeyboard, rguid)) /* Wine Keyboard */ { SysKeyboardImpl *This; diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 6d3eff5..7133359 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -93,10 +93,6 @@ static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(SysMouseImpl static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ); -const GUID DInput_Wine_Mouse_GUID = { /* 9e573ed8-7734-11d2-8d4a-23903fb6bdf7 */ - 0x9e573ed8, 0x7734, 0x11d2, {0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7} -}; - static void _dump_mouse_state(const DIMOUSESTATE2 *m_state) { int i; @@ -121,7 +117,7 @@ static void fill_mouse_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD versio ddi.dwSize = dwSize; ddi.guidInstance = GUID_SysMouse;/* DInput's GUID */ - ddi.guidProduct = DInput_Wine_Mouse_GUID; /* Vendor's GUID */ + ddi.guidProduct = GUID_SysMouse; if (version >= 0x0800) ddi.dwDevType = DI8DEVTYPE_MOUSE | (DI8DEVTYPEMOUSE_TRADITIONAL << 8); else @@ -145,7 +141,7 @@ static void fill_mouse_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD versio ddi.dwSize = dwSize; ddi.guidInstance = GUID_SysMouse;/* DInput's GUID */ - ddi.guidProduct = DInput_Wine_Mouse_GUID; /* Vendor's GUID */ + ddi.guidProduct = GUID_SysMouse; if (version >= 0x0800) ddi.dwDevType = DI8DEVTYPE_MOUSE | (DI8DEVTYPEMOUSE_TRADITIONAL << 8); else @@ -257,8 +253,7 @@ static HRESULT mousedev_create_device(IDirectInputImpl *dinput, REFGUID rguid, R TRACE("%p %s %s %p %i\n", dinput, debugstr_guid(rguid), debugstr_guid(riid), pdev, unicode); *pdev = NULL; - if (IsEqualGUID(&GUID_SysMouse, rguid) || /* Generic Mouse */ - IsEqualGUID(&DInput_Wine_Mouse_GUID, rguid)) /* Wine Mouse */ + if (IsEqualGUID(&GUID_SysMouse, rguid)) /* Wine Mouse */ { SysMouseImpl *This; diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index d9d3279..cb72689 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -396,7 +396,6 @@ static BOOL CALLBACK enum_devices_callback(const DIDEVICEINSTANCEA *instance, vo (instance->dwDevType & 0xff) == DIDEVTYPE_MOUSE) { const char *device = ((instance->dwDevType & 0xff) == DIDEVTYPE_KEYBOARD) ? "Keyboard" : "Mouse"; - todo_wine ok(IsEqualGUID(&instance->guidInstance, &instance->guidProduct), "%s guidInstance (%s) does not match guidProduct (%s)\n", device, wine_dbgstr_guid(&instance->guidInstance), diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput8/tests/dinput.c index 403c4a8..28b1bd5 100644 --- a/dlls/dinput8/tests/dinput.c +++ b/dlls/dinput8/tests/dinput.c @@ -381,7 +381,6 @@ static BOOL CALLBACK enum_devices_callback(const DIDEVICEINSTANCEA *instance, vo (instance->dwDevType & 0xff) == DI8DEVTYPE_MOUSE) { const char *device = ((instance->dwDevType & 0xff) == DI8DEVTYPE_KEYBOARD) ? "Keyboard" : "Mouse"; - todo_wine ok(IsEqualGUID(&instance->guidInstance, &instance->guidProduct), "%s guidInstance (%s) does not match guidProduct (%s)\n", device, wine_dbgstr_guid(&instance->guidInstance),

1 0

Stefan Dösinger : ntdll: Avoid more race conditions in RtlDeregisterWaitEx.
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: wine Branch: master Commit: 759e6f1d8d5c531291440299bad0c1ab5ae53d05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=759e6f1d8d5c531291440299… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Oct 28 22:14:14 2018 +0100 ntdll: Avoid more race conditions in RtlDeregisterWaitEx. af35aada9b078f8dc71dcc85e505da8eee4571da left some issues unfixed. Instead of running the callback and returning a retval that indicates the callback is not running, we sometimes wait for it when we are not supposed to. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/threadpool.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 1b0546a..bf7449c 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -81,7 +81,7 @@ struct wait_work_item ULONG Flags; HANDLE CompletionEvent; LONG DeleteCount; - BOOLEAN CallbackInProgress; + int CallbackInProgress; }; struct timer_queue; @@ -530,9 +530,14 @@ static DWORD CALLBACK wait_thread_proc(LPVOID Arg) wait_work_item->Context ); TimerOrWaitFired = TRUE; } - wait_work_item->CallbackInProgress = TRUE; + interlocked_xchg( &wait_work_item->CallbackInProgress, TRUE ); + if (wait_work_item->CompletionEvent) + { + TRACE( "Work has been canceled.\n" ); + break; + } wait_work_item->Callback( wait_work_item->Context, TimerOrWaitFired ); - wait_work_item->CallbackInProgress = FALSE; + interlocked_xchg( &wait_work_item->CallbackInProgress, FALSE ); if (wait_work_item->Flags & WT_EXECUTEONLYONCE) break; @@ -546,7 +551,8 @@ static DWORD CALLBACK wait_thread_proc(LPVOID Arg) { completion_event = wait_work_item->CompletionEvent; delete_wait_work_item( wait_work_item ); - if (completion_event) NtSetEvent( completion_event, NULL ); + if (completion_event && completion_event != INVALID_HANDLE_VALUE) + NtSetEvent( completion_event, NULL ); } return 0; @@ -637,14 +643,16 @@ NTSTATUS WINAPI RtlDeregisterWaitEx(HANDLE WaitHandle, HANDLE CompletionEvent) struct wait_work_item *wait_work_item = WaitHandle; NTSTATUS status; HANDLE LocalEvent = NULL; - BOOLEAN CallbackInProgress; + int CallbackInProgress; TRACE( "(%p %p)\n", WaitHandle, CompletionEvent ); if (WaitHandle == NULL) return STATUS_INVALID_HANDLE; + interlocked_xchg_ptr( &wait_work_item->CompletionEvent, INVALID_HANDLE_VALUE ); CallbackInProgress = wait_work_item->CallbackInProgress; + TRACE( "callback in progress %u\n", CallbackInProgress ); if (CompletionEvent == INVALID_HANDLE_VALUE || !CallbackInProgress) { status = NtCreateEvent( &LocalEvent, EVENT_ALL_ACCESS, NULL, NotificationEvent, FALSE ); @@ -666,6 +674,7 @@ NTSTATUS WINAPI RtlDeregisterWaitEx(HANDLE WaitHandle, HANDLE CompletionEvent) } else if (LocalEvent) { + TRACE( "Waiting for completion event\n" ); NtWaitForSingleObject( LocalEvent, FALSE, NULL ); status = STATUS_SUCCESS; }

1 0

Jacek Caban : user32/tests: Add scrollbar subclassing tests.
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: wine Branch: master Commit: d23be055befb1021e30cf2da1e58f9aebee4b298 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d23be055befb1021e30cf2da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 31 18:19:56 2018 +0100 user32/tests: Add scrollbar subclassing tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/scroll.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index c19607d..1ff9b39 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -602,6 +602,79 @@ static void test_SetScrollInfo(void) DestroyWindow(mainwnd); } +static WNDPROC scrollbar_wndproc; + +static LRESULT CALLBACK subclass_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + if (msg == WM_CREATE && ((CREATESTRUCTA*)lparam)->lpCreateParams) + return DefWindowProcA(hwnd, msg, wparam, lparam); + + return CallWindowProcA(scrollbar_wndproc, hwnd, msg, wparam, lparam); +} + +static void test_subclass(void) +{ + SCROLLBARINFO scroll_info; + WNDCLASSEXA class_info; + WNDCLASSA wc; + LRESULT res; + HWND hwnd; + BOOL r; + + r = GetClassInfoExA(GetModuleHandleA(NULL), "SCROLLBAR", &class_info); + ok(r, "GetClassInfoEx failed: %u\n", GetLastError()); + scrollbar_wndproc = class_info.lpfnWndProc; + + memset(&wc, 0, sizeof(wc)); + wc.cbWndExtra = class_info.cbWndExtra + 3; /* more space than needed works */ + wc.hInstance = GetModuleHandleA(NULL); + wc.lpszClassName = "MyTestSubclass"; + wc.lpfnWndProc = subclass_proc; + r = RegisterClassA(&wc); + ok(r, "RegisterClass failed: %u\n", GetLastError()); + + hwnd = CreateWindowExA( 0, "MyTestSubclass", "Scroll", WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0 ); + ok(hwnd != NULL, "Failed to create window: %u\n", GetLastError()); + + memset(&scroll_info, 0xcc, sizeof(scroll_info)); + scroll_info.cbSize = sizeof(scroll_info); + res = SendMessageA(hwnd, SBM_GETSCROLLBARINFO, 0, (LPARAM)&scroll_info); + todo_wine + ok(res == 1, "SBM_GETSCROLLBARINFO returned %lu\n", res); + + DestroyWindow(hwnd); + + /* if we skip calling wndproc for WM_CREATE, window is not considered a scrollbar */ + hwnd = CreateWindowExA( 0, "MyTestSubclass", "Scroll", WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, NULL, NULL, GetModuleHandleA(NULL), (void *)1 ); + ok(hwnd != NULL, "Failed to create window: %u\n", GetLastError()); + + memset(&scroll_info, 0xcc, sizeof(scroll_info)); + scroll_info.cbSize = sizeof(scroll_info); + res = SendMessageA(hwnd, SBM_GETSCROLLBARINFO, 0, (LPARAM)&scroll_info); + ok(!res, "SBM_GETSCROLLBARINFO returned %lu\n", res); + + DestroyWindow(hwnd); + + /* not enough space in extra data */ + wc.cbWndExtra = class_info.cbWndExtra - 1; + wc.lpszClassName = "MyTestSubclass2"; + r = RegisterClassA(&wc); + ok(r, "RegisterClass failed: %u\n", GetLastError()); + + hwnd = CreateWindowExA( 0, "MyTestSubclass2", "Scroll", WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0 ); + ok(hwnd != NULL, "Failed to create window: %u\n", GetLastError()); + + memset(&scroll_info, 0xcc, sizeof(scroll_info)); + scroll_info.cbSize = sizeof(scroll_info); + res = SendMessageA(hwnd, SBM_GETSCROLLBARINFO, 0, (LPARAM)&scroll_info); + ok(!res, "SBM_GETSCROLLBARINFO returned %lu\n", res); + + DestroyWindow(hwnd); +} + START_TEST ( scroll ) { WNDCLASSA wc; @@ -626,6 +699,7 @@ START_TEST ( scroll ) test_GetScrollBarInfo(); scrollbar_test_track(); test_SetScrollInfo(); + test_subclass(); /* Some test results vary depending of theming being active or not */ hUxtheme = LoadLibraryA("uxtheme.dll");

1 0

Henri Verbeet : wined3d: Pass correct bind flags to texture creation functions.
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: wine Branch: master Commit: 7cba91571061753e7cf0c6f67bd82a86d7cf7827 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cba91571061753e7cf0c6f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 31 13:19:47 2018 +0330 wined3d: Pass correct bind flags to texture creation functions. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/buffer.c | 2 +- dlls/d3d11/d3d11_private.h | 11 ++++++++++- dlls/d3d11/device.c | 2 +- dlls/d3d11/texture.c | 3 +++ dlls/d3d11/utils.c | 15 --------------- dlls/d3d8/buffer.c | 4 ++-- dlls/d3d8/d3d8_private.h | 21 +++++++++++++++++++-- dlls/d3d8/device.c | 1 + dlls/d3d8/surface.c | 2 +- dlls/d3d8/texture.c | 9 ++++++--- dlls/d3d8/volume.c | 2 +- dlls/d3d9/buffer.c | 4 ++-- dlls/d3d9/d3d9_private.h | 21 +++++++++++++++++++-- dlls/d3d9/device.c | 1 + dlls/d3d9/surface.c | 2 +- dlls/d3d9/texture.c | 3 +++ dlls/d3d9/volume.c | 2 +- dlls/ddraw/surface.c | 10 ++++++++++ dlls/dxgi/device.c | 5 +++++ dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/device.c | 3 +++ dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/resource.c | 1 + dlls/wined3d/surface.c | 2 ++ dlls/wined3d/swapchain.c | 7 +++++++ dlls/wined3d/texture.c | 3 ++- include/wine/wined3d.h | 2 ++ 27 files changed, 106 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7cba91571061753e7cf0…

1 0