March 2021 - Wine-Commits - list.winehq.org

Zebediah Figura : server: Do not allow selecting on the ifchange object.
by Alexandre Julliard March 18, 2021

March 18, 2021

Module: wine Branch: master Commit: 340cc46287d7861ce6cae19401752e65f4089ae9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=340cc46287d7861ce6cae194… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 18 00:41:23 2021 -0500 server: Do not allow selecting on the ifchange object. We never pass a handle to this object to the client anyway. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 3aed5494612..8ab7d5b7236 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1536,7 +1536,7 @@ static const struct object_ops ifchange_ops = sizeof(struct ifchange), /* size */ &no_type, /* type */ ifchange_dump, /* dump */ - add_queue, /* add_queue */ + no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ no_satisfied, /* satisfied */

1 0

Alexandre Julliard : setupapi: Support arbitrary wildcards in fake dlls creation.
by Alexandre Julliard March 18, 2021

March 18, 2021

Module: wine Branch: master Commit: 5d3d73f80360014c13d8a44d06a384288c89b19d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d3d73f80360014c13d8a44d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 18 12:48:45 2021 +0100 setupapi: Support arbitrary wildcards in fake dlls creation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/fakedll.c | 58 +++++++++++++++++++++++++------------------------ loader/wine.inf.in | 28 ++---------------------- 2 files changed, 32 insertions(+), 54 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 3196708a7f7..552bec27f31 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -466,7 +466,7 @@ done: } /* create the fake dll destination file */ -static HANDLE create_dest_file( const WCHAR *name ) +static HANDLE create_dest_file( const WCHAR *name, BOOL delete ) { /* first check for an existing file */ HANDLE h = CreateFileW( name, GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL ); @@ -478,11 +478,17 @@ static HANDLE create_dest_file( const WCHAR *name ) CloseHandle( h ); return 0; } + if (delete) + { + CloseHandle( h ); + DeleteFileW( name ); + return INVALID_HANDLE_VALUE; + } /* truncate the file */ SetFilePointer( h, 0, NULL, FILE_BEGIN ); SetEndOfFile( h ); } - else + else if (!delete) { if (GetLastError() == ERROR_PATH_NOT_FOUND) create_directories( name ); @@ -872,7 +878,7 @@ static void register_fake_dll( const WCHAR *name, const void *data, size_t size, } /* copy a fake dll file to the dest directory */ -static int install_fake_dll( WCHAR *dest, WCHAR *file, const WCHAR *ext, BOOL expect_builtin, struct list *delay_copy ) +static int install_fake_dll( WCHAR *dest, WCHAR *file, const WCHAR *ext, BOOL delete, BOOL expect_builtin, struct list *delay_copy ) { int ret; SIZE_T size; @@ -897,7 +903,7 @@ static int install_fake_dll( WCHAR *dest, WCHAR *file, const WCHAR *ext, BOOL ex if (ret != -1) { - HANDLE h = create_dest_file( dest ); + HANDLE h = create_dest_file( dest, delete ); if (h && h != INVALID_HANDLE_VALUE) { @@ -935,7 +941,7 @@ static void delay_copy_files( struct list *delay_copy ) continue; } - h = create_dest_file( copy->dest ); + h = create_dest_file( copy->dest, FALSE ); if (h && h != INVALID_HANDLE_VALUE) { ret = (WriteFile( h, data, size, &written, NULL ) && written == size); @@ -948,7 +954,8 @@ static void delay_copy_files( struct list *delay_copy ) } /* find and install all fake dlls in a given lib directory */ -static void install_lib_dir( WCHAR *dest, WCHAR *file, const WCHAR *default_ext, BOOL expect_builtin ) +static void install_lib_dir( WCHAR *dest, WCHAR *file, const WCHAR *wildcard, + const WCHAR *default_ext, BOOL delete, BOOL expect_builtin ) { WCHAR *name; intptr_t handle; @@ -958,7 +965,7 @@ static void install_lib_dir( WCHAR *dest, WCHAR *file, const WCHAR *default_ext, file[1] = '\\'; /* change \??\ to \\?\ */ name = file + lstrlenW(file); *name++ = '\\'; - lstrcpyW( name, L"*" ); + lstrcpyW( name, wildcard ); if ((handle = _wfindfirst( file, &data )) == -1) return; do @@ -973,14 +980,14 @@ static void install_lib_dir( WCHAR *dest, WCHAR *file, const WCHAR *default_ext, lstrcatW( name, data.name ); if (wcschr( data.name, '.' )) /* module possibly already has an extension */ { - if (install_fake_dll( dest, file, NULL, expect_builtin, &delay_copy )) continue; - if (install_fake_dll( dest, file, L".fake", FALSE, &delay_copy )) continue; + if (install_fake_dll( dest, file, NULL, delete, expect_builtin, &delay_copy )) continue; + if (install_fake_dll( dest, file, L".fake", delete, FALSE, &delay_copy )) continue; } lstrcatW( name, default_ext ); - if (install_fake_dll( dest, file, NULL, expect_builtin, &delay_copy )) continue; - if (install_fake_dll( dest, file, L".fake", FALSE, &delay_copy )) continue; + if (install_fake_dll( dest, file, NULL, delete, expect_builtin, &delay_copy )) continue; + if (install_fake_dll( dest, file, L".fake", delete, FALSE, &delay_copy )) continue; } - else install_fake_dll( dest, file, NULL, expect_builtin, &delay_copy ); + else install_fake_dll( dest, file, NULL, delete, expect_builtin, &delay_copy ); } while (!_wfindnext( handle, &data )); _findclose( handle ); @@ -989,12 +996,12 @@ static void install_lib_dir( WCHAR *dest, WCHAR *file, const WCHAR *default_ext, } /* create fake dlls in dirname for all the files we can find */ -static BOOL create_wildcard_dlls( const WCHAR *dirname ) +static BOOL create_wildcard_dlls( const WCHAR *dirname, const WCHAR *wildcard, BOOL delete ) { const WCHAR *build_dir = _wgetenv( L"WINEBUILDDIR" ); const WCHAR *path; unsigned int i, maxlen = 0; - WCHAR *file, *dest; + WCHAR *file, *dest, *p; if (build_dir) maxlen = lstrlenW(build_dir) + ARRAY_SIZE(L"\\programs") + 1; for (i = 0; (path = enum_load_path(i)); i++) maxlen = max( maxlen, lstrlenW(path) ); @@ -1007,24 +1014,24 @@ static BOOL create_wildcard_dlls( const WCHAR *dirname ) return FALSE; } lstrcpyW( dest, dirname ); - dest[lstrlenW(dest) - 1] = 0; /* remove wildcard */ + if ((p = wcsrchr( dest, '\\' ))) p[1] = 0; /* remove wildcard */ if (build_dir) { lstrcpyW( file, build_dir ); lstrcatW( file, L"\\dlls" ); - install_lib_dir( dest, file, L".dll", TRUE ); + install_lib_dir( dest, file, wildcard, L".dll", delete, TRUE ); lstrcpyW( file, build_dir ); lstrcatW( file, L"\\programs" ); - install_lib_dir( dest, file, L".exe", TRUE ); + install_lib_dir( dest, file, wildcard, L".exe", delete, TRUE ); } for (i = 0; (path = enum_load_path( i )); i++) { lstrcpyW( file, path ); - install_lib_dir( dest, file, NULL, TRUE ); + install_lib_dir( dest, file, wildcard, NULL, delete, TRUE ); lstrcpyW( file, path ); lstrcatW( file, L"\\fakedlls" ); - install_lib_dir( dest, file, NULL, FALSE ); + install_lib_dir( dest, file, wildcard, NULL, delete, FALSE ); } HeapFree( GetProcessHeap(), 0, file ); HeapFree( GetProcessHeap(), 0, dest ); @@ -1042,6 +1049,7 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) SIZE_T size; const WCHAR *filename; void *buffer; + BOOL delete = !wcscmp( source, L"-" ); /* '-' source means delete the file */ if (!(filename = wcsrchr( name, '\\' ))) filename = name; else filename++; @@ -1052,20 +1060,14 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) create_directories( name ); return TRUE; } - if (filename[0] == '*' && !filename[1]) return create_wildcard_dlls( name ); + if (wcspbrk( filename, L"*?" )) return create_wildcard_dlls( name, filename, delete ); add_handled_dll( filename ); - if (!(h = create_dest_file( name ))) return TRUE; /* not a fake dll */ + if (!(h = create_dest_file( name, delete ))) return TRUE; /* not a fake dll */ if (h == INVALID_HANDLE_VALUE) return FALSE; - if (source[0] == '-' && !source[1]) - { - /* '-' source means delete the file */ - TRACE( "deleting %s\n", debugstr_w(name) ); - ret = FALSE; - } - else if ((buffer = load_fake_dll( source, &size ))) + if ((buffer = load_fake_dll( source, &size ))) { DWORD written; diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 4cef944fb88..3abcc41ffa1 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2630,19 +2630,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,syswow64,stdole2.tlb 11,,iexplore.exe 11,,winetest.exe,- -12,,fltmgr.sys,- -12,,hidclass.sys,- -12,,http.sys,- -12,,ksecdd.sys,- -12,,mountmgr.sys,- -12,,ndis.sys,- -12,,netio.sys,- -12,,scsiport.sys,- -12,,tdi.sys,- -12,,usbd.sys,- -12,,winebus.sys,- -12,,winehid.sys,- -12,,wineusb.sys,- ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,- 11,,ngen.exe,- @@ -2665,6 +2652,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll 16427,System\ADO,msado15.dll +12,,*.sys,- 11,,* [FakeDlls] @@ -2685,19 +2673,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe 11,,notepad.exe 11,,winetest.exe,- -12,,fltmgr.sys -12,,hidclass.sys -12,,http.sys -12,,ksecdd.sys -12,,mountmgr.sys -12,,ndis.sys -12,,netio.sys -12,,scsiport.sys -12,,tdi.sys -12,,usbd.sys -12,,winebus.sys -12,,winehid.sys -12,,wineusb.sys ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,- 11,,ngen.exe,- @@ -2732,6 +2707,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll 16427,System\ADO,msado15.dll +12,,*.sys,- 11,,* [SystemIni]

1 0

Zebediah Figura : server: Make pulse_event() static.
by Alexandre Julliard March 18, 2021

March 18, 2021

Module: wine Branch: master Commit: fe9e2f070b475774211ac955c3b5881d0ef1d067 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe9e2f070b475774211ac955… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 18 00:41:24 2021 -0500 server: Make pulse_event() static. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/event.c | 2 +- server/object.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/server/event.c b/server/event.c index c45c093e9d3..ccdd465dd5b 100644 --- a/server/event.c +++ b/server/event.c @@ -160,7 +160,7 @@ struct event *get_event_obj( struct process *process, obj_handle_t handle, unsig return (struct event *)get_handle_obj( process, handle, access, &event_ops ); } -void pulse_event( struct event *event ) +static void pulse_event( struct event *event ) { event->signaled = 1; /* wake up all waiters if manual reset, a single one otherwise */ diff --git a/server/object.h b/server/object.h index 5b2c309f0b2..1aef43018b2 100644 --- a/server/object.h +++ b/server/object.h @@ -215,7 +215,6 @@ extern struct keyed_event *create_keyed_event( struct object *root, const struct unsigned int attr, const struct security_descriptor *sd ); extern struct event *get_event_obj( struct process *process, obj_handle_t handle, unsigned int access ); extern struct keyed_event *get_keyed_event_obj( struct process *process, obj_handle_t handle, unsigned int access ); -extern void pulse_event( struct event *event ); extern void set_event( struct event *event ); extern void reset_event( struct event *event );

1 0

Alexandre Julliard : setupapi: Add a few printer directory ids.
by Alexandre Julliard March 18, 2021

March 18, 2021

Module: wine Branch: master Commit: 00b9c975d4bd3a24ae41c99057d7a1a32f329c00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00b9c975d4bd3a24ae41c990… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 18 11:24:17 2021 +0100 setupapi: Add a few printer directory ids. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/Makefile.in | 2 +- dlls/setupapi/dirid.c | 63 +++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 54 insertions(+), 11 deletions(-) diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in index 70ffd23d245..e89d1f25b56 100644 --- a/dlls/setupapi/Makefile.in +++ b/dlls/setupapi/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -D_SETUPAPI_ MODULE = setupapi.dll IMPORTLIB = setupapi IMPORTS = uuid version advapi32 rpcrt4 kernelbase -DELAYIMPORTS = cabinet shell32 wintrust ole32 winspool.drv comdlg32 user32 +DELAYIMPORTS = cabinet shell32 wintrust ole32 comdlg32 user32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/setupapi/dirid.c b/dlls/setupapi/dirid.c index ec263d9f181..b28e8b9dffd 100644 --- a/dlls/setupapi/dirid.c +++ b/dlls/setupapi/dirid.c @@ -28,7 +28,6 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" -#include "winspool.h" #include "setupapi.h" #include "shlobj.h" #include "setupapi_private.h" @@ -46,9 +45,22 @@ struct user_dirid WCHAR *str; }; +#ifdef __i386__ +static const WCHAR printer_env[] = L"w32x86"; +#elif defined __x86_64__ +static const WCHAR printer_env[] = L"x64"; +#elif defined __arm__ +static const WCHAR printer_env[] = L"arm"; +#elif defined __aarch64__ +static const WCHAR printer_env[] = L"arm64"; +#else +#error not defined for this cpu +#endif + static int nb_user_dirids; /* number of user dirids in use */ static int alloc_user_dirids; /* number of allocated user dirids */ static struct user_dirid *user_dirids; +static const WCHAR *printer_dirids[5]; /* 66000..66004 */ static const WCHAR *system_dirids[MAX_SYSTEM_DIRID+1]; static const WCHAR *csidl_dirids[MAX_CSIDL_DIRID-MIN_CSIDL_DIRID+1]; @@ -74,7 +86,6 @@ static const WCHAR *create_system_dirid( int dirid ) { WCHAR buffer[MAX_PATH+32], *str; int len; - DWORD needed; switch(dirid) { @@ -122,11 +133,11 @@ static const WCHAR *create_system_dirid( int dirid ) lstrcatW( buffer, L"\\system" ); break; case DIRID_SPOOL: - GetWindowsDirectoryW( buffer, MAX_PATH ); + GetSystemDirectoryW( buffer, MAX_PATH ); lstrcatW( buffer, L"\\spool" ); break; case DIRID_SPOOLDRIVERS: - GetWindowsDirectoryW( buffer, MAX_PATH ); + GetSystemDirectoryW( buffer, MAX_PATH ); lstrcatW( buffer, L"\\spool\\drivers" ); break; case DIRID_USERPROFILE: @@ -135,11 +146,9 @@ static const WCHAR *create_system_dirid( int dirid ) case DIRID_LOADER: return L"C:\\"; /* FIXME */ case DIRID_PRINTPROCESSOR: - if (!GetPrintProcessorDirectoryW(NULL, NULL, 1, (LPBYTE)buffer, sizeof(buffer), &needed)) - { - WARN( "cannot retrieve print processor directory\n" ); - return get_unknown_dirid(); - } + GetSystemDirectoryW( buffer, MAX_PATH ); + lstrcatW( buffer, L"\\spool\\prtprocs\\" ); + lstrcatW( buffer, printer_env ); break; default: FIXME( "unknown dirid %d\n", dirid ); @@ -150,6 +159,35 @@ static const WCHAR *create_system_dirid( int dirid ) return str; } +static const WCHAR *create_printer_dirid( DWORD dirid ) +{ + WCHAR buffer[MAX_PATH+32], *str; + int len; + + switch (dirid) + { + case 66000: /* printer driver */ + GetSystemDirectoryW( buffer, MAX_PATH ); + lstrcatW( buffer, L"\\spool\\drivers\\" ); + lstrcatW( buffer, printer_env ); + break; + case 66001: /* print processor */ + return create_system_dirid( DIRID_PRINTPROCESSOR ); + case 66002: /* system directory (FIXME: only for native architecture) */ + GetSystemDirectoryW( buffer, MAX_PATH ); + break; + case 66003: /* color directory */ + return create_system_dirid( DIRID_COLOR ); + case 66004: /* asp files directory */ + default: + FIXME( "unsupported dirid %d\n", dirid ); + return get_unknown_dirid(); + } + len = (lstrlenW(buffer) + 1) * sizeof(WCHAR); + if ((str = HeapAlloc( GetProcessHeap(), 0, len ))) memcpy( str, buffer, len ); + return str; +} + static const WCHAR *get_csidl_dir( DWORD csidl ) { WCHAR buffer[MAX_PATH], *str; @@ -172,7 +210,12 @@ const WCHAR *DIRID_get_string( int dirid ) if (dirid == DIRID_ABSOLUTE || dirid == DIRID_ABSOLUTE_16BIT) dirid = DIRID_NULL; - if (dirid >= DIRID_USER) + if (dirid >= 66000 && dirid <= 66004) + { + if (!printer_dirids[dirid - 66000]) printer_dirids[dirid - 66000] = create_printer_dirid( dirid ); + return printer_dirids[dirid - 66000]; + } + else if (dirid >= DIRID_USER) { for (i = 0; i < nb_user_dirids; i++) if (user_dirids[i].id == dirid) return user_dirids[i].str;

1 0

Zebediah Figura : server: Remove a no longer relevant "see below" from a comment.
by Alexandre Julliard March 18, 2021

March 18, 2021

Module: wine Branch: master Commit: 4c0a69f5865c37c2693813670433381c4737a40a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c0a69f5865c37c269381367… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 18 00:41:27 2021 -0500 server: Remove a no longer relevant "see below" from a comment. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/protocol.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/protocol.def b/server/protocol.def index 03161c830c0..2bfdcca6de1 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1114,7 +1114,7 @@ typedef struct obj_handle_t dst_process; /* dst process handle */ unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ - unsigned int options; /* duplicate options (see below) */ + unsigned int options; /* duplicate options */ @REPLY obj_handle_t handle; /* duplicated handle in dst process */ int self; /* is the source the current process? */

1 0

Zebediah Figura : server: Fix a copy-paste error in a comment.
by Alexandre Julliard March 18, 2021

March 18, 2021

Module: wine Branch: master Commit: 9922b5210b906b8b61c4899f8286e75b0b72b22e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9922b5210b906b8b61c4899f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 18 00:41:26 2021 -0500 server: Fix a copy-paste error in a comment. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/protocol.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/protocol.def b/server/protocol.def index a5790cda939..03161c830c0 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -668,7 +668,7 @@ typedef union } map_view; struct { - enum apc_type type; /* APC_MAP_VIEW */ + enum apc_type type; /* APC_UNMAP_VIEW */ unsigned int status; /* status returned by call */ } unmap_view; struct

1 0

Zebediah Figura : server: Use default_fd_signaled() for sockets.
by Alexandre Julliard March 18, 2021

March 18, 2021

Module: wine Branch: master Commit: 731339cd60c255fd5890063b144ad7c00661f5a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=731339cd60c255fd5890063b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 18 00:41:25 2021 -0500 server: Use default_fd_signaled() for sockets. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/server/sock.c b/server/sock.c index 8ab7d5b7236..775ec6edf32 100644 --- a/server/sock.c +++ b/server/sock.c @@ -163,7 +163,6 @@ struct sock }; static void sock_dump( struct object *obj, int verbose ); -static int sock_signaled( struct object *obj, struct wait_queue_entry *entry ); static struct fd *sock_get_fd( struct object *obj ); static int sock_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); static void sock_destroy( struct object *obj ); @@ -189,7 +188,7 @@ static const struct object_ops sock_ops = sock_dump, /* dump */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ - sock_signaled, /* signaled */ + default_fd_signaled, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ sock_get_fd, /* get_fd */ @@ -773,10 +772,6 @@ static void sock_poll_event( struct fd *fd, int event ) event = sock_dispatch_asyncs( sock, event, error ); sock_dispatch_events( sock, prevstate, event, error ); - /* if anyone is stupid enough to wait on the socket object itself, - * maybe we should wake them up too, just in case? */ - wake_up( &sock->obj, 0 ); - sock_reselect( sock ); } @@ -789,14 +784,6 @@ static void sock_dump( struct object *obj, int verbose ) sock->mask, sock->pmask, sock->hmask ); } -static int sock_signaled( struct object *obj, struct wait_queue_entry *entry ) -{ - struct sock *sock = (struct sock *)obj; - assert( obj->ops == &sock_ops ); - - return check_fd_events( sock->fd, sock_get_poll_events( sock->fd ) ) != 0; -} - static int sock_get_poll_events( struct fd *fd ) { struct sock *sock = get_fd_user( fd );

1 0

Alistair Leslie-Hughes : msado15: Improve return when field cannot be found.
by Alexandre Julliard March 18, 2021

March 18, 2021

Module: wine Branch: master Commit: c93798bd56d03225474eda6bf2f3804b74b63ae8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c93798bd56d03225474eda6b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 18 16:29:41 2021 +1100 msado15: Improve return when field cannot be found. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 0b91358f83d..b690e243189 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -620,7 +620,7 @@ static HRESULT map_index( struct fields *fields, VARIANT *index, ULONG *ret ) } } - return E_INVALIDARG; + return MAKE_ADO_HRESULT(adErrItemNotFound); } static HRESULT WINAPI fields_get_Item( Fields *iface, VARIANT index, Field **obj )

1 0

Huw Davies : riched20: Handle EM_SETBKGNDCOLOR in the host.
by Alexandre Julliard March 18, 2021

March 18, 2021

Module: wine Branch: master Commit: b927bc8d99e658d5c0d0af943010f38e984baab6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b927bc8d99e658d5c0d0af94… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 18 08:30:06 2021 +0000 riched20: Handle EM_SETBKGNDCOLOR in the host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 26 -------------------------- dlls/riched20/editstr.h | 2 -- dlls/riched20/txthost.c | 26 ++++++++++++++++++++++---- 3 files changed, 22 insertions(+), 32 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 13a04a003f4..3073294bd7b 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3005,8 +3005,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->nLastTotalLength = ed->nTotalLength = 0; ed->nLastTotalWidth = ed->nTotalWidth = 0; ed->nUDArrowX = -1; - ed->rgbBackColor = -1; - ed->hbrBackground = GetSysColorBrush(COLOR_WINDOW); ed->nEventMask = 0; ed->nModifyStep = 0; ed->nTextLimit = TEXT_LIMIT_DEFAULT; @@ -3100,8 +3098,6 @@ void ME_DestroyEditor(ME_TextEditor *editor) if (editor->pFontCache[i].hFont) DeleteObject(editor->pFontCache[i].hFont); } - if (editor->rgbBackColor != -1) - DeleteObject(editor->hbrBackground); if(editor->lpOleCallback) IRichEditOleCallback_Release(editor->lpOleCallback); if (editor->reOle) @@ -3516,28 +3512,6 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_SELECTIONTYPE: return ME_GetSelectionType(editor); - case EM_SETBKGNDCOLOR: - { - LRESULT lColor; - if (editor->rgbBackColor != -1) { - DeleteObject(editor->hbrBackground); - lColor = editor->rgbBackColor; - } - else lColor = ITextHost_TxGetSysColor(editor->texthost, COLOR_WINDOW); - - if (wParam) - { - editor->rgbBackColor = -1; - editor->hbrBackground = GetSysColorBrush(COLOR_WINDOW); - } - else - { - editor->rgbBackColor = lParam; - editor->hbrBackground = CreateSolidBrush(editor->rgbBackColor); - } - ITextHost_TxInvalidateRect(editor->texthost, NULL, TRUE); - return lColor; - } case EM_GETMODIFY: return editor->nModifyStep == 0 ? 0 : -1; case EM_SETMODIFY: diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 1f277cbf6bc..0273fde4350 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -392,8 +392,6 @@ typedef struct tagME_TextEditor int nAvailWidth; /* 0 = wrap to client area, else wrap width in twips */ int nUDArrowX; int total_rows; - COLORREF rgbBackColor; - HBRUSH hbrBackground; int nEventMask; int nModifyStep; struct list undo_stack; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index c80263bbd69..ebccddf65e3 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -45,9 +45,11 @@ struct host unsigned int sel_bar : 1; unsigned int client_edge : 1; unsigned int use_set_rect : 1; + unsigned int use_back_colour : 1; PARAFORMAT2 para_fmt; DWORD props, scrollbars, event_mask; RECT client_rect, set_rect; + COLORREF back_colour; }; static const ITextHostVtbl textHostVtbl; @@ -111,6 +113,7 @@ struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) texthost->use_set_rect = 0; SetRectEmpty( &texthost->set_rect ); GetClientRect( hwnd, &texthost->client_rect ); + texthost->use_back_colour = 0; return texthost; } @@ -346,6 +349,9 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetParaFormat( ITextHost *ifa DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSysColor,8) DECLSPEC_HIDDEN COLORREF __thiscall ITextHostImpl_TxGetSysColor( ITextHost *iface, int index ) { + struct host *host = impl_from_ITextHost( iface ); + + if (index == COLOR_WINDOW && host->use_back_colour) return host->back_colour; return GetSysColor( index ); } @@ -992,9 +998,14 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, { HDC hdc = (HDC)wparam; RECT rc; + HBRUSH brush; if (GetUpdateRect( editor->hWnd, &rc, TRUE )) - FillRect( hdc, &rc, editor->hbrBackground ); + { + brush = CreateSolidBrush( ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ) ); + FillRect( hdc, &rc, brush ); + DeleteObject( brush ); + } return 1; } case EM_FINDTEXT: @@ -1127,13 +1138,13 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, HDC hdc; RECT rc; PAINTSTRUCT ps; - HBRUSH old_brush; + HBRUSH brush = CreateSolidBrush( ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ) ); update_caret( editor ); hdc = BeginPaint( editor->hWnd, &ps ); if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) ME_SendOldNotify( editor, EN_UPDATE ); - old_brush = SelectObject( hdc, editor->hbrBackground ); + brush = SelectObject( hdc, brush ); /* Erase area outside of the formatting rectangle */ if (ps.rcPaint.top < editor->rcFormat.top) @@ -1166,7 +1177,7 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, } ME_PaintContent( editor, hdc, &ps.rcPaint ); - SelectObject( hdc, old_brush ); + DeleteObject( SelectObject( hdc, brush ) ); EndPaint( editor->hWnd, &ps ); return 0; } @@ -1181,6 +1192,13 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, res = len; break; } + case EM_SETBKGNDCOLOR: + res = ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ); + host->use_back_colour = !wparam; + if (host->use_back_colour) host->back_colour = lparam; + InvalidateRect( hwnd, NULL, TRUE ); + break; + case EM_SETEVENTMASK: host->event_mask = lparam; hr = ITextServices_TxSendMessage( host->text_srv, msg, wparam, lparam, &res );

1 0

Huw Davies : riched20: Don't set the cursor during mouse messages.
by Alexandre Julliard March 18, 2021

March 18, 2021

Module: wine Branch: master Commit: cd5b064af8c82c182525967d3e98a81962f06367 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd5b064af8c82c182525967d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 18 08:30:08 2021 +0000 riched20: Don't set the cursor during mouse messages. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index f7d383c2f10..fe22554327f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3954,7 +3954,6 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, ITextHost_TxSetCapture(editor->texthost, TRUE); editor->bMouseCaptured = TRUE; ME_LinkNotify(editor, msg, wParam, lParam); - if (!ME_SetCursor(editor)) goto do_default; break; } case WM_MOUSEMOVE: @@ -3962,9 +3961,6 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_MouseMove(editor, (short)LOWORD(lParam), (short)HIWORD(lParam)); else ME_LinkNotify(editor, msg, wParam, lParam); - /* Set cursor if mouse is captured, since WM_SETCURSOR won't be received. */ - if (editor->bMouseCaptured) - ME_SetCursor(editor); break; case WM_LBUTTONUP: if (editor->bMouseCaptured) { @@ -3975,7 +3971,6 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, editor->nSelectionType = stPosition; else { - ME_SetCursor(editor); ME_LinkNotify(editor, msg, wParam, lParam); } break;

1 0