November 2020 - Wine-commits

Damjan Jovanovic : ntdll: Treat smbfs as case-insensitive on FreeBSD.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: eba4f333b9ed217d8b40bde9b4941c0edc336f6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=eba4f333b9ed217d8b40bde9… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Nov 10 06:49:56 2020 +0200 ntdll: Treat smbfs as case-insensitive on FreeBSD. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 7a97f2bdd85..f7fa78db2be 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1128,14 +1128,16 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) !strncmp( stfs.f_mntfromname, "ciopfs", 5 )) return FALSE; /* msdosfs was case-insensitive since FreeBSD 8, if not earlier */ - if (!strcmp( stfs.f_fstypename, "msdosfs" )) + if (!strcmp( stfs.f_fstypename, "msdosfs" ) || + /* older CIFS protocol versions uppercase filename on the client, + * newer versions should be case-insensitive on the server anyway */ + !strcmp( stfs.f_fstypename, "smbfs" )) return FALSE; #ifdef __APPLE__ if (!strcmp( stfs.f_fstypename, "msdos" ) || !strcmp( stfs.f_fstypename, "cd9660" ) || !strcmp( stfs.f_fstypename, "udf" ) || - !strcmp( stfs.f_fstypename, "ntfs" ) || - !strcmp( stfs.f_fstypename, "smbfs" )) + !strcmp( stfs.f_fstypename, "ntfs" )) return FALSE; #ifdef _DARWIN_FEATURE_64_BIT_INODE if (!strcmp( stfs.f_fstypename, "hfs" ) && (stfs.f_fssubtype == 0 ||

1 0

Damjan Jovanovic : ntdll: Document a few other filesystem case-sensitivity cases.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 2f90b17ab23988b8f9744a79a43376c6b98b72d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f90b17ab23988b8f9744a79… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Nov 10 06:49:59 2020 +0200 ntdll: Document a few other filesystem case-sensitivity cases. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index f7fa78db2be..cf413f46e5c 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1133,6 +1133,9 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) * newer versions should be case-insensitive on the server anyway */ !strcmp( stfs.f_fstypename, "smbfs" )) return FALSE; + /* no ntfs-3g: modern fusefs has no way to report the filesystem on FreeBSD + * no cd9660 or udf, they're case-sensitive on FreeBSD + */ #ifdef __APPLE__ if (!strcmp( stfs.f_fstypename, "msdos" ) || !strcmp( stfs.f_fstypename, "cd9660" ) ||

1 0

Paul Gofman : crypt32: Fix adding trusted roots to store.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 706e35f2a2db6beaebdf972572f897046c5e9585 URL: https://source.winehq.org/git/wine.git/?a=commit;h=706e35f2a2db6beaebdf9725… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Nov 10 18:31:10 2020 +0300 crypt32: Fix adding trusted roots to store. Fixes Steam client errors on SSL connections (regression from bd59aa6d66001cb1f8b308300a5ce57a7f7b65d5). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/rootstore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 87c9808f51b..d93de8fb37a 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -629,7 +629,7 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) buffer = HeapAlloc( GetProcessHeap(), 0, needed ); size = needed; } - else CertAddEncodedCertificateToStore( store, X509_ASN_ENCODING, buffer, size, + else CertAddEncodedCertificateToStore( from, X509_ASN_ENCODING, buffer, needed, CERT_STORE_ADD_NEW, NULL ); } HeapFree( GetProcessHeap(), 0, buffer );

1 0

Jacek Caban : kernel32/tests: Add more console waiting tests.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 2b205a6d8c2226c13b3fbec5aa63fc6d5342398b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b205a6d8c2226c13b3fbec5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 10 16:31:34 2020 +0100 kernel32/tests: Add more console waiting tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 72 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 495fa1b9e57..5064cfe5c6d 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -19,11 +19,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/test.h" +#include <ntstatus.h> +#define WIN32_NO_STATUS #include <windows.h> #include <winternl.h> #include <stdio.h> +#include "wine/test.h" + static void (WINAPI *pClosePseudoConsole)(HPCON); static HRESULT (WINAPI *pCreatePseudoConsole)(COORD,HANDLE,HANDLE,DWORD,HPCON*); static BOOL (WINAPI *pGetConsoleInputExeNameA)(DWORD, LPSTR); @@ -988,6 +991,72 @@ static void testWaitForConsoleInput(HANDLE input_handle) CloseHandle(complete_event); } +static void test_wait(HANDLE input, HANDLE orig_output) +{ + LARGE_INTEGER zero; + INPUT_RECORD ir; + HANDLE output; + DWORD res, count; + NTSTATUS status; + BOOL ret; + + if (skip_nt) return; + + memset(&ir, 0, sizeof(ir)); + ir.EventType = MOUSE_EVENT; + ir.Event.MouseEvent.dwEventFlags = MOUSE_MOVED; + zero.QuadPart = 0; + + output = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + CONSOLE_TEXTMODE_BUFFER, NULL); + ok(output != INVALID_HANDLE_VALUE, "CreateConsoleScreenBuffer failed: %u\n", GetLastError()); + + ret = SetConsoleActiveScreenBuffer(output); + ok(ret, "SetConsoleActiveScreenBuffer failed: %u\n", GetLastError()); + FlushConsoleInputBuffer(input); + + res = WaitForSingleObject(input, 0); + ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); + res = WaitForSingleObject(output, 0); + todo_wine + ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); + res = WaitForSingleObject(orig_output, 0); + ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); + status = NtWaitForSingleObject(input, FALSE, &zero); + todo_wine + ok(status == STATUS_TIMEOUT || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), + "NtWaitForSingleObject returned %x\n", status); + status = NtWaitForSingleObject(output, FALSE, &zero); + todo_wine + ok(status == STATUS_TIMEOUT || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), + "NtWaitForSingleObject returned %x\n", status); + + ret = WriteConsoleInputW(input, &ir, 1, &count); + ok(ret, "WriteConsoleInputW failed: %u\n", GetLastError()); + + res = WaitForSingleObject(input, 0); + ok(!res, "WaitForSingleObject returned %x\n", res); + res = WaitForSingleObject(output, 0); + todo_wine + ok(!res, "WaitForSingleObject returned %x\n", res); + res = WaitForSingleObject(orig_output, 0); + ok(!res, "WaitForSingleObject returned %x\n", res); + status = NtWaitForSingleObject(input, FALSE, &zero); + todo_wine + ok(!status || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), + "NtWaitForSingleObject returned %x\n", status); + status = NtWaitForSingleObject(output, FALSE, &zero); + todo_wine + ok(!status || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), + "NtWaitForSingleObject returned %x\n", status); + + ret = SetConsoleActiveScreenBuffer(orig_output); + ok(ret, "SetConsoleActiveScreenBuffer failed: %u\n", GetLastError()); + + CloseHandle(output); +} + static void test_GetSetConsoleInputExeName(void) { BOOL ret; @@ -4295,6 +4364,7 @@ START_TEST(console) if (!test_current) testScreenBuffer(hConOut); /* Test waiting for a console handle */ testWaitForConsoleInput(hConIn); + test_wait(hConIn, hConOut); if (!test_current) {

1 0

Jacek Caban : server: Support waiting on console input handles.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 459d37643ef72d284eec0dc50573eff59935ae69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=459d37643ef72d284eec0dc5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 10 16:31:43 2020 +0100 server: Support waiting on console input handles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 2 -- server/console.c | 22 +++++++++++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5064cfe5c6d..6d15abd8c5f 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1024,7 +1024,6 @@ static void test_wait(HANDLE input, HANDLE orig_output) res = WaitForSingleObject(orig_output, 0); ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); status = NtWaitForSingleObject(input, FALSE, &zero); - todo_wine ok(status == STATUS_TIMEOUT || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), "NtWaitForSingleObject returned %x\n", status); status = NtWaitForSingleObject(output, FALSE, &zero); @@ -1043,7 +1042,6 @@ static void test_wait(HANDLE input, HANDLE orig_output) res = WaitForSingleObject(orig_output, 0); ok(!res, "WaitForSingleObject returned %x\n", res); status = NtWaitForSingleObject(input, FALSE, &zero); - todo_wine ok(!status || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), "NtWaitForSingleObject returned %x\n", status); status = NtWaitForSingleObject(output, FALSE, &zero); diff --git a/server/console.c b/server/console.c index d1e3cae8919..4e51ed48a31 100644 --- a/server/console.c +++ b/server/console.c @@ -54,6 +54,7 @@ struct history_line struct console_input { struct object obj; /* object header */ + int signaled; /* is console signaled */ int num_proc; /* number of processes attached to this console */ struct thread *renderer; /* console renderer thread */ struct screen_buffer *active; /* active screen buffer */ @@ -67,6 +68,7 @@ struct console_input static void console_input_dump( struct object *obj, int verbose ); static void console_input_destroy( struct object *obj ); +static int console_input_signaled( struct object *obj, struct wait_queue_entry *entry ); static struct fd *console_input_get_fd( struct object *obj ); static struct object *console_input_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); static struct object *console_input_open_file( struct object *obj, unsigned int access, @@ -77,9 +79,9 @@ static const struct object_ops console_input_ops = sizeof(struct console_input), /* size */ console_input_dump, /* dump */ no_get_type, /* get_type */ - no_add_queue, /* add_queue */ - NULL, /* remove_queue */ - NULL, /* signaled */ + add_queue, /* add_queue */ + remove_queue, /* remove_queue */ + console_input_signaled, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ console_input_get_fd, /* get_fd */ @@ -338,6 +340,12 @@ static const struct fd_ops console_connection_fd_ops = static struct list screen_buffer_list = LIST_INIT(screen_buffer_list); +static int console_input_signaled( struct object *obj, struct wait_queue_entry *entry ) +{ + struct console_input *console = (struct console_input*)obj; + return console->signaled; +} + static struct fd *console_input_get_fd( struct object* obj ) { struct console_input *console_input = (struct console_input*)obj; @@ -358,6 +366,7 @@ static struct object *create_console_input(void) return NULL; console_input->renderer = NULL; + console_input->signaled = 0; console_input->num_proc = 0; console_input->active = NULL; console_input->server = NULL; @@ -1195,6 +1204,13 @@ DECL_HANDLER(get_next_console_request) if (req->signal) set_event( server->console->event); else reset_event( server->console->event ); + if (!req->signal) server->console->signaled = 0; + else if (!server->console->signaled) + { + server->console->signaled = 1; + wake_up( &server->console->obj, 0 ); + } + if (req->read) { /* set result of current pending ioctl */

1 0

Jacek Caban : server: Support waiting on screen buffer handles.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 2eb8644426d327d2c75fd02dd4d038c68c901fad URL: https://source.winehq.org/git/wine.git/?a=commit;h=2eb8644426d327d2c75fd02d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 10 16:31:53 2020 +0100 server: Support waiting on screen buffer handles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 4 ---- server/console.c | 14 +++++++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 6d15abd8c5f..4a06a2b396e 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1019,7 +1019,6 @@ static void test_wait(HANDLE input, HANDLE orig_output) res = WaitForSingleObject(input, 0); ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); res = WaitForSingleObject(output, 0); - todo_wine ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); res = WaitForSingleObject(orig_output, 0); ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); @@ -1027,7 +1026,6 @@ static void test_wait(HANDLE input, HANDLE orig_output) ok(status == STATUS_TIMEOUT || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), "NtWaitForSingleObject returned %x\n", status); status = NtWaitForSingleObject(output, FALSE, &zero); - todo_wine ok(status == STATUS_TIMEOUT || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), "NtWaitForSingleObject returned %x\n", status); @@ -1037,7 +1035,6 @@ static void test_wait(HANDLE input, HANDLE orig_output) res = WaitForSingleObject(input, 0); ok(!res, "WaitForSingleObject returned %x\n", res); res = WaitForSingleObject(output, 0); - todo_wine ok(!res, "WaitForSingleObject returned %x\n", res); res = WaitForSingleObject(orig_output, 0); ok(!res, "WaitForSingleObject returned %x\n", res); @@ -1045,7 +1042,6 @@ static void test_wait(HANDLE input, HANDLE orig_output) ok(!status || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), "NtWaitForSingleObject returned %x\n", status); status = NtWaitForSingleObject(output, FALSE, &zero); - todo_wine ok(!status || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), "NtWaitForSingleObject returned %x\n", status); diff --git a/server/console.c b/server/console.c index 4e51ed48a31..8bb7d8ecfa8 100644 --- a/server/console.c +++ b/server/console.c @@ -208,6 +208,7 @@ struct screen_buffer static void screen_buffer_dump( struct object *obj, int verbose ); static void screen_buffer_destroy( struct object *obj ); +static int screen_buffer_add_queue( struct object *obj, struct wait_queue_entry *entry ); static struct fd *screen_buffer_get_fd( struct object *obj ); static struct object *screen_buffer_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); @@ -217,7 +218,7 @@ static const struct object_ops screen_buffer_ops = sizeof(struct screen_buffer), /* size */ screen_buffer_dump, /* dump */ no_get_type, /* get_type */ - no_add_queue, /* add_queue */ + screen_buffer_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ NULL, /* satisfied */ @@ -706,6 +707,17 @@ static struct object *screen_buffer_open_file( struct object *obj, unsigned int return grab_object( obj ); } +static int screen_buffer_add_queue( struct object *obj, struct wait_queue_entry *entry ) +{ + struct screen_buffer *screen_buffer = (struct screen_buffer*)obj; + if (!screen_buffer->input) + { + set_error( STATUS_ACCESS_DENIED ); + return 0; + } + return add_queue( &screen_buffer->input->obj, entry ); +} + static struct fd *screen_buffer_get_fd( struct object *obj ) { struct screen_buffer *screen_buffer = (struct screen_buffer*)obj;

1 0

Jacek Caban : kernelbase: Wait directly on console handles.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: cc5afe41edafbbfb68abfbb0346c113a09128645 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc5afe41edafbbfb68abfbb0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 10 16:32:01 2020 +0100 kernelbase: Wait directly on console handles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 25 +------------------------ dlls/kernelbase/kernelbase.h | 1 - dlls/kernelbase/sync.c | 13 +++++-------- 3 files changed, 6 insertions(+), 33 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 71c594b3c18..f812b2b9a55 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -37,8 +37,8 @@ #include "winnls.h" #include "winerror.h" #include "wincon.h" +#include "winternl.h" #include "wine/condrv.h" -#include "wine/server.h" #include "wine/exception.h" #include "wine/debug.h" #include "kernelbase.h" @@ -56,7 +56,6 @@ static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION console_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static HANDLE console_connection; -static HANDLE console_wait_event; static unsigned int console_flags; #define CONSOLE_INPUT_HANDLE 0x01 @@ -559,32 +558,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH FillConsoleOutputCharacterW( HANDLE handle, WCHAR written, sizeof(*written), NULL ); } -HANDLE get_console_wait_handle( HANDLE handle ) -{ - HANDLE event = 0; - - SERVER_START_REQ( get_console_wait_event ) - { - req->handle = wine_server_obj_handle( console_handle_map( handle )); - if (!wine_server_call( req )) event = wine_server_ptr_handle( reply->event ); - } - SERVER_END_REQ; - if (event) - { - if (InterlockedCompareExchangePointer( &console_wait_event, event, 0 )) NtClose( event ); - handle = console_wait_event; - } - return handle; -} - /*********************************************************************** * FreeConsole (kernelbase.@) */ BOOL WINAPI DECLSPEC_HOTPATCH FreeConsole(void) { - HANDLE event; - RtlEnterCriticalSection( &console_section ); NtClose( console_connection ); @@ -598,8 +577,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeConsole(void) if (console_flags & CONSOLE_ERROR_HANDLE) NtClose( GetStdHandle( STD_ERROR_HANDLE )); console_flags = 0; - if ((event = InterlockedExchangePointer( &console_wait_event, NULL ))) NtClose( event ); - RtlLeaveCriticalSection( &console_section ); return TRUE; } diff --git a/dlls/kernelbase/kernelbase.h b/dlls/kernelbase/kernelbase.h index 551542e5725..836d636b47b 100644 --- a/dlls/kernelbase/kernelbase.h +++ b/dlls/kernelbase/kernelbase.h @@ -36,7 +36,6 @@ extern DWORD file_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ) extern void init_startup_info( RTL_USER_PROCESS_PARAMETERS *params ) DECLSPEC_HIDDEN; extern void init_locale(void) DECLSPEC_HIDDEN; extern void init_console(void) DECLSPEC_HIDDEN; -extern HANDLE get_console_wait_handle( HANDLE handle ) DECLSPEC_HIDDEN; extern const WCHAR windows_dir[] DECLSPEC_HIDDEN; extern const WCHAR system_dir[] DECLSPEC_HIDDEN; diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index 13a9938e7c6..e8e51b1c573 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -211,17 +211,14 @@ ULONGLONG WINAPI DECLSPEC_HOTPATCH GetTickCount64(void) ***********************************************************************/ -static HANDLE normalize_handle_if_console( HANDLE handle ) +static HANDLE normalize_std_handle( HANDLE handle ) { if ((handle == (HANDLE)STD_INPUT_HANDLE) || (handle == (HANDLE)STD_OUTPUT_HANDLE) || (handle == (HANDLE)STD_ERROR_HANDLE)) - handle = GetStdHandle( HandleToULong(handle) ); + return GetStdHandle( HandleToULong(handle) ); - /* even screen buffer console handles are waitable, and are - * handled as a handle to the console itself - */ - return is_console_handle( handle ) ? get_console_wait_handle( handle ) : handle; + return handle; } @@ -235,7 +232,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH RegisterWaitForSingleObjectEx( HANDLE handle, WA TRACE( "%p %p %p %d %d\n", handle, callback, context, timeout, flags ); - handle = normalize_handle_if_console( handle ); + handle = normalize_std_handle( handle ); if (!set_ntstatus( RtlRegisterWait( &ret, handle, callback, context, timeout, flags ))) return NULL; return ret; } @@ -340,7 +337,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH WaitForMultipleObjectsEx( DWORD count, const HAND SetLastError(ERROR_INVALID_PARAMETER); return WAIT_FAILED; } - for (i = 0; i < count; i++) hloc[i] = normalize_handle_if_console( handles[i] ); + for (i = 0; i < count; i++) hloc[i] = normalize_std_handle( handles[i] ); status = NtWaitForMultipleObjects( count, hloc, !wait_all, alertable, get_nt_timeout( &time, timeout ) );

1 0

Jacek Caban : server: Remove no longer needed get_console_wait_event request.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: b865d8ec9e2a297e66791cf302046d0b63528fa9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b865d8ec9e2a297e66791cf3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 10 16:32:18 2020 +0100 server: Remove no longer needed get_console_wait_event request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 19 +-------------- server/console.c | 52 ------------------------------------------ server/protocol.def | 8 ------- server/request.h | 6 ----- server/trace.c | 14 ------------ 5 files changed, 1 insertion(+), 98 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b865d8ec9e2a297e6679…

1 0

Francois Gouget : mshtml: Fix the spelling of the filter attribute.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: b6cc7b5d5178864c7d0967d610f3a5151e3685d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6cc7b5d5178864c7d0967d6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 9 17:59:22 2020 +0100 mshtml: Fix the spelling of the filter attribute. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index dc5b136edb3..ae21c1f7299 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -415,7 +415,7 @@ static const style_tbl_entry_t style_tbl[] = { DISPID_A_DISPLAY }, { - L"fileter", + L"filter", DISPID_IHTMLCSSSTYLEDECLARATION_FILTER, DISPID_A_FILTER },

1 0

Robert Wilhelm : vbscript: Allow keywords to be used as property name.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 04b43c721a9f006c4c7d2a097eec7116958db8a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04b43c721a9f006c4c7d2a09… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Mon Nov 9 22:09:40 2020 +0100 vbscript: Allow keywords to be used as property name. Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 6 +++--- dlls/vbscript/tests/lang.vbs | 13 +++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 7c749b5ef77..a9f4c540fcb 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -452,11 +452,11 @@ ClassBody | PropertyDecl StSep ClassBody { $$ = add_class_function(ctx, $3, $1); CHECK_ERROR; } PropertyDecl - : Storage_opt tPROPERTY tGET tIdentifier ArgumentsDecl_opt StSep BodyStatements tEND tPROPERTY + : Storage_opt tPROPERTY tGET Identifier ArgumentsDecl_opt StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPGET, $1, $5, $7); CHECK_ERROR; } - | Storage_opt tPROPERTY tLET tIdentifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY + | Storage_opt tPROPERTY tLET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPLET, $1, $6, $9); CHECK_ERROR; } - | Storage_opt tPROPERTY tSET tIdentifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY + | Storage_opt tPROPERTY tSET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPSET, $1, $6, $9); CHECK_ERROR; } FunctionDecl diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 570bb7fbcb3..53f36b6e710 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1656,6 +1656,19 @@ Class class_test_identifiers_as_function_name End Sub End Class +Class class_test_identifiers_as_property_name + Public Property Get Property() + End Property + + Public Property Let Error(par) + Error = par + End Property + + Public Property Set Default(par) + Set Default = par + End Property +End Class + sub test_dotIdentifiers ' test keywords that can also be an identifier after a dot Call ok(testObj.rem = 10, "testObj.rem = " & testObj.rem & " expected 10")

1 0