- Wine-Devel - list.winehq.org

[PATCH 1/4] user32/tests: Fix occasional failure in test_messages() message sequences.
by Connor McAdams Sept. 15, 2021

Sept. 15, 2021

Some window messages in the WmShowPopupExtremeLocationSeq message sequence aren't always sent on Win8+. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d61c813b492..35351035120 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1108,8 +1108,8 @@ static const struct message WmShowPopupExtremeLocationSeq[] = { { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { HCBT_SETFOCUS, hook }, { WM_SETFOCUS, sent|defwinproc }, - { WM_NCPAINT, sent|wparam, 1 }, - { WM_ERASEBKGND, sent }, + { WM_NCPAINT, sent|wparam|optional, 1 }, /* Not always sent on Win8+ */ + { WM_ERASEBKGND, sent|optional }, /* Not always sent on Win8+ */ { WM_WINDOWPOSCHANGED, sent }, /* occasionally received on test machines */ { WM_NCPAINT, sent|optional }, -- 2.25.1

2 5

[PATCH] advpack: Do not export DllMain.
by Zebediah Figura Sept. 15, 2021

Sept. 15, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/advpack/advpack.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 2f4698aa47b..f30446946fa 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -11,7 +11,6 @@ @ stdcall DelNodeRunDLL32A(ptr ptr str long) @ stdcall DelNodeRunDLL32W(ptr ptr wstr long) @ stdcall DelNodeW(wstr long) -@ stdcall -private DllMain(long long ptr) @ stdcall DoInfInstall(ptr) @ stdcall ExecuteCab(ptr ptr ptr) ExecuteCabA @ stdcall ExecuteCabA(ptr ptr ptr) -- 2.33.0

1 0

[PATCH v2 1/2] ntdll: Use posix_fallocate(2/3) instead of fallocate(2).
by Chip Davis Sept. 14, 2021

Sept. 14, 2021

From: Charles Davis <cdavis5x(a)gmail.com> The fallocate(2) call only exists on Linux. posix_fallocate() is more portable. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- v2: Don't fall back to fallocate(2). --- configure.ac | 10 +--------- dlls/ntdll/unix/file.c | 9 +++++---- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index fec39b6f2ac..cc8a4b79aaf 100644 --- a/configure.ac +++ b/configure.ac @@ -2183,6 +2183,7 @@ AC_CHECK_FUNCS(\ poll \ port_create \ posix_fadvise \ + posix_fallocate \ prctl \ proc_pidinfo \ readlink \ @@ -2274,15 +2275,6 @@ then AC_DEFINE(HAVE_SCHED_SETAFFINITY, 1, [Define to 1 if you have the `sched_setaffinity' function.]) fi -AC_CACHE_CHECK([for fallocate],wine_cv_have_fallocate, - AC_LINK_IFELSE([AC_LANG_PROGRAM( -[[#define _GNU_SOURCE -#include <fcntl.h>]], [[fallocate(-1, 0, 0, 0);]])],[wine_cv_have_fallocate=yes],[wine_cv_have_fallocate=no])) -if test "$wine_cv_have_fallocate" = "yes" -then - AC_DEFINE(HAVE_FALLOCATE, 1, [Define to 1 if you have the `fallocate' function.]) -fi - dnl **** Check for types **** AC_C_INLINE diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 046338b2a82..e10c79cb846 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4574,11 +4574,12 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, status = STATUS_INVALID_PARAMETER; else { -#ifdef HAVE_FALLOCATE - if (fallocate( fd, 0, 0, (off_t)info->ValidDataLength.QuadPart ) == -1) +#ifdef HAVE_POSIX_ALLOCATE + int err; + if ((err = posix_fallocate( fd, 0, (off_t)info->ValidDataLength.QuadPart )) != 0) { - if (errno == EOPNOTSUPP) WARN( "fallocate not supported on this filesystem\n" ); - else status = errno_to_status( errno ); + if (err == EOPNOTSUPP) WARN( "posix_fallocate not supported on this filesystem\n" ); + else status = errno_to_status( err ); } #else FIXME( "setting valid data length not supported\n" ); -- 2.33.0

1 2

[PATCH 1/2] ntdll: Use posix_fallocate(2/3) instead of fallocate(2).
by Chip Davis Sept. 14, 2021

Sept. 14, 2021

From: Charles Davis <cdavis5x(a)gmail.com> The fallocate(2) call only exists on Linux. posix_fallocate() is more portable. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- configure.ac | 1 + dlls/ntdll/unix/file.c | 25 ++++++++++++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index fec39b6f2ac..53656685bff 100644 --- a/configure.ac +++ b/configure.ac @@ -2183,6 +2183,7 @@ AC_CHECK_FUNCS(\ poll \ port_create \ posix_fadvise \ + posix_fallocate \ prctl \ proc_pidinfo \ readlink \ diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 833266ddf3f..4286b81aa1f 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -135,6 +135,19 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #define MAX_DOS_DRIVES 26 +#ifndef HAVE_POSIX_FALLOCATE +static int posix_fallocate( int fd, off_t offset, off_t len ) +{ +#ifdef HAVE_FALLOCATE + if (fallocate( fd, 0, offset, len ) < 0) + return errno; + return 0; +#else + return ENOSYS; +#endif +} +#endif /* HAVE_POSIX_FALLOCATE */ + /* just in case... */ #undef VFAT_IOCTL_READDIR_BOTH #undef EXT2_IOC_GETFLAGS @@ -4574,15 +4587,13 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, status = STATUS_INVALID_PARAMETER; else { -#ifdef HAVE_FALLOCATE - if (fallocate( fd, 0, 0, (off_t)info->ValidDataLength.QuadPart ) == -1) + int err; + if ((err = posix_fallocate( fd, 0, (off_t)info->ValidDataLength.QuadPart )) != 0) { - if (errno == EOPNOTSUPP) WARN( "fallocate not supported on this filesystem\n" ); - else status = errno_to_status( errno ); + if (err == ENOSYS) FIXME( "setting valid data length not supported\n" ); + else if (err == EOPNOTSUPP) WARN( "posix_fallocate not supported on this filesystem\n" ); + else status = errno_to_status( err ); } -#else - FIXME( "setting valid data length not supported\n" ); -#endif } if (needs_close) close( fd ); } -- 2.33.0

2 2

[PATCH] msxml3/tests: Add missing return value check (Coverity).
by Nikolay Sivov Sept. 14, 2021

Sept. 14, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/tests/domdoc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 063f9433a77..a0bcca2d4e9 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7468,6 +7468,7 @@ static void test_XSLPattern(void) ok(hr == S_OK, "query=%s, failed with 0x%08x\n", ptr->query, hr); len = 0; hr = IXMLDOMNodeList_get_length(list, &len); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(len != 0, "query=%s, empty list\n", ptr->query); if (len) { if (ptr->todo) { -- 2.33.0

1 0

[PATCH] kernel32/tests: Fix sprintf() arguments (Coverity).
by Nikolay Sivov Sept. 14, 2021

Sept. 14, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 3003ff63f5a..0bce88716d0 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4444,7 +4444,7 @@ static void test_AllocConsole(void) if (skip_nt) return; winetest_get_mainargs(&argv); - sprintf(buf, "\"%s\" console alloc_console", argv[0], GetCurrentProcessId()); + sprintf(buf, "\"%s\" console alloc_console", argv[0]); res = CreateProcessA(NULL, buf, NULL, NULL, FALSE, CREATE_NEW_CONSOLE, NULL, NULL, &si, &info); ok(res, "CreateProcess failed: %u\n", GetLastError()); CloseHandle(info.hThread); -- 2.33.0

2 1

[PATCH] widl: Remove arguments from writing calls that don't use them (Coverity).
by Nikolay Sivov Sept. 14, 2021

Sept. 14, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tools/widl/header.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 1a69b298e7d..bee7306f413 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -192,11 +192,11 @@ static void write_namespace_end(FILE *header, struct namespace *namespace) { if(is_global_namespace(namespace)) { if(use_abi_namespace) - write_line(header, -1, "}", namespace->name); + write_line(header, -1, "}"); return; } - write_line(header, -1, "}", namespace->name); + write_line(header, -1, "}"); write_namespace_end(header, namespace->parent); } -- 2.33.0

1 0

[PATCH] services/tests: Fix printf-style helper format (Coverity).
by Nikolay Sivov Sept. 14, 2021

Sept. 14, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- programs/services/tests/service.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index 4eebbc432df..93eff0e36f0 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -26,6 +26,12 @@ #include "wine/test.h" +#if !defined(__WINE_USE_MSVCRT) || defined(__MINGW32__) +#define __WINE_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) +#else +#define __WINE_PRINTF_ATTR(fmt,args) +#endif + static SERVICE_STATUS_HANDLE (WINAPI *pRegisterServiceCtrlHandlerExA)(LPCSTR,LPHANDLER_FUNCTION_EX,LPVOID); static HANDLE pipe_handle = INVALID_HANDLE_VALUE; @@ -56,6 +62,7 @@ static inline void service_event(const char *event) send_msg("EVENT", event); } +static void WINAPIV service_ok(int cnd, const char *msg, ...) __WINE_PRINTF_ATTR(2,3); static void WINAPIV service_ok(int cnd, const char *msg, ...) { __ms_va_list valist; @@ -135,7 +142,7 @@ static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPAR BOOL r; MONITORINFOEXA mi; - service_ok(hmon != NULL, "Unexpected hmon=%#x\n", hmon); + service_ok(hmon != NULL, "Unexpected hmon %p\n", hmon); monitor_count++; -- 2.33.0

1 0

[PATCH] server: Don't wait for low level hook result when queueing hardware message.
by Piotr Caban Sept. 14, 2021

Sept. 14, 2021

Without the change graphic drivers are blocking until low level hooks are processed when injecting keyboard and mouse events. That may cause deadlocks. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- server/queue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

3 6

[PATCH] vbscript: Support date and time literals.
by Robert Wilhelm Sept. 14, 2021

Sept. 14, 2021

Date literals, which are enclosed in number signs in vbscript, will be lexed as string, pushed throught parser and compiler and finally converted to VT_Date Variant in interpreter using VariantChangeType. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51503 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 18 +++++++++++++++++ dlls/vbscript/lex.c | 39 ++++++++++++++++++++++++++++++++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 16 ++++++++++++++- dlls/vbscript/tests/lang.vbs | 1 + dlls/vbscript/vbscript.h | 1 + 7 files changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 0d1960d8ca1..ae962ff73cf 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -530,6 +530,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return compile_call_expression(ctx, (call_expression_t*)expr, TRUE); case EXPR_CONCAT: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_concat); + case EXPR_DATE: + return push_instr_str(ctx, OP_date, ((string_expression_t*)expr)->value); case EXPR_DIV: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_div); case EXPR_DOT: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 11d95e57758..db3e41aae2f 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1637,6 +1637,24 @@ static HRESULT interp_string(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_date(exec_ctx_t *ctx) +{ + VARIANT v,date; + HRESULT hres; + + TRACE("\n"); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(ctx->instr->arg1.str); + if(!V_BSTR(&v)) + return E_OUTOFMEMORY; + + hres = VariantChangeType(&date, &v, 0, VT_DATE); + if(FAILED(hres)) + return hres; + return stack_push(ctx, &date); +} + static HRESULT interp_int(exec_ctx_t *ctx) { const LONG arg = ctx->instr->arg1.lng; diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 357cad7158c..28bbda331a9 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -204,6 +204,43 @@ static int parse_string_literal(parser_ctx_t *ctx, const WCHAR **ret) return tString; } +static int parse_date_literal(parser_ctx_t *ctx, const WCHAR **ret) +{ + const WCHAR *ptr = ++ctx->ptr; + WCHAR *rptr; + int len = 0; + + while(ctx->ptr < ctx->end) { + if(*ctx->ptr == '\n' || *ctx->ptr == '\r') { + FIXME("newline inside date literal\n"); + return 0; + } + + if(*ctx->ptr == '#') + break; + ctx->ptr++; + } + + if(ctx->ptr == ctx->end) { + FIXME("unterminated date literal\n"); + return 0; + } + + len += ctx->ptr-ptr; + + *ret = rptr = parser_alloc(ctx, (len+1)*sizeof(WCHAR)); + if(!rptr) + return 0; + + while(ptr < ctx->ptr) { + *rptr++ = *ptr++; + } + + *rptr = 0; + ctx->ptr++; + return tDate; +} + static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) { BOOL use_int = TRUE; @@ -429,6 +466,8 @@ static int parse_next_token(void *lval, unsigned *loc, parser_ctx_t *ctx) return tEXPRLBRACKET; case '"': return parse_string_literal(ctx, lval); + case '#': + return parse_date_literal(ctx, lval); case '&': if(*++ctx->ptr == 'h' || *ctx->ptr == 'H') return parse_hex_literal(ctx, lval); diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 2888ea3b546..df7d9c20386 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -23,6 +23,7 @@ typedef enum { EXPR_BRACKETS, EXPR_CALL, EXPR_CONCAT, + EXPR_DATE, EXPR_DIV, EXPR_DOT, EXPR_DOUBLE, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 37b14f05e14..8e20b289966 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -34,6 +34,7 @@ static void source_add_class(parser_ctx_t*,class_decl_t*); static void *new_expression(parser_ctx_t*,expression_type_t,size_t); static expression_t *new_bool_expression(parser_ctx_t*,VARIANT_BOOL); +static expression_t *new_date_expression(parser_ctx_t*,const WCHAR*); static expression_t *new_string_expression(parser_ctx_t*,const WCHAR*); static expression_t *new_long_expression(parser_ctx_t*,expression_type_t,LONG); static expression_t *new_double_expression(parser_ctx_t*,double); @@ -125,7 +126,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %token <string> tNOTHING tEMPTY tNULL %token <string> tCLASS tSET tNEW tPUBLIC tPRIVATE %token <string> tNEXT tON tRESUME tGOTO -%token <string> tIdentifier tString +%token <string> tIdentifier tString tDate %token <string> tDEFAULT tERROR tEXPLICIT tPROPERTY tSTEP %token <integer> tInt %token <dbl> tDouble @@ -416,6 +417,7 @@ LiteralExpression : tTRUE { $$ = new_bool_expression(ctx, VARIANT_TRUE); CHECK_ERROR; } | tFALSE { $$ = new_bool_expression(ctx, VARIANT_FALSE); CHECK_ERROR; } | tString { $$ = new_string_expression(ctx, $1); CHECK_ERROR; } + | tDate { $$ = new_date_expression(ctx, $1); CHECK_ERROR; } | NumericLiteralExpression { $$ = $1; } | tEMPTY { $$ = new_expression(ctx, EXPR_EMPTY, 0); CHECK_ERROR; } | tNULL { $$ = new_expression(ctx, EXPR_NULL, 0); CHECK_ERROR; } @@ -594,6 +596,18 @@ static expression_t *new_string_expression(parser_ctx_t *ctx, const WCHAR *value return &expr->expr; } +static expression_t *new_date_expression(parser_ctx_t *ctx, const WCHAR *value) +{ + string_expression_t *expr; + + expr = new_expression(ctx, EXPR_DATE, sizeof(*expr)); + if(!expr) + return NULL; + + expr->value = value; + return &expr->expr; +} + static expression_t *new_long_expression(parser_ctx_t *ctx, expression_type_t type, LONG value) { int_expression_t *expr; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index a716cdbc65f..d7865301784 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -107,6 +107,7 @@ Call ok(getVT(&hffFFffFF&) = "VT_I2", "getVT(&hffFFffFF&) is not VT_I2") Call ok(getVT(&hffFFffFE&) = "VT_I2", "getVT(&hffFFffFE &) is not VT_I2") Call ok(getVT(&hffF&) = "VT_I2", "getVT(&hffFF&) is not VT_I2") Call ok(getVT(&hffFF&) = "VT_I4", "getVT(&hffFF&) is not VT_I4") +Call ok(getVT(# 1/1/2011 #) = "VT_DATE", "getVT(# 1/1/2011 #) is not VT_DATE") Call ok(getVT(1e2) = "VT_R8", "getVT(1e2) is not VT_R8") Call ok(getVT(1e0) = "VT_R8", "getVT(1e0) is not VT_R8") Call ok(getVT(0.1e2) = "VT_R8", "getVT(0.1e2) is not VT_R8") diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index afcce5eb9b8..60ec0123f60 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -225,6 +225,7 @@ typedef enum { X(case, 0, ARG_ADDR, 0) \ X(concat, 1, 0, 0) \ X(const, 1, ARG_BSTR, 0) \ + X(date, 1, ARG_STR, 0) \ X(deref, 1, 0, 0) \ X(dim, 1, ARG_BSTR, ARG_UINT) \ X(div, 1, 0, 0) \ -- 2.31.1

3 6